mario-core 2.9.209-release → 2.9.212-release

package/dist/containers/Login/components/ButtonLogin.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const ButtonLogin: ({ fnLoginSSO }: any) => JSX.Element;
+export default ButtonLogin;

package/dist/containers/Login/constant/authConfig.d.ts

@@ -0,0 +1,38 @@
+import { LogLevel } from "@azure/msal-browser";
+/**
+ * Configuration object to be passed to MSAL instance on creation.
+ * For a full list of MSAL.js configuration parameters, visit:
+ * https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/configuration.md
+ */
+export declare const msalConfig: {
+    auth: {
+        clientId: string;
+        authority: string;
+        redirectUri: string;
+    };
+    cache: {
+        cacheLocation: string;
+        storeAuthStateInCookie: boolean;
+    };
+    system: {
+        loggerOptions: {
+            loggerCallback: (level: LogLevel, message: string, containsPii: any) => void;
+        };
+    };
+};
+/**
+ * Scopes you add here will be prompted for user consent during sign-in.
+ * By default, MSAL.js will add OIDC scopes (openid, profile, email) to any login request.
+ * For more information about OIDC scopes, visit:
+ * https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent#openid-connect-scopes
+ */
+export declare const loginRequest: {
+    scopes: string[];
+};
+/**
+ * Add here the scopes to request when obtaining an access token for MS Graph API. For more information, see:
+ * https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/resources-and-scopes.md
+ */
+export declare const graphConfig: {
+    graphMeEndpoint: string;
+};

package/dist/containers/Login/constant/config.d.ts

@@ -0,0 +1,6 @@
+export declare const config: {
+    appId: string;
+    redirectUri: string;
+    scopes: string[];
+    authority: string;
+};

package/dist/index.js

@@ -22381,6 +22381,10 @@ var useLogin = function useLogin() {
             profileImageFileName: profileImageFileName
           }));
 
+          if (!localStorage.getItem("ROLES") && roles.includes("Admin")) {
+            localStorage.setItem("ROLES", "Admin");
+          }
+
           if (data !== null && data !== void 0 && data.email && !roles.includes("Admin")) {
             var _data$roles;
 
@@ -22810,6 +22814,12 @@ var BlockLogin = function BlockLogin(_ref) {
           name = _res$profileObj.name;
       var accessToken = res.accessToken;
       var googleId = res.googleId;
+
+      if (email.includes("@gmail")) {
+        alert("Please login with your school email");
+        return;
+      }
+
       var infoLogin = {
         firstName: givenName,
         lastName: familyName,
@@ -23788,6 +23798,7 @@ var TheSidebar = function TheSidebar(_ref) {
 
   var signOut = React.useCallback(function () {
     localStorage.removeItem(ACCESS_TOKEN);
+    localStorage.removeItem("ROLES");
     dispatch(reset());
     history.push("/");
   }, []);
@@ -23980,6 +23991,7 @@ var TheHeaderDropdown = function TheHeaderDropdown(_ref) {
   var isTeacher = roles.includes(TEACHER_ROLE);
   var signOut = React.useCallback(function () {
     localStorage.removeItem(ACCESS_TOKEN);
+    localStorage.removeItem("ROLES");
     dispatch(reset());
     history.push("/");
   }, []);
@@ -24291,11 +24303,7 @@ var ModelSelectRole = function ModelSelectRole(_ref) {
   var roles = user === null || user === void 0 ? void 0 : user.roles;
 
   var handleSelectUserRoles = function handleSelectUserRoles(roles) {
-    if (roles.includes("Admin")) {
-      dispatch(setLoading(true));
-      return history.push("/admin/dashboard");
-    }
-
+    dispatch(setLoading(true));
     var roleSelect = roles.includes("Teacher/Assistant") ? ["Teacher", "Assistant"] : roles;
     dispatch(setUser(_extends({}, user, {
       roles: roleSelect
@@ -24305,6 +24313,8 @@ var ModelSelectRole = function ModelSelectRole(_ref) {
 
     if (roles.includes("Parent")) {
       history.push("/parent");
+    } else if (roles.includes("Admin")) {
+      history.push("/admin/dashboard");
     } else {
       pathname !== "/home" ? history.push("/home") : window.location.reload();
     }