mario-core 2.9.99-beta → 2.9.102-beta

package/dist/containers/Login/hooks/useLogin.d.ts

@@ -19,5 +19,6 @@ declare const useLogin: () => {
     submitLogin: (teacherId: number, clickHandler: any) => Promise<void>;
     setIsLoginGoogle: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     googleClientId: string;
+    googleRecaptchaId: string;
 };
 export default useLogin;

package/dist/index.js

@@ -2771,17 +2771,21 @@ var useLogin = function useLogin() {
       googleClientId = _useState3[0],
       setGoogleClientId = _useState3[1];
 
-  var _useState4 = React.useState(),
-      infoUser = _useState4[0],
-      setInfoUser = _useState4[1];
+  var _useState4 = React.useState(""),
+      googleRecaptchaId = _useState4[0],
+      setGoogleRecaptchaId = _useState4[1];
+
+  var _useState5 = React.useState(),
+      infoUser = _useState5[0],
+      setInfoUser = _useState5[1];
 
   var toggle = React.useCallback(function () {
     setOpenLogin(!openLogin);
   }, [openLogin]);
 
-  var _useState5 = React.useState(false),
-      isShowPassword = _useState5[0],
-      setIsShowPassword = _useState5[1];
+  var _useState6 = React.useState(false),
+      isShowPassword = _useState6[0],
+      setIsShowPassword = _useState6[1];
 
   React.useEffect(function () {
     document.title = TITLE;
@@ -2826,6 +2830,8 @@ var useLogin = function useLogin() {
           }));
 
           if (data !== null && data !== void 0 && data.email && !roles.includes("Admin")) {
+            var _data$roles;
+
             amplitude.getInstance().init(!isLocalhost ? INIT_AMPLITUDE_KEY_PROD : INIT_AMPLITUDE_KEY_STAGE, data.email, {
               includeReferrer: false,
               includeUtm: false
@@ -2834,15 +2840,17 @@ var useLogin = function useLogin() {
             amplitude.getInstance().logEvent("general: session start", {
               user_id: data.email,
               domain: hostName,
-              roles: data === null || data === void 0 ? void 0 : data.roles
+              roles: data === null || data === void 0 ? void 0 : (_data$roles = data.roles) === null || _data$roles === void 0 ? void 0 : _data$roles.toString()
             });
             localStorage.setItem("USER_EMAIL", data.email);
 
             if (isLoginFirst) {
+              var _data$roles2;
+
               amplitude.getInstance().logEvent("general: first login", {
                 user_id: data.email,
                 domain: hostName,
-                roles: data === null || data === void 0 ? void 0 : data.roles
+                roles: data === null || data === void 0 ? void 0 : (_data$roles2 = data.roles) === null || _data$roles2 === void 0 ? void 0 : _data$roles2.toString()
               });
             }
           }
@@ -2881,7 +2889,8 @@ var useLogin = function useLogin() {
     try {
       var _temp6 = _catch(function () {
         return Promise.resolve(getGoogleClientId()).then(function (res) {
-          setGoogleClientId(res.data);
+          setGoogleClientId(res.data.googleClientId);
+          setGoogleRecaptchaId(res.data.googleCaptchaId);
         });
       }, function (err) {
         var _err$response2, _err$response2$data;
@@ -3016,7 +3025,8 @@ var useLogin = function useLogin() {
     setInfoUser: setInfoUser,
     submitLogin: submitLogin,
     setIsLoginGoogle: setIsLoginGoogle,
-    googleClientId: googleClientId
+    googleClientId: googleClientId,
+    googleRecaptchaId: googleRecaptchaId
   };
 };
 
@@ -3205,9 +3215,6 @@ var BlockLogin = function BlockLogin(_ref) {
     }
   }, [executeRecaptcha]);
   var handleVerify = React.useCallback(function () {}, []);
-  console.log({
-    googleClientId: googleClientId
-  });
 
   var onSuccessGoogle = function onSuccessGoogle(res) {
     if (!!(res !== null && res !== void 0 && res.accessToken)) {
@@ -3704,7 +3711,8 @@ var Login = function Login(props) {
 
   var _useLogin = useLogin(),
       defaultInfo = _useLogin.defaultInfo,
-      userLogin = _useLogin.userLogin;
+      userLogin = _useLogin.userLogin,
+      googleRecaptchaId = _useLogin.googleRecaptchaId;
 
   React.useEffect(function () {
     isLogin && (document.title = LOGIN_TITLE);
@@ -3720,9 +3728,9 @@ var Login = function Login(props) {
     md: 12,
     xs: 12,
     className: "d-flex justify-content-center h-100 align-items-center"
-  }, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
+  }, !!googleRecaptchaId && React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
     useRecaptchaNet: true,
-    reCaptchaKey: GOOGLE_RECAPTCHA_KEY,
+    reCaptchaKey: googleRecaptchaId,
     scriptProps: {
       async: true,
       defer: true,