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 @@ ...@@ -5,7 +5,7 @@
      <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
      <link rel="stylesheet" href="index.css"/> <link rel="stylesheet" href="index.css"/>
      <link rel="icon" href="/favicon.ico"> <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> </head>
      <body> <body>
      ......
      src/utils/request.js
      View file @ a7b4a57c
      ...@@ -22,19 +22,20 @@ async function checkStatus(response) { ...@@ -22,19 +22,20 @@ async function checkStatus(response) {
      throw error; throw error;
      } }
      let vaptchaObj = null; // vaptcha disabled - CDN script is no longer available
      function refreshVaptchaObject() { // let vaptchaObj = null;
      vaptcha({ // function refreshVaptchaObject() {
      vid: '668bf0efd3784602950e94a8', // vaptcha({
      type: 'invisible', // vid: '668bf0efd3784602950e94a8',
      scene: 0, // type: 'invisible',
      area: 'auto', // scene: 0,
      }).then((v) => { // area: 'auto',
      vaptchaObj = v; // }).then((v) => {
      }); // vaptchaObj = v;
      } // });
      // }
      refreshVaptchaObject(); // refreshVaptchaObject();
      /** /**
      * Requests a URL, returning a promise. * Requests a URL, returning a promise.
      ...@@ -44,28 +45,29 @@ refreshVaptchaObject(); ...@@ -44,28 +45,29 @@ refreshVaptchaObject();
      * @return {object} An object containing either "data" or "err" * @return {object} An object containing either "data" or "err"
      */ */
      export default function request(relativeUrl, options) { export default function request(relativeUrl, options) {
      if (options.vaptcha) { // vaptcha disabled - CDN script is no longer available
      return new Promise((resolve, reject) => { // if (options.vaptcha) {
      vaptchaObj.listen('pass', () => { // return new Promise((resolve, reject) => {
      options.vaptcha = undefined; // vaptchaObj.listen('pass', () => {
      const token = vaptchaObj.getServerToken(); // options.vaptcha = undefined;
      console.log('vaptcha pass', token.server, token.token); // const token = vaptchaObj.getServerToken();
      options.headers = { // console.log('vaptcha pass', token.server, token.token);
      ...options.headers || { 'content-type': 'application/json' }, // options.headers = {
      'x-vaptcha-server': token.server, // ...options.headers || { 'content-type': 'application/json' },
      'x-vaptcha-token': token.token, // 'x-vaptcha-server': token.server,
      }; // 'x-vaptcha-token': token.token,
      request(relativeUrl, options).then(resolve).catch(reject); // };
      refreshVaptchaObject(); // request(relativeUrl, options).then(resolve).catch(reject);
      }); // refreshVaptchaObject();
      vaptchaObj.listen('close', () => { // });
      console.log('vaptcha close'); // vaptchaObj.listen('close', () => {
      reject(new Error('vaptcha close')); // console.log('vaptcha close');
      refreshVaptchaObject(); // reject(new Error('vaptcha close'));
      }) // refreshVaptchaObject();
      vaptchaObj.validate(); // })
      }); // vaptchaObj.validate();
      } // });
      // }
      const url = `${config.apiRoot}${relativeUrl}`; const url = `${config.apiRoot}${relativeUrl}`;
      if (options && !options.headers) { if (options && !options.headers) {
      Object.assign(options, { 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