touchstudy-core 0.1.115 → 0.1.116

package/dist/containers/Login/apiClient/index.d.ts

@@ -5,11 +5,7 @@ export declare const signInApi: ({ email, password, role }: {
     password: string;
     role: string;
 }) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const signInWithEmailApi: ({ isAcademy, email, reCaptcha }: {
-    isAcademy: boolean;
-    email: string;
-    reCaptcha: string;
-}) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const signInWithEmailApi: ({ isAcademy, email, reCaptcha, role }: any) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInWithOTPApi: ({ isAcademy, otp, email, reCaptcha, role }: SignInOTPRequest) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInWithKeyApi: ({ isAcademy, key, role }: {
     isAcademy: boolean;

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

@@ -1,4 +1,4 @@
-import { Role } from './../../../utils/constants';
+import { Role } from "./../../../utils/constants";
 declare type Props = {
     history: any;
     role?: Role;

package/dist/index.js

@@ -1369,6 +1369,7 @@ var update_schedule = "업데이트 일정";
 var back_month = "이전 달";
 var today_schedule = "오늘 스케줄";
 var schedule_achieved = "달성한 스케줄";
+var i_dont_have_my_phone_number_yet = "휴대폰 번호가 없어요";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2381,7 +2382,8 @@ var lang_ko = {
 	update_schedule: update_schedule,
 	back_month: back_month,
 	today_schedule: today_schedule,
-	schedule_achieved: schedule_achieved
+	schedule_achieved: schedule_achieved,
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3413,6 +3415,7 @@ var update_schedule$1 = "Update Schedule";
 var back_month$1 = "Back Month";
 var today_schedule$1 = "Today's schedule";
 var schedule_achieved$1 = "Schedule achieved";
+var i_dont_have_my_phone_number_yet$1 = "I don't have my phone number yet";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4427,7 +4430,8 @@ var lang_en = {
 	update_schedule: update_schedule$1,
 	back_month: back_month$1,
 	today_schedule: today_schedule$1,
-	schedule_achieved: schedule_achieved$1
+	schedule_achieved: schedule_achieved$1,
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -9937,7 +9941,9 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
           setPhoneNumber("");
         });
       }, function (error) {
@@ -10280,10 +10286,12 @@ var signInApi = function signInApi(_ref) {
 var signInWithEmailApi = function signInWithEmailApi(_ref2) {
   var isAcademy = _ref2.isAcademy,
     email = _ref2.email,
-    reCaptcha = _ref2.reCaptcha;
+    reCaptcha = _ref2.reCaptcha,
+    role = _ref2.role;
   return api.post((isAcademy ? SIGN_IN_URL : SIGN_IN_SUPER_ADMIN_URL) + "/email", {
     email: email,
-    reCaptcha: reCaptcha
+    reCaptcha: reCaptcha,
+    role: role
   }, {
     headers: {
       Domain: window.location.protocol + '//' + window.location.hostname + (window.location.port ? ':' + window.location.port : '')
@@ -10419,8 +10427,17 @@ var useLogin$1 = function useLogin(_ref) {
                 var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
                 var needToRegister = isFirstLogin && isAcademy;
                 var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
+                console.log({
+                  isFirstLogin: isFirstLogin,
+                  isAcademy: isAcademy,
+                  token: token,
+                  user: user,
+                  redirectUrl: redirectUrl
+                });
                 handleSwitchOTP(false);
-                redirectLoginUser(user, token, redirectUrl);
+                redirectLoginUser(_extends({}, user, {
+                  isNotEnoughStatements: isFirstLogin
+                }), token, redirectUrl);
               });
             }
           }();
@@ -10431,7 +10448,8 @@ var useLogin$1 = function useLogin(_ref) {
             return Promise.resolve(signInWithEmailApi({
               isAcademy: isAcademyReq,
               email: email,
-              reCaptcha: tokenReCaptcha
+              reCaptcha: tokenReCaptcha,
+              role: role
             })).then(function () {
               reactToastify.toast.success(t("please_check_your_mailbox"));
               handleSwitchOTP(true);
@@ -10622,7 +10640,9 @@ var useLogiQRCode = function useLogiQRCode(props) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function () {
         setInvalid(true);
@@ -10872,7 +10892,9 @@ var useLoginWithEmail = function useLoginWithEmail(_ref) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function (error) {
         console.log(error);
@@ -10932,7 +10954,7 @@ var useLogin$2 = function useLogin(_ref) {
     passwordError = _useState2[0],
     setPasswordError = _useState2[1];
   var searchParams = new URLSearchParams(window.location.search);
-  var paramDomain = searchParams.get('domain');
+  var paramDomain = searchParams.get("domain");
   var academyDomain = paramDomain || getAcademyDomain();
   var isStudent = role === exports.Role.Student;
   var isAcademyReq = isStudent || !!academyDomain;
@@ -10990,11 +11012,13 @@ var useLogin$2 = function useLogin(_ref) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function (error) {
         console.log(error);
-        reactToastify.toast.error(getErrorMessage(t, error, t('request_login_fail')));
+        reactToastify.toast.error(getErrorMessage(t, error, t("request_login_fail")));
       }));
     } catch (e) {
       return Promise.reject(e);