Skip to content

M
Moecube Accounts Web
Commit a7b4a57c authored by nanahira's avatar nanahira
Browse files
Options

remove vaptcha

parent db362684
Pipeline #43259 passed with stages
      in 59 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 37 additions and 35 deletions
      public/index.html
      View file @ a7b4a57c
      ......@@ -5,7 +5,7 @@
      <meta name="viewport" content="width=device-width, initial-scale=1">
      <link rel="stylesheet" href="index.css"/>
      <link rel="icon" href="/favicon.ico">
      <script src="https://v-cn.vaptcha.com/v3.js"></script>
      <!-- <script src="https://v-cn.vaptcha.com/v3.js"></script> -->
      </head>
      <body>
      ......
      src/utils/request.js
      View file @ a7b4a57c
      ......@@ -22,19 +22,20 @@ async function checkStatus(response) {
      throw error;
      }
      let vaptchaObj = null;
      function refreshVaptchaObject() {
      vaptcha({
      vid: '668bf0efd3784602950e94a8',
      type: 'invisible',
      scene: 0,
      area: 'auto',
      }).then((v) => {
      vaptchaObj = v;
      });
      }
      // vaptcha disabled - CDN script is no longer available
      // let vaptchaObj = null;
      // function refreshVaptchaObject() {
      // vaptcha({
      // vid: '668bf0efd3784602950e94a8',
      // type: 'invisible',
      // scene: 0,
      // area: 'auto',
      // }).then((v) => {
      // vaptchaObj = v;
      // });
      // }
      refreshVaptchaObject();
      // refreshVaptchaObject();
      /**
      * Requests a URL, returning a promise.
      ......@@ -44,28 +45,29 @@ refreshVaptchaObject();
      * @return {object} An object containing either "data" or "err"
      */
      export default function request(relativeUrl, options) {
      if (options.vaptcha) {
      return new Promise((resolve, reject) => {
      vaptchaObj.listen('pass', () => {
      options.vaptcha = undefined;
      const token = vaptchaObj.getServerToken();
      console.log('vaptcha pass', token.server, token.token);
      options.headers = {
      ...options.headers || { 'content-type': 'application/json' },
      'x-vaptcha-server': token.server,
      'x-vaptcha-token': token.token,
      };
      request(relativeUrl, options).then(resolve).catch(reject);
      refreshVaptchaObject();
      });
      vaptchaObj.listen('close', () => {
      console.log('vaptcha close');
      reject(new Error('vaptcha close'));
      refreshVaptchaObject();
      })
      vaptchaObj.validate();
      });
      }
      // vaptcha disabled - CDN script is no longer available
      // if (options.vaptcha) {
      // return new Promise((resolve, reject) => {
      // vaptchaObj.listen('pass', () => {
      // options.vaptcha = undefined;
      // const token = vaptchaObj.getServerToken();
      // console.log('vaptcha pass', token.server, token.token);
      // options.headers = {
      // ...options.headers || { 'content-type': 'application/json' },
      // 'x-vaptcha-server': token.server,
      // 'x-vaptcha-token': token.token,
      // };
      // request(relativeUrl, options).then(resolve).catch(reject);
      // refreshVaptchaObject();
      // });
      // vaptchaObj.listen('close', () => {
      // console.log('vaptcha close');
      // reject(new Error('vaptcha close'));
      // refreshVaptchaObject();
      // })
      // vaptchaObj.validate();
      // });
      // }
      const url = `${config.apiRoot}${relativeUrl}`;
      if (options && !options.headers) {
      Object.assign(options, {
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment