acsi-core 0.1.44 → 0.1.50

package/dist/components/CoreTextArea/index.d.ts

@@ -20,6 +20,7 @@ interface IProps {
     autoResize?: boolean;
     onClick?: () => void;
     onBlur?: () => void;
+    isDisabled?: boolean;
 }
 declare const CoreTextArea: (props: IProps) => React.JSX.Element;
 export default CoreTextArea;

package/dist/index.js

@@ -32,6 +32,8 @@ var setAddTenant = toolkit.createAction("common/setAddTenant");
 var setTeam = toolkit.createAction("common/setTeam");
 
 var REQUEST_ORIGIN = process.env.REACT_APP_REQUEST_ORIGIN || "";
+var ADMIN_ORIGIN = process.env.REACT_APP_ADMIN_ORIGIN || "";
+var TEACHER_ORIGIN = process.env.REACT_APP_TEACHER_ORIGIN || "";
 var GOOGLE_RECAPTCHA_KEY = process.env.REACT_APP_GOOGLE_RECAPTCHA_KEY || "";
 var GOOGLE_CLIENT_ID = process.env.REACT_APP_GOOGLE_CLIENT_ID || "";
 var GOOGLE_RECAPTCHA_ID = process.env.REACT_APP_GOOGLE_RECAPTCHA_ID || "";
