touchstudy-core 0.1.5 → 0.1.6

package/dist/index.js

@@ -5,7 +5,6 @@ var toolkit = require('@reduxjs/toolkit');
 var moment = _interopDefault(require('moment'));
 var React = require('react');
 var React__default = _interopDefault(React);
-var reactGoogleRecaptchaV3 = require('react-google-recaptcha-v3');
 var reactstrap = require('reactstrap');
 var formik = require('formik');
 var yup = require('yup');
@@ -27,11 +26,10 @@ var reset = toolkit.createAction("common/reset");
 var isLocalHost = Boolean(window.location.hostname === "localhost" || window.location.hostname === "[::1]" || window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/));
 
 var GOOGLE_CLIENT_ID = "64118819726-0qlur4qjrs9jbuu6rnoa0u91g680lmpg.apps.googleusercontent.com";
-var GOOGLE_RECAPTCHA_ID = "6LfNtLUaAAAAAL24lbBV11jS-gBtt1mhtxb4NXs0";
 var ACCESS_TOKEN = "ACCESS_TOKEN";
 var DATE_MIN_VALUE = "0001-01-01T00:00:00+00:00";
 var BASE_URL = function () {
-  return isLocalHost ? "https://localhost:7045" : "api.studypeak.io";
+  return isLocalHost ? "https://localhost:7045" : "https://api.studypeak.io";
 }();
 var PUSHER_CONFIG = {
   cluster: "ap1",
@@ -194,88 +192,64 @@ var BlockLogin = function BlockLogin(_ref) {
     onNavigate = _ref.onNavigate,
     isTeacher = _ref.isTeacher;
   var dispatch = reactRedux.useDispatch();
-  var _useGoogleReCaptcha = reactGoogleRecaptchaV3.useGoogleReCaptcha(),
-    executeRecaptcha = _useGoogleReCaptcha.executeRecaptcha;
-  var _useGoogleSignOut = useGoogleSignOut({}),
+  var _useGoogleSignOut = useGoogleSignOut({
+      onNavigate: onNavigate
+    }),
     handleSignOut = _useGoogleSignOut.handleSignOut;
-  var clickHandler = React.useCallback(function () {
-    try {
-      var _exit = false;
-      if (!executeRecaptcha) {
-        return Promise.resolve();
-      }
-      return Promise.resolve(_catch(function () {
-        return Promise.resolve(executeRecaptcha("login")).then(function (result) {
-          _exit = true;
-          return result;
-        });
-      }, function (error) {
-        console.log({
-          error: error
-        });
-      }));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }, [executeRecaptcha]);
-  var handleVerify = React.useCallback(function () {}, []);
   var onSuccessGoogle = function onSuccessGoogle(res) {
     try {
-      return Promise.resolve(function () {
+      var _temp3 = function () {
         if (!!(res !== null && res !== void 0 && res.accessToken)) {
+          var _temp2 = function _temp2() {
+            dispatch(setLoading(false));
+          };
           var _res$profileObj = res.profileObj,
             email = _res$profileObj.email,
             imageUrl = _res$profileObj.imageUrl,
             name = _res$profileObj.name;
           var accessToken = res.tokenObj.id_token;
           var googleId = res.googleId;
-          return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
-            function _temp2() {
-              dispatch(setLoading(false));
-            }
-            if (!clickHandlerRes) return;
-            var infoLogin = {
-              imageUrl: imageUrl,
-              fullName: name,
-              email: email,
-              token: accessToken,
-              googleId: googleId,
-              captcha: clickHandlerRes
-            };
-            var role = isTeacher ? "Teacher" : "Student";
-            dispatch(setLoading(true));
-            var _temp = _catch(function () {
-              return Promise.resolve(apiLoginGoogle(infoLogin, role)).then(function (res1) {
-                var isFirstLogin = res1.data.isFirstLogin;
-                var tokenJWT = res1.data.token;
-                localStorage.setItem("USER_INFORMATION", JSON.stringify(infoLogin));
-                localStorage.setItem(ACCESS_TOKEN, tokenJWT);
-                if (!isTeacher && isFirstLogin) {
-                  onNavigate("/register/info");
-                } else {
-                  onNavigate("/");
-                }
-              });
-            }, function (error) {
-              var _error$response, _error$response$data;
-              var message = undefined;
-              var type = error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.type;
-              if (type === AuthenticationMessage.NotAllowedToRegister) {
-                alert("가입 권한이 없는 계정입니다. 관리자에게 문의하세요.");
-              } else if (type) {
-                var _error$response2, _error$response2$data;
-                message = (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message) || ERROR_MESSAGE;
+          var infoLogin = {
+            imageUrl: imageUrl,
+            fullName: name,
+            email: email,
+            token: accessToken,
+            googleId: googleId
+          };
+          var role = isTeacher ? "Teacher" : "Student";
+          dispatch(setLoading(true));
+          var _temp = _catch(function () {
+            return Promise.resolve(apiLoginGoogle(infoLogin, role)).then(function (res1) {
+              var isFirstLogin = res1.data.isFirstLogin;
+              var tokenJWT = res1.data.token;
+              localStorage.setItem("USER_INFORMATION", JSON.stringify(infoLogin));
+              localStorage.setItem(ACCESS_TOKEN, tokenJWT);
+              if (!isTeacher && isFirstLogin) {
+                onNavigate("/register/info");
               } else {
-                var _error$response3;
-                message = (error === null || error === void 0 ? void 0 : (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.data) || ERROR_MESSAGE;
+                onNavigate("/");
               }
-              message && alert(message);
-              handleSignOut();
             });
-            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          }, function (error) {
+            var _error$response, _error$response$data;
+            var message = undefined;
+            var type = error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.type;
+            if (type === AuthenticationMessage.NotAllowedToRegister) {
+              alert("가입 권한이 없는 계정입니다. 관리자에게 문의하세요.");
+            } else if (type) {
+              var _error$response2, _error$response2$data;
+              message = (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message) || ERROR_MESSAGE;
+            } else {
+              var _error$response3;
+              message = (error === null || error === void 0 ? void 0 : (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.data) || ERROR_MESSAGE;
+            }
+            message && alert(message);
+            handleSignOut();
           });
+          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
         }
-      }());
+      }();
+      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -287,16 +261,7 @@ var BlockLogin = function BlockLogin(_ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: defaultInfo,
     validationSchema: schema,
-    onSubmit: function (values) {
-      try {
-        return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
-          if (!clickHandlerRes) return;
-          values.captcha = clickHandlerRes;
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    }
+    onSubmit: function onSubmit() {}
   }, function (formikProps) {
     var handleSubmit = formikProps.handleSubmit;
     return React__default.createElement(reactstrap.Row, {
@@ -311,10 +276,7 @@ var BlockLogin = function BlockLogin(_ref) {
     }, React__default.createElement("img", {
       src: "/images/logo.jpeg",
       className: "" + styles["img-login-rectangle"]
-    }), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
-      action: "login",
-      onVerify: handleVerify
-    })), React__default.createElement(reactstrap.Col, {
+    }), React__default.createElement(reactstrap.Col, {
       className: "p-0 mt-1 mb-4"
     }, React__default.createElement(GoogleLogin__default, {
       clientId: GOOGLE_CLIENT_ID,
@@ -393,19 +355,11 @@ var Login = function Login(_ref) {
     md: 12,
     xs: 12,
     className: "d-flex justify-content-center h-100 align-items-center"
-  }, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
-    useRecaptchaNet: true,
-    reCaptchaKey: GOOGLE_RECAPTCHA_ID,
-    scriptProps: {
-      async: true,
-      defer: true,
-      appendTo: "body"
-    }
   }, React__default.createElement(BlockLogin, {
     defaultInfo: defaultInfo,
     onNavigate: onNavigate,
     isTeacher: isTeacher
-  })))));
+  }))));
 };
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -749,8 +703,11 @@ var getInfo = function getInfo() {
 
 var LayoutContext = function LayoutContext(_ref) {
   var children = _ref.children,
-    role = _ref.role;
-  var _useGoogleSignOut = useGoogleSignOut({}),
+    role = _ref.role,
+    onNavigate = _ref.onNavigate;
+  var _useGoogleSignOut = useGoogleSignOut({
+      onNavigate: onNavigate
+    }),
     handleSignOut = _useGoogleSignOut.handleSignOut;
   var dispatch = reactRedux.useDispatch();
   var user = reactRedux.useSelector(function (state) {