feat: remove recaptcha (#326)

* feat: remove recaptcha * fix: remove params
pingcap-inc · Dec 6, 2021 · 14ef3ab · 14ef3ab · vercel · Dec 6, 2021
1 parent c6f1e53
commit 14ef3ab
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 32 deletions.
diff --git a/packages/accounts/index.html b/packages/accounts/index.html
@@ -18,6 +18,5 @@
   <body>
     <div id="app" class="tidb-community-ui"></div>
     <script type="module" src="/src/main.jsx"></script>
-    <script src="https://www.recaptcha.net/recaptcha/api.js?render=<%- RE_CAPTCHA_SITE_KEY %>"></script>
   </body>
 </html>
diff --git a/packages/accounts/src/api/index.js b/packages/accounts/src/api/index.js
@@ -15,8 +15,8 @@ export const phoneLoginCheck = async ({ phone }) => {
   await client.post('/api/login/phone/check', { phone });
 };
 
-export const sendCode = async (path, { phone, re_token_v3 }) => {
-  await client.post(`/api/${path}/send-code`, { phone, re_token_v3 }).catch(handleSendCodeLimitError);
+export const sendCode = async (path, { phone }) => {
+  await client.post(`/api/${path}/send-code`, { phone }).catch(handleSendCodeLimitError);
 };
 
 const postLogin = async ({ redirect_to, sso_callbacks }) => {
@@ -29,13 +29,13 @@ const postLogin = async ({ redirect_to, sso_callbacks }) => {
   };
 };
 
-export const phoneLogin = async ({ phone, code, re_token_v3, redirect_to }) => {
-  const { data: resp } = await client.post('/api/login/phone', { phone, code, re_token_v3, redirect_to });
+export const phoneLogin = async ({ phone, code, redirect_to }) => {
+  const { data: resp } = await client.post('/api/login/phone', { phone, code, redirect_to });
   return postLogin(resp);
 };
 
-export const passwordLogin = async ({ identifier, password, re_token_v3, redirect_to }) => {
-  const { data: resp } = await client.post('/api/login/password', { identifier, password, re_token_v3, redirect_to });
+export const passwordLogin = async ({ identifier, password, redirect_to }) => {
+  const { data: resp } = await client.post('/api/login/password', { identifier, password, redirect_to });
   return postLogin(resp);
 };
 
@@ -46,17 +46,17 @@ export const socialLogin = ({ provider, redirect_to }) => {
   );
 };
 
-export const signup = async ({ company, email, phone, code, re_token_v3, redirect_to }) => {
-  const { data: resp } = await client.post('/api/signup', { company, email, phone, code, re_token_v3, redirect_to });
+export const signup = async ({ company, email, phone, code, redirect_to }) => {
+  const { data: resp } = await client.post('/api/signup', { company, email, phone, code, redirect_to });
   return postLogin(resp);
 };
 
-export const forgetSendCode = async ({ identifier, re_token_v3 }) => {
-  await client.post(`/api/forget/send-code`, { identifier, re_token_v3 }).catch(handleSendCodeLimitError);
+export const forgetSendCode = async ({ identifier }) => {
+  await client.post(`/api/forget/send-code`, { identifier }).catch(handleSendCodeLimitError);
 };
 
-export const forgetVerifyCode = async ({ identifier, code, re_token_v3 }) => {
-  return client.post('/api/forget/verify', { identifier, code, re_token_v3 });
+export const forgetVerifyCode = async ({ identifier, code }) => {
+  return client.post('/api/forget/verify', { identifier, code });
 };
 
 export const forgetResetPassword = async ({ new_password }) => {

diff --git a/packages/accounts/vite.config.js b/packages/accounts/vite.config.js
@@ -49,6 +49,7 @@ export default ({ mode }) => {
       alias: {
         '@/public': resolve(__dirname, '../../public'),
         '@': resolve(__dirname, '../../src'),
+        '@tidb-community/ui': resolve(__dirname, '../../packages/ui/es'),
         '~': resolve(__dirname, 'src'),
         ...unifyNodeModules([
           'antd',

diff --git a/packages/datasource/src/api/account/index.js b/packages/datasource/src/api/account/index.js
@@ -2,41 +2,35 @@ import client from '../client';
 
 export const settings = () => client.get('/api/account/settings');
 
-export const sendPhoneCode = ({ phone, re_token_v3 }) =>
+export const sendPhoneCode = ({ phone }) =>
   client.post('/api/account/set-phone/send-code', {
     phone,
-    re_token_v3,
   });
 
-export const setPhone = ({ phone, code, re_token_v3 }) =>
+export const setPhone = ({ phone, code }) =>
   client.post('/api/account/set-phone', {
     phone,
     code,
-    re_token_v3,
   });
 
-export const sendEmailCode = ({ email, re_token_v3 }) =>
+export const sendEmailCode = ({ email }) =>
   client.post('/api/account/set-email/send-code', {
     email,
-    re_token_v3,
   });
 
-export const setEmail = ({ email, code, re_token_v3 }) =>
+export const setEmail = ({ email, code }) =>
   client.post('/api/account/set-email', {
     email,
     code,
-    re_token_v3,
   });
 
-export const setPassword = ({ new_password, re_token_v3 }) =>
+export const setPassword = ({ new_password }) =>
   client.post('/api/account/set-password', {
     new_password,
-    re_token_v3,
   });
 
-export const resetPassword = ({ old_password, new_password, re_token_v3 }) =>
+export const resetPassword = ({ old_password, new_password }) =>
   client.post('/api/account/reset-password', {
     old_password,
     new_password,
-    re_token_v3,
   });
diff --git a/src/pages/my/layout/Layout.component.js b/src/pages/my/layout/Layout.component.js
@@ -1,4 +1,3 @@
-import NextHead from 'next/head';
 import React, { useEffect, useContext } from 'react';
 import { Col, Row } from 'antd';
 
@@ -17,12 +16,6 @@ const Layout = ({ children, title }) => {
 
   return (
     <>
-      <NextHead>
-        {process.env.NEXT_PUBLIC_RECAPTCHA_KEY && (
-          <script src={`https://www.recaptcha.net/recaptcha/api.js?render=${process.env.NEXT_PUBLIC_RECAPTCHA_KEY}`} />
-        )}
-      </NextHead>
-
       <CoreLayout hasMargin>
         <Styled.Container>
           <Row gutter={[32, 32]}>