acsi-core 0.1.88 → 0.1.90

package/dist/containers/Login/configs/constants.d.ts

@@ -1,3 +1,4 @@
+import { LogLevel } from "@azure/msal-browser";
 export declare enum AuthenticationMessage {
     NotAllowedToRegister = "NotAllowedToRegister",
     InvalidGoogleToken = "InvalidGoogleToken"
@@ -7,3 +8,28 @@ export declare enum Role {
     Teacher = "Teacher",
     Admin = "Admin"
 }
+export interface IInformationUser {
+    firstName: string;
+    lastName: string;
+    fullName: string;
+    imageUrl: string | null;
+    email: string;
+    accessToken: string;
+    googleId: string;
+}
+export declare const msalConfig: (clientId: string, redirectUri: string) => {
+    auth: {
+        clientId: string;
+        authority: string;
+        redirectUri: string;
+    };
+    cache: {
+        cacheLocation: string;
+        storeAuthStateInCookie: boolean;
+    };
+    system: {
+        loggerOptions: {
+            loggerCallback: (level: LogLevel, message: string, containsPii: any) => void;
+        };
+    };
+};

package/dist/containers/Login/configs/default.d.ts

@@ -2,5 +2,6 @@ export declare const itemLogin: string[];
 export declare enum TypeLogin {
     Google = 0,
     Email = 1,
-    Impersonate = 2
+    Impersonate = 2,
+    Microsoft = 3
 }

package/dist/index.css

@@ -30,6 +30,22 @@
       justify-content: center;
       gap: 8px;
       margin-bottom: 19px; }
