acsi-core 0.9.18 → 0.9.20

package/dist/index.d.ts

@@ -28,6 +28,5 @@ import CustomAsyncSelect from "./components/Selects/CustomAsyncSelect";
 import CustomCreatable from "./components/Selects/CustomCreatable";
 import CustomSelectOption from "./components/Selects/CustomSelectOption";
 import utcToLocalTime from "./utils/utcToLocalTime";
-import timeSpanToLocalMoment from "./utils/timeSpanToLocalMoment";
 import Cookies from "js-cookie";
-export { setLoading, setLoadingPage, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, firstCheckToken, getImageUrl, Login, utcToLocalTime, timeSpanToLocalMoment, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, Cookies, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, CoreTooltip, getErrorMessage, MarkdownLatexRender, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };
+export { setLoading, setLoadingPage, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, firstCheckToken, getImageUrl, Login, utcToLocalTime, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, Cookies, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, CoreTooltip, getErrorMessage, MarkdownLatexRender, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };

package/dist/index.js

@@ -19,10 +19,10 @@ var rehypeRaw = _interopDefault(require('rehype-raw'));
 require('katex/dist/katex.min.css');
 var Cookies = _interopDefault(require('js-cookie'));
 var moment = _interopDefault(require('moment'));
+var msalBrowser = require('@azure/msal-browser');
 var reactToastify = require('react-toastify');
 var reactGoogleLogin = require('@leecheuk/react-google-login');
 var material = require('@mui/material');
-require('@azure/msal-browser');
 var amplitude = require('@amplitude/analytics-browser');
 var Sentry = require('@sentry/react');
 var fa = require('react-icons/fa');
@@ -672,25 +672,6 @@ var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
 
 var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","microsoft_button":"_19ESb","box-field":"_2e9xO","box-input":"_3zXRp","box-text":"_8NJga","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","image-slideshow":"_1aM7m","active":"_Vx1zf","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r","width-400":"_4ehXP"};
 
-// A type of promise-like that resolves synchronously and supports only one observer
-
-const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
-
-const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
-
-// Asynchronously call a function and send errors to recovery continuation
-function _catch(body, recover) {
-	try {
-		var result = body();
-	} catch(e) {
-		return recover(e);
-	}
-	if (result && result.then) {
-		return result.then(void 0, recover);
-	}
-	return result;
-}
-
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
   for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
@@ -739,6 +720,25 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
+// A type of promise-like that resolves synchronously and supports only one observer
+
+const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
+
+const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
+
+// Asynchronously call a function and send errors to recovery continuation
+function _catch(body, recover) {
+	try {
+		var result = body();
+	} catch(e) {
+		return recover(e);
+	}
+	if (result && result.then) {
+		return result.then(void 0, recover);
+	}
+	return result;
+}
+
 var styles = {"core-button":"_xvNBN","primary":"_U9Qyp","secondary":"_1VzMy","text":"_pZNuj","danger":"_2uYm1","light":"_wxH5S"};
 
 var _excluded = ["type", "children", "onClick", "icon", "disabled", "htmlType"];
@@ -2322,6 +2322,55 @@ var TypeLogin;
   TypeLogin[TypeLogin["Microsoft"] = 3] = "Microsoft";
 })(TypeLogin || (TypeLogin = {}));
 
+var AuthenticationMessage;
+(function (AuthenticationMessage) {
+  AuthenticationMessage["NotAllowedToRegister"] = "NotAllowedToRegister";
+  AuthenticationMessage["InvalidGoogleToken"] = "InvalidGoogleToken";
+})(AuthenticationMessage || (AuthenticationMessage = {}));
+(function (Role) {
+  Role["Student"] = "Student";
+  Role["Teacher"] = "Teacher";
+  Role["Admin"] = "Admin";
+})(exports.Role || (exports.Role = {}));
+var msalConfig = function msalConfig(clientId, redirectUri) {
+  return {
+    auth: {
+      clientId: clientId,
+      authority: "https://login.microsoftonline.com/common",
+      redirectUri: redirectUri
+    },
+    cache: {
+      cacheLocation: "sessionStorage",
+      storeAuthStateInCookie: false
+    },
+    system: {
+      loggerOptions: {
+        loggerCallback: function loggerCallback(level, message, containsPii) {
+          if (containsPii) {
+            return;
+          }
+          switch (level) {
+            case msalBrowser.LogLevel.Error:
+              console.error(message);
+              return;
+            case msalBrowser.LogLevel.Info:
+              console.info(message);
+              return;
+            case msalBrowser.LogLevel.Verbose:
+              console.debug(message);
+              return;
+            case msalBrowser.LogLevel.Warning:
+              console.warn(message);
+              return;
+            default:
+              return;
+          }
+        }
+      }
+    }
+  };
+};
+
 var BlockLogin = function BlockLogin(_ref) {
   var onNavigate = _ref.onNavigate,
     role = _ref.role,
@@ -2456,6 +2505,91 @@ var BlockLogin = function BlockLogin(_ref) {
       return console.log(errorResponse);
     }
   });