@@ -153,14 +155,19 @@ var itemLogin = ['Seamless lesson planning', 'Flexibility and customization', 'D
 var CookieService = /*#__PURE__*/function () {
   function CookieService() {}
   CookieService.setAuthCookie = function setAuthCookie(data) {
+    var rootDomain = this.getRootDomain(REQUEST_ORIGIN);
     Cookies.set(AUTH_COOKIE, data.token, {
       expires: new Date(data.expiresAt),
       secure: process.env.NODE_ENV === 'production',
-      domain: '.' + REQUEST_ORIGIN,
+      domain: '.' + rootDomain,
       sameSite: 'strict',
       path: '/'
     });
   };
+  CookieService.getRootDomain = function getRootDomain(host) {
+    var match = host.match(/([^.]+\.[^.]+)$/);
+    return match ? match[0] : host;
+  };
   CookieService.getAuthCookie = function getAuthCookie() {
     var cookie = Cookies.get(AUTH_COOKIE);
     return cookie ? JSON.parse(cookie) : null;
@@ -184,7 +191,6 @@ var BlockLogin = function BlockLogin(_ref) {
   var onNavigate = _ref.onNavigate,
     role = _ref.role,
     hiddenSignup = _ref.hiddenSignup,
-    fromLandingPage = _ref.fromLandingPage,
     email = _ref.email,
     setEmail = _ref.setEmail,
     loginWithEmail = _ref.loginWithEmail,
@@ -220,24 +226,34 @@ var BlockLogin = function BlockLogin(_ref) {
                 email: _email,
                 token: accessToken,
                 googleId: sub,
-                role: fromLandingPage ? 'LandingPage' : role
+                role: role
               };
               dispatch(setLoading(true));
-              return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (res1) {
-                var _res1$data;
-                if (((_res1$data = res1.data) === null || _res1$data === void 0 ? void 0 : _res1$data.id) == null) {
+              return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
+                var _authResult$data;
+                if (((_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id) == null) {
                   dispatch(setLoading(false));
                   alert("Please contact admin.");
                   return;
                 }
-                var tokenJWT = res1.data.token;
+                var tokenJWT = authResult.data.token;
                 CookieService.setAuthCookie({
                   token: tokenJWT,
                   expiresAt: Date.now() + 24 * 60 * 60 * 1000
                 });
-                if (fromLandingPage) {
-                  var redirectUrl = role + '.' + REQUEST_ORIGIN;
-                  window.location.href = "https://" + redirectUrl + "/dashboard";
+                if (role === "LandingPage") {
+                  var getRedirectUrl = function getRedirectUrl(role) {
+                    switch (role) {
+                      case "Admin":
+                        return ADMIN_ORIGIN;
+                      case "Teacher":
+                        return TEACHER_ORIGIN;
+                      default:
+                        return role + "." + REQUEST_ORIGIN;
+                    }
+                  };
+                  var redirectUrl = getRedirectUrl(authResult.data.role);
+                  window.location.href = redirectUrl + "/dashboard";
                   dispatch(setLoading(false));
                 }
                 localStorage.setItem(ACCESS_TOKEN, tokenJWT);
@@ -347,7 +363,7 @@ var BlockLogin = function BlockLogin(_ref) {
       fontSize: "13px",
       color: "#A6A6AD"
     }
-  }, "By signing in, you agree to our Terms & Privacy Policy")))), role != "Admin" && !fromLandingPage && React__default.createElement(reactstrap.Col, {
+  }, "By signing in, you agree to our Terms & Privacy Policy")))), role != "Admin" && role != 'LandingPage' && React__default.createElement(reactstrap.Col, {
     sm: 12,
     lg: 5,
     className: "d-none d-lg-block " + styleGlobal["pr-30"]
@@ -395,7 +411,7 @@ var BlockLogin = function BlockLogin(_ref) {
     },
     alt: "",
     src: "/images/icons/Vector 22.png"
-  }))))))), role != "Admin" && fromLandingPage && React__default.createElement(reactstrap.Col, {
+  }))))))), role === "LandingPage" && React__default.createElement(reactstrap.Col, {
     sm: 12,
     lg: 5,
     className: "d-none d-lg-block " + styleGlobal["pr-30"]
@@ -596,8 +612,7 @@ var useLogin = function useLogin(onNavigate) {
 var Login = function Login(props) {
   var onNavigate = props.onNavigate,
     role = props.role,
-    hiddenSignup = props.hiddenSignup,
-    fromLandingPage = props.fromLandingPage;
+    hiddenSignup = props.hiddenSignup;
   var _useLogin = useLogin(onNavigate),
     defaultInfo = _useLogin.defaultInfo,
     email = _useLogin.email,
@@ -614,7 +629,6 @@ var Login = function Login(props) {
     defaultInfo: defaultInfo,
     email: email,
     hiddenSignup: hiddenSignup,
-    fromLandingPage: fromLandingPage,
     setEmail: setEmail,
     loginWithEmail: loginWithEmail,
     code: code,
@@ -1712,7 +1726,7 @@ var Info = function Info() {
   }));
 };
 
-var _excluded$1 = ["name", "value", "onChange", "placeholder", "error", "label", "isOptional", "tooltip", "noBorder", "smallHeight", "cols", "rows", "minHeight", "className", "onKeyDown", "onKeyFocus", "autoResize", "width", "onClick", "onBlur"];
+var _excluded$1 = ["name", "value", "onChange", "placeholder", "error", "label", "isOptional", "tooltip", "noBorder", "smallHeight", "cols", "rows", "minHeight", "className", "onKeyDown", "onKeyFocus", "autoResize", "width", "onClick", "onBlur", "isDisabled"];
 var CoreTextArea = function CoreTextArea(props) {
   var _props$name = props.name,
     name = _props$name === void 0 ? "" : _props$name,
@@ -1740,6 +1754,7 @@ var CoreTextArea = function CoreTextArea(props) {
     width = props.width,
     onClick = props.onClick,
     onBlur = props.onBlur,
+    isDisabled = props.isDisabled,
     rest = _objectWithoutPropertiesLoose(props, _excluded$1);
   var _useState = React.useState(false),
     isOpenTooltip = _useState[0],
@@ -1799,7 +1814,8 @@ var CoreTextArea = function CoreTextArea(props) {
     },
     className: className,
     onClick: onClick,
-    onBlur: onBlur
+    onBlur: onBlur,
+    disabled: isDisabled
   }, rest)));
 };