touchstudy-core 0.1.2 → 0.1.4

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

@@ -5,7 +5,7 @@ declare type LoginInfo = {
     captcha: string;
     rememberMe: boolean;
 };
-declare const useLogin: () => {
+declare const useLogin: (onNavigate: Function) => {
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

package/dist/index.d.ts

@@ -21,4 +21,5 @@ import TheLanguageDropdown from "./layouts/TheLanguageDropdown";
 import { useTranslation, I18nextProvider } from "react-i18next";
 import minutesToTimeSpan from "./utils/minutesToTimeSpan";
 import toISOString from "./utils/toISOString";
-export { diffFromNow, formatTime, utcToLocalTime, setLoading, BASE_URL, ACCESS_TOKEN, Login, store, historyCore, setAlert, setUser, Loading, NotFound, LayoutContext, api, ConfirmDialog, CommonDialog, CommonAlert, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, setLanguage, i18n, TheLanguageDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, minutesToTimeSpan, toISOString };
+import canAccessRoute from "./utils/canAccessRoute";
+export { diffFromNow, formatTime, utcToLocalTime, setLoading, BASE_URL, ACCESS_TOKEN, Login, store, historyCore, setAlert, setUser, Loading, NotFound, LayoutContext, api, ConfirmDialog, CommonDialog, CommonAlert, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, setLanguage, i18n, TheLanguageDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, minutesToTimeSpan, toISOString, canAccessRoute };

package/dist/index.js

@@ -22,12 +22,13 @@ var setLoading = toolkit.createAction("common/setLoading");
 var setAlert = toolkit.createAction("common/setAlert");
 var setUser = toolkit.createAction("common/setUser");
 var setLanguage = toolkit.createAction("common/setLanguage");
+var reset = toolkit.createAction("common/reset");
 
 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 = "https://localhost:7045";
+var BASE_URL = "http://api.touchstudy.kr";
 var PUSHER_CONFIG = {
   cluster: "ap1",
   key: "9018c77328885a14150b"
@@ -143,17 +144,37 @@ var AuthenticationMessage;
 })(AuthenticationMessage || (AuthenticationMessage = {}));
 
 var useGoogleSignOut = function useGoogleSignOut(props) {
+  var dispatch = reactRedux.useDispatch();
   var onLogoutSuccess = props.onLogoutSuccess,
     onFailure = props.onFailure;
+  var handleLogoutSuccess = function handleLogoutSuccess() {
+    onLogoutSuccess === null || onLogoutSuccess === void 0 ? void 0 : onLogoutSuccess();
+  };
+  var handleLogoutFailure = function handleLogoutFailure() {
+    onFailure === null || onFailure === void 0 ? void 0 : onFailure();
+  };
   var _useGoogleLogout = GoogleLogin.useGoogleLogout({
       clientId: GOOGLE_CLIENT_ID,
-      onLogoutSuccess: onLogoutSuccess,
-      onFailure: onFailure
+      onLogoutSuccess: handleLogoutSuccess,
+      onFailure: handleLogoutFailure
     }),
     signOut = _useGoogleLogout.signOut,
     loaded = _useGoogleLogout.loaded;
+  var handleSignOut = function handleSignOut() {
+    localStorage.removeItem("USER_INFORMATION");
+    localStorage.removeItem(ACCESS_TOKEN);
+    try {
+      signOut();
+    } catch (error) {
+      console.log({
+        error: error
+      });
+    }
+    dispatch(reset());
+    window.location.href = "/login";
+  };
   return {
-    signOut: signOut,
+    handleSignOut: handleSignOut,
     loaded: loaded
   };
 };
@@ -172,14 +193,23 @@ var BlockLogin = function BlockLogin(_ref) {
   var _useGoogleReCaptcha = reactGoogleRecaptchaV3.useGoogleReCaptcha(),
     executeRecaptcha = _useGoogleReCaptcha.executeRecaptcha;
   var _useGoogleSignOut = useGoogleSignOut({}),
-    signOut = _useGoogleSignOut.signOut;
+    handleSignOut = _useGoogleSignOut.handleSignOut;
   var clickHandler = React.useCallback(function () {
     try {
+      var _exit = false;
       if (!executeRecaptcha) {
-        console.log("execute recaptcha undefined");
         return Promise.resolve();
       }
-      return Promise.resolve(executeRecaptcha("login"));
+      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);
     }
@@ -187,65 +217,59 @@ var BlockLogin = function BlockLogin(_ref) {
   var handleVerify = React.useCallback(function () {}, []);
   var onSuccessGoogle = function onSuccessGoogle(res) {
     try {
-      var _exit = false;
       return Promise.resolve(function () {
         if (!!(res !== null && res !== void 0 && res.accessToken)) {
-          var _temp2 = function _temp2(_result) {
-            if (_exit) return _result;
-            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;
-          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) {
-                onNavigate("/teacher/overall-status/main");
-                _exit = true;
-                return;
-              }
-              if (isFirstLogin) {
-                onNavigate("/register/info");
+          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;
               } else {
-                onNavigate("/student/check/main");
+                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();
             });
-          }, 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;
-            }
-            signOut();
-            !!message && dispatch(setAlert({
-              type: "danger",
-              message: message
-            }));
+            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
           });
-          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
         }
       }());
     } catch (e) {
@@ -261,14 +285,10 @@ var BlockLogin = function BlockLogin(_ref) {
     validationSchema: schema,
     onSubmit: function (values) {
       try {
-        return Promise.resolve(_catch(function () {
-          return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
-            if (!clickHandlerRes) return;
-            values.captcha = clickHandlerRes;
-          });
-        }, function (err) {
-          console.error(err);
-        }));
+        return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
+          if (!clickHandlerRes) return;
+          values.captcha = clickHandlerRes;
+        });
       } catch (e) {
         return Promise.reject(e);
       }