+    ._1KLz9 ._2Jo1o ._19ESb {
+      margin-bottom: 10px; }
+      ._1KLz9 ._2Jo1o ._19ESb button {
+        width: 100%;
+        padding: 12px;
+        border-radius: 12px;
+        border: none;
+        background-color: transparent;
+        border: 1px solid #e6e6eb;
+        font-size: 16px;
+        font-weight: 600;
+        color: #101129;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 8px; }
     ._1KLz9 ._2Jo1o ._2e9xO {
       font-size: 13px;
       color: #c6c6cc;

package/dist/index.js

@@ -13,6 +13,7 @@ var ReactSelect = require('react-select');
 var ReactSelect__default = _interopDefault(ReactSelect);
 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');
@@ -46,31 +47,14 @@ var PUSHER_CONFIG = {
   cluster: process.env.REACT_APP_PUSHER_CONFIG_CLUSTER || "",
   key: process.env.REACT_APP_PUSHER_CONFIG_KEY || ""
 };
+var MICROSOFT_CLIENT_ID = process.env.REACT_MICROSOFT_CLIENT_ID || "";
+var MICROSOFT_URL_DIRECT = process.env.REACT_MICROSOFT_URL_DIRECT || "";
 var OPENSALT_BASE_URL = process.env.REACT_APP_OPENSALT || "";
 var ACCESS_TOKEN = "ACCESS_TOKEN";
 var AUTH_COOKIE = "auth";
 var DATE_MIN_VALUE = "0001-01-01T00:00:00+00:00";
 var DATE_TIME_MIN_VALUE = "0001-01-01T00:00:00";
 var DefaultErrorMessage = "an_unexpected_error_has_occurred";
-var getAccessToken = function getAccessToken() {
-  try {
-    return localStorage.getItem(ACCESS_TOKEN);
-  } catch (err) {
-    return null;
-  }
-};
-var encodeParams = function encodeParams(params) {
-  return Object.keys(params).filter(function (key) {
-    return params[key] || params[key] === 0 || params[key] === false;
-  }).map(function (key) {
-    if (Array.isArray(params[key])) {
-      return params[key].map(function (i) {
-        return encodeURIComponent(key) + "=" + encodeURIComponent(i);
-      }).join("&");
-    }
-    return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
-  }).join("&");
-};
 var COLORS = {
   brandBlack: "#101129",
   grayText: "#585869",
@@ -94,7 +78,7 @@ var COLORS = {
 var ORGANIZATION_TENANT = "ORGANIZATION_TENANT";
 var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
 
-var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","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"};
+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
 
@@ -1136,6 +1120,27 @@ var CookieService = /*#__PURE__*/function () {
   AmplitudeEvent["USER_USAGE"] = "user_usage";
 })(exports.AmplitudeEvent || (exports.AmplitudeEvent = {}));
 
+var encodeParams = (function (params) {
+  return Object.keys(params).filter(function (key) {
+    return params[key] || params[key] === 0 || params[key] === false;
+  }).map(function (key) {
+    if (Array.isArray(params[key])) {
+      return params[key].map(function (i) {
+        return encodeURIComponent(key) + "=" + encodeURIComponent(i);
+      }).join('&');
+    }
+    return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
+  }).join('&');
+});
+
+var getAccessToken = (function () {
+  try {
+    return localStorage.getItem(ACCESS_TOKEN);
+  } catch (err) {
+    return null;
+  }
+});
+
 var api = axios.create({
   baseURL: BASE_URL,
   timeout: 0,
@@ -1160,6 +1165,10 @@ var apiUpload = axios.create({
       config.headers.Authorization = "Bearer " + token;
       localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
     }
+    var imPersonate = localStorage.getItem("IMPERSONATE") == "1";
+    if (imPersonate) {
+      config.headers.ImPersonate = imPersonate;
+    }
     return config;
   }, function (error) {
     return Promise.reject(error);
@@ -1211,8 +1220,58 @@ var TypeLogin;
   TypeLogin[TypeLogin["Google"] = 0] = "Google";
   TypeLogin[TypeLogin["Email"] = 1] = "Email";
   TypeLogin[TypeLogin["Impersonate"] = 2] = "Impersonate";
+  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,
@@ -1243,6 +1302,9 @@ var BlockLogin = function BlockLogin(_ref) {
   var _useState5 = React.useState(0),
     currentImageIndex = _useState5[0],
     setCurrentImageIndex = _useState5[1];
+  var _useState6 = React.useState(),
+    msalInstance = _useState6[0],
+    setMsalInstance = _useState6[1];
   var handleGetImage = function handleGetImage() {
     try {
       var _temp = _catch(function () {
@@ -1347,6 +1409,92 @@ var BlockLogin = function BlockLogin(_ref) {
       return console.log(errorResponse);
     }
   });
+  var fnLoginMicrosoft = function fnLoginMicrosoft() {
+    try {
+      if (!msalInstance) {
+        console.error("MSAL instance not initialized");
+        return Promise.resolve();
+      }
+      return Promise.resolve(_catch(function () {
+        return Promise.resolve(msalInstance.initialize()).then(function () {
+          console.log("MSAL instance initialized:", msalInstance);
+          var loginRequest = {
+            scopes: ["openid", "profile", "email"]
+          };
+          return Promise.resolve(msalInstance.loginPopup(loginRequest)).then(function (response) {
+            console.log("Login response:", response);
+            return function () {
+              if (response && response.account) {
+                var account = response.account;
+                console.log("User account:", 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()
+                    }
+                  });
+                  console.log("Login info:", infoLogin);
+                  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);
+        alert("Microsoft login failed. Please try again.");
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   React__default.useEffect(function () {
     return function () {
       if (resendTimer) {
@@ -1411,6 +1559,25 @@ var BlockLogin = function BlockLogin(_ref) {
       return clearInterval(interval);
     };
   }, [images.length]);
+  var initInformationSSO = function initInformationSSO() {
+    try {
+      console.log("Initializing Microsoft SSO with client ID:", MICROSOFT_CLIENT_ID, "and redirect URL:", MICROSOFT_URL_DIRECT);
+      var _msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT));
+      console.log({
+        msalInstance: _msalInstance
+      });
+      setMsalInstance(_msalInstance);
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  React.useEffect(function () {
+    console.log({
+      TEACHER_ORIGIN: TEACHER_ORIGIN
+    });
+    initInformationSSO();
+  }, []);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Row, {
     style: {
       height: "100%"
@@ -1454,7 +1621,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"]
@@ -2095,91 +2273,16 @@ var store = toolkit.configureStore({
   }
 });
 
-var getAccessToken$1 = (function () {
-  try {
-    return localStorage.getItem(ACCESS_TOKEN);
-  } catch (err) {
-    return null;
-  }
-});
-
-var encodeParams$1 = (function (params) {
-  return Object.keys(params).filter(function (key) {
-    return params[key] || params[key] === 0 || params[key] === false;
-  }).map(function (key) {
-    if (Array.isArray(params[key])) {
-      return params[key].map(function (i) {
-        return encodeURIComponent(key) + "=" + encodeURIComponent(i);
-      }).join('&');
-    }
-    return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
-  }).join('&');
-});
-
-var api$1 = axios.create({
-  baseURL: BASE_URL,
-  timeout: 0,
-  headers: {
-    "Content-Type": "application/json"
-  },
-  paramsSerializer: function paramsSerializer(params) {
-    return encodeParams$1(params);
-  }
-});
-var apiUpload$1 = axios.create({
-  baseURL: BASE_URL,
-  timeout: 10 * 60 * 1000,
-  headers: {
-    "Content-Type": "multipart/form-data"
-  }
-});
-[api$1, apiUpload$1].forEach(function (i) {
-  return i.interceptors.request.use(function (config) {
-    var token = getAccessToken$1();
-    if (token) {
-      config.headers.Authorization = "Bearer " + token;
-      localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
-    }
-    return config;
-  }, function (error) {
-    return Promise.reject(error);
-  });
-});
-[api$1, apiUpload$1].forEach(function (i) {
-  return i.interceptors.response.use(function (response) {
-    return response;
-  }, function (error) {
-    if (error.response.status === 401) {
-      window.location.href = "/login";
-    }
-    if (error.response.status == 403) {
-      var hostname = window.location.hostname;
-      var parts = hostname.split('.');
-      var domain = parts.slice(-2).join('.');
-      localStorage.removeItem(ACCESS_TOKEN);
-      localStorage.removeItem(ORGANIZATION_TENANT);
-      localStorage.removeItem(ORGANIZATION_TEAM);
-      Cookies.remove('auth', {
-        path: '/',
-        domain: "." + domain
-      });
-      localStorage.removeItem("USER_EMAIL");
-      window.location.href = "/login";
-    }
-    return Promise.reject(error);
-  });
-});
-
 var AUTH_URL = BASE_URL + "/api/auth";
 var checkToken = function checkToken(token) {
-  return api$1.post(AUTH_URL + "/checktoken", {
+  return api.post(AUTH_URL + "/checktoken", {
     token: token
   });
 };
 
 var firstCheckToken = function firstCheckToken() {
   return Promise.resolve(_catch(function () {
-    var token = getAccessToken$1();
+    var token = getAccessToken();
     return token ? Promise.resolve(checkToken(token)).then(function (tokenStatus) {
       return tokenStatus.data ? true : false;
     }) : false;
@@ -2359,17 +2462,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,
@@ -2921,10 +3013,10 @@ exports.NotFound = NotFound;
 exports.OPENSALT_BASE_URL = OPENSALT_BASE_URL;
 exports.ORGANIZATION_TEAM = ORGANIZATION_TEAM;
 exports.ORGANIZATION_TENANT = ORGANIZATION_TENANT;
-exports.api = api$1;
-exports.apiUpload = apiUpload$1;
+exports.api = api;
+exports.apiUpload = apiUpload;
 exports.firstCheckToken = firstCheckToken;
-exports.getAccessToken = getAccessToken$1;
+exports.getAccessToken = getAccessToken;
 exports.getErrorMessage = getErrorMessage;
 exports.getImageUrl = getImageUrl;
 exports.historyCore = historyCore;