+  var fnLoginMicrosoft = function fnLoginMicrosoft() {
+    try {
+      var msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT));
+      if (!msalInstance) {
+        console.error("MSAL instance not initialized");
+        return Promise.resolve();
+      }
+      return Promise.resolve(_catch(function () {
+        return Promise.resolve(msalInstance.initialize()).then(function () {
+          var loginRequest = {
+            scopes: ["openid", "profile", "email"]
+          };
+          var silentRequest = _extends$1({}, loginRequest, {
+            prompt: "select_account"
+          });
+          return Promise.resolve(msalInstance.loginPopup(silentRequest)).then(function (response) {
+            return function () {
+              if (response && response.account) {
+                var account = response.account;
+                var fullName = (account === null || account === void 0 ? void 0 : account.name) || "";
+                var infoLogin = {
+                  firstName: fullName.split(' ').slice(0, -1).join(' '),
+                  lastName: fullName.split(' ').slice(-1).join(' '),
+                  fullName: fullName,
+                  imageUrl: "",
+                  email: (account === null || account === void 0 ? void 0 : account.username) || "",
+                  token: (response === null || response === void 0 ? void 0 : response.accessToken) || "",
+                  googleId: (account === null || account === void 0 ? void 0 : account.homeAccountId) || "",
+                  role: role,
+                  type: TypeLogin.Microsoft
+                };
+                dispatch(setLoading(true));
+                return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
+                  var _authResult$data2;
+                  if (((_authResult$data2 = authResult.data) === null || _authResult$data2 === void 0 ? void 0 : _authResult$data2.id) == null) {
+                    dispatch(setLoading(false));
+                    alert("Please contact admin.");
+                    return;
+                  }
+                  localStorage.clear();
+                  var tokenJWT = authResult.data.token;
+                  trackEvent === null || trackEvent === void 0 ? void 0 : trackEvent({
+                    eventName: exports.AmplitudeEvent.LOGIN,
+                    eventProperties: {
+                      email: email,
+                      login_method: 'google',
+                      user_role: authResult.data.role,
+                      success: true,
+                      timestamp: new Date().toISOString()
+                    }
+                  });
+                  if (role === "LandingPage") {
+                    CookieService.setAuthCookie({
+                      token: tokenJWT,
+                      expiresAt: Date.now() + 24 * 60 * 60 * 1000
+                    });
+                    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);
+                  onNavigate("/dashboard");
+                  dispatch(setLoading(false));
+                });
+              }
+            }();
+          });
+        });
+      }, function (error) {
+        console.error("Microsoft login error:", error);
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   React__default.useEffect(function () {
     return function () {
       if (resendTimer) {
@@ -2563,7 +2697,18 @@ var BlockLogin = function BlockLogin(_ref) {
     height: 24,
     alt: "Google sign-in",
     src: "/images/icons/Google__G__logo.png"
-  }), "Sign in with Google")), React__default.createElement("span", {
+  }), "Sign in with Google")), React__default.createElement("div", {
+    className: "" + styleGlobal["microsoft_button"]
+  }, React__default.createElement("button", {
+    onClick: function onClick() {
+      return fnLoginMicrosoft();
+    }
+  }, React__default.createElement("img", {
+    width: 24,
+    height: 24,
+    alt: "Google sign-in",
+    src: "/images/Single-Sign-On-logo.png"
+  }), "Sign in with Microsoft")), React__default.createElement("span", {
     className: "" + styleGlobal["box-field"]
   }, "OR"), React__default.createElement("div", {
     className: "" + styleGlobal["box-input"]
@@ -3393,17 +3538,6 @@ var CommonDialog = function CommonDialog(_ref) {
   }, title)), children);
 };
 
-var AuthenticationMessage;
-(function (AuthenticationMessage) {
-  AuthenticationMessage["NotAllowedToRegister"] = "NotAllowedToRegister";
-  AuthenticationMessage["InvalidGoogleToken"] = "InvalidGoogleToken";
-})(AuthenticationMessage || (AuthenticationMessage = {}));
-(function (Role) {
-  Role["Student"] = "Student";
-  Role["Teacher"] = "Teacher";
-  Role["Admin"] = "Admin";
-})(exports.Role || (exports.Role = {}));
-
 var CustomPagination = function CustomPagination(_ref) {
   var currentPage = _ref.currentPage,
     totalPage = _ref.totalPage,
@@ -3906,16 +4040,6 @@ var utcToLocalTime = (function (time, FORMAT) {
   }
 });
 
-var timeSpanToLocalMoment = (function (time) {
-  if (!time) return null;
-  var times = time.split(":");
-  if (times.length !== 3) return null;
-  var totalSeconds = +times[0] * 60 * 60 + +times[1] * 60 + +times[2];
-  var startOfDay = moment.utc().startOf("day");
-  var dateTime = startOfDay.add(totalSeconds, "seconds");
-  return dateTime.local();
-});
-
 var historyCore = createBrowserHistory();
 
 Object.defineProperty(exports, 'GoogleOAuthProvider', {
@@ -3988,7 +4112,6 @@ exports.setTeam = setTeam;
 exports.setTenant = setTenant;
 exports.setUser = setUser;
 exports.store = store;
-exports.timeSpanToLocalMoment = timeSpanToLocalMoment;
 exports.useAmplitude = useAmplitude;
 exports.useGoogleSignOut = useGoogleSignOut;
 exports.utcToLocalTime = utcToLocalTime;