@@ -304,13 +324,21 @@ var BlockLogin = function BlockLogin(_ref) {
   });
 };
 
+var getAccessToken$1 = (function () {
+  try {
+    return localStorage.getItem(ACCESS_TOKEN);
+  } catch (err) {
+    return null;
+  }
+});
+
 var defaultInfo = {
   email: "",
   password: "",
   captcha: "",
   rememberMe: false
 };
-var useLogin = function useLogin() {
+var useLogin = function useLogin(onNavigate) {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
@@ -330,7 +358,11 @@ var useLogin = function useLogin() {
         scope: 'email'
       });
     };
-    gapiScript.gapi.load('client:auth2', start);
+    !!gapiScript.gapi && gapiScript.gapi.load('client:auth2', start);
+  }, [gapiScript.gapi]);
+  React.useEffect(function () {
+    var token = getAccessToken$1();
+    if (!!token) onNavigate("/");
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -346,7 +378,7 @@ var useLogin = function useLogin() {
 var Login = function Login(_ref) {
   var onNavigate = _ref.onNavigate,
     isTeacher = _ref.isTeacher;
-  var _useLogin = useLogin(),
+  var _useLogin = useLogin(onNavigate),
     defaultInfo = _useLogin.defaultInfo;
   return React__default.createElement("div", {
     className: styles["login"] + " container-fluid font-family-lato"
@@ -584,6 +616,8 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
     state.user = action.payload;
   }).addCase(setLanguage, function (state, action) {
     state.language = action.payload;
+  }).addCase(reset, function (_state, _action) {
+    return initialState;
   });
 });
 
@@ -660,14 +694,6 @@ var encodeParams$1 = (function (params) {
   }).join('&');
 });
 
-var getAccessToken$1 = (function () {
-  try {
-    return localStorage.getItem(ACCESS_TOKEN);
-  } catch (err) {
-    return null;
-  }
-});
-
 var api$1 = axios.create({
   baseURL: BASE_URL,
   timeout: 0,
@@ -719,15 +745,28 @@ var getInfo = function getInfo() {
 
 var LayoutContext = function LayoutContext(_ref) {
   var children = _ref.children,
-    onNavigate = _ref.onNavigate;
+    role = _ref.role;
   var _useGoogleSignOut = useGoogleSignOut({}),
-    signOut = _useGoogleSignOut.signOut;
+    handleSignOut = _useGoogleSignOut.handleSignOut;
   var dispatch = reactRedux.useDispatch();
+  var user = reactRedux.useSelector(function (state) {
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
+  });
   var resetAuth = function resetAuth() {
-    localStorage.removeItem(ACCESS_TOKEN);
-    signOut();
-    onNavigate("/login");
+    handleSignOut();
   };
+  var checkRoleUser = React.useCallback(function () {
+    var _user$roles, _user$roles2;
+    if (!user) return;
+    var isAdmin = (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Admin");
+    if (isAdmin && role !== "Teacher") alert(user.email + " not allow to register " + role);
+    if (isAdmin) return;
+    if (!((_user$roles2 = user.roles) !== null && _user$roles2 !== void 0 && _user$roles2.includes(role))) {
+      alert(user.email + " not allow to register " + role);
+      resetAuth();
+    }
+  }, [role, JSON.stringify(user)]);
   var loadInfo = function loadInfo() {
     try {
       var _temp2 = function _temp2() {
@@ -746,7 +785,11 @@ var LayoutContext = function LayoutContext(_ref) {
           }
           dispatch(setUser(info.data));
         });
-      }, function () {
+      }, function (err) {
+        console.log({
+          err: err
+        });
+        role === "Student" ? alert("학생, 다시 로그인해주세요.") : alert("선생님, 다시 로그인해주세요.");
         resetAuth();
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
@@ -755,8 +798,9 @@ var LayoutContext = function LayoutContext(_ref) {
     }
   };
   React.useEffect(function () {
-    loadInfo();
-  }, []);
+    !user && loadInfo();
+    !!user && checkRoleUser();
+  }, [JSON.stringify(user)]);
   return React__default.createElement(React.Fragment, null, children);
 };
 
@@ -972,6 +1016,7 @@ var description_success = "스터디 터치는 엄태욱 선생님의 수업에
 var logout = "로그 아웃";
 var overall_status = "전체 현황";
 var exam_status = "시험별 현";
+var student_status = "학생 신분";
 var user_manager = "사용자 목록";
 var recent_exam_results = "최근 시험 결과";
 var instructor_name = "강사이름";
@@ -1016,6 +1061,7 @@ var no_data = "데이터 없음";
 var internet_connection_was_lost = "인터넷 연결이 끊어졌습니다";
 var problem = "문제";
 var problem_solving_time = "문제풀이 시간";
+var minutes = "분";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -1027,6 +1073,7 @@ var lang_ko = {
 	logout: logout,
 	overall_status: overall_status,
 	exam_status: exam_status,
+	student_status: student_status,
 	user_manager: user_manager,
 	recent_exam_results: recent_exam_results,
 	instructor_name: instructor_name,
@@ -1070,7 +1117,8 @@ var lang_ko = {
 	no_data: no_data,
 	internet_connection_was_lost: internet_connection_was_lost,
 	problem: problem,
-	problem_solving_time: problem_solving_time
+	problem_solving_time: problem_solving_time,
+	minutes: minutes
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -1083,6 +1131,7 @@ var description_success$1 = "Study Touch is a learning tool used in teacher Taew
 var logout$1 = "Logout";
 var overall_status$1 = "Overall Status";
 var exam_status$1 = "Exam Status";
+var student_status$1 = "Student Status";
 var user_manager$1 = "User Manager";
 var recent_exam_results$1 = "Recent exam";
 var instructor_name$1 = "Instructor name";
@@ -1127,6 +1176,7 @@ var no_data$1 = "No data";
 var internet_connection_was_lost$1 = "Internet connection was lost";
 var problem$1 = "Problem ";
 var problem_solving_time$1 = "Problem solving time";
+var minutes$1 = "m";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -1138,6 +1188,7 @@ var lang_en = {
 	logout: logout$1,
 	overall_status: overall_status$1,
 	exam_status: exam_status$1,
+	student_status: student_status$1,
 	user_manager: user_manager$1,
 	recent_exam_results: recent_exam_results$1,
 	instructor_name: instructor_name$1,
@@ -1181,7 +1232,8 @@ var lang_en = {
 	no_data: no_data$1,
 	internet_connection_was_lost: internet_connection_was_lost$1,
 	problem: problem$1,
-	problem_solving_time: problem_solving_time$1
+	problem_solving_time: problem_solving_time$1,
+	minutes: minutes$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -1313,6 +1365,19 @@ var toISOString = (function (time) {
   }
 });
 
+var canAccess = function canAccess(userRoles, componentRoles) {
+  if (!Array.isArray(userRoles)) {
+    return false;
+  }
+  if (Array.isArray(componentRoles)) {
+    var intersects = userRoles.filter(function (i) {
+      return componentRoles.includes(i);
+    });
+    return intersects.length > 0;
+  }
+  return true;
+};
+
 var historyCore = history.createBrowserHistory();
 
 Object.defineProperty(exports, 'I18nextProvider', {
@@ -1342,6 +1407,7 @@ exports.NotFound = NotFound;
 exports.PUSHER_CONFIG = PUSHER_CONFIG;
 exports.TheLanguageDropdown = TheLanguageDropdown;
 exports.api = api$1;
+exports.canAccessRoute = canAccess;
 exports.diffFromNow = diffFromNow;
 exports.formatTime = formatTime;
 exports.historyCore = historyCore;