acsi-core 1.2.31 → 1.2.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/containers/Login/hooks/useLogin.d.ts +1 -1
- package/dist/index.js +32 -75
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +32 -75
- package/dist/index.modern.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ declare type LoginInfo = {
|
|
|
5
5
|
captcha: string;
|
|
6
6
|
rememberMe: boolean;
|
|
7
7
|
};
|
|
8
|
-
declare const useLogin: (
|
|
8
|
+
declare const useLogin: (_onNavigate: any, trackEvent?: ((props: any) => void) | undefined) => {
|
|
9
9
|
defaultInfo: LoginInfo;
|
|
10
10
|
openLogin: boolean;
|
|
11
11
|
toggle: () => void;
|
package/dist/index.js
CHANGED
|
@@ -1838,7 +1838,8 @@ var msalConfig = function msalConfig(clientId, redirectUri) {
|
|
|
1838
1838
|
};
|
|
1839
1839
|
|
|
1840
1840
|
var BlockLogin = function BlockLogin(_ref) {
|
|
1841
|
-
var role = _ref.role,
|
|
1841
|
+
var _ref$role = _ref.role,
|
|
1842
|
+
role = _ref$role === void 0 ? "LandingPage" : _ref$role,
|
|
1842
1843
|
hiddenSignup = _ref.hiddenSignup,
|
|
1843
1844
|
email = _ref.email,
|
|
1844
1845
|
setEmail = _ref.setEmail,
|
|
@@ -1918,7 +1919,7 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
1918
1919
|
};
|
|
1919
1920
|
dispatch(setLoading(true));
|
|
1920
1921
|
return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
|
|
1921
|
-
var _authResult$data;
|
|
1922
|
+
var _authResult$data, _authResult$data2, _authResult$data2$rol, _authResult$data3;
|
|
1922
1923
|
if (((_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id) == null) {
|
|
1923
1924
|
dispatch(setLoading(false));
|
|
1924
1925
|
alert("Please contact admin.");
|
|
@@ -1936,33 +1937,16 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
1936
1937
|
timestamp: new Date().toISOString()
|
|
1937
1938
|
}
|
|
1938
1939
|
});
|
|
1939
|
-
|
|
1940
|
-
|
|
1941
|
-
|
|
1942
|
-
|
|
1943
|
-
|
|
1944
|
-
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
return ADMIN_ORIGIN;
|
|
1948
|
-
case "Teacher":
|
|
1949
|
-
return TEACHER_ORIGIN;
|
|
1950
|
-
default:
|
|
1951
|
-
return role + "." + REQUEST_ORIGIN;
|
|
1952
|
-
}
|
|
1953
|
-
};
|
|
1954
|
-
var redirectUrl = getRedirectUrl(authResult.data.role);
|
|
1955
|
-
window.location.href = redirectUrl + "/dashboard";
|
|
1956
|
-
dispatch(setLoading(false));
|
|
1957
|
-
} else {
|
|
1958
|
-
var _authResult$data2, _authResult$data2$rol, _authResult$data3;
|
|
1959
|
-
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
1960
|
-
var domain = "/teacher";
|
|
1961
|
-
if ((_authResult$data2 = authResult.data) !== null && _authResult$data2 !== void 0 && (_authResult$data2$rol = _authResult$data2.roles) !== null && _authResult$data2$rol !== void 0 && _authResult$data2$rol.includes("Admin") || ((_authResult$data3 = authResult.data) === null || _authResult$data3 === void 0 ? void 0 : _authResult$data3.role) === "Admin") {
|
|
1962
|
-
domain = "/admin";
|
|
1963
|
-
}
|
|
1964
|
-
window.location.href = domain + "/dashboard";
|
|
1940
|
+
CookieService.setAuthCookie({
|
|
1941
|
+
token: tokenJWT,
|
|
1942
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
1943
|
+
});
|
|
1944
|
+
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
1945
|
+
var domain = "/teacher";
|
|
1946
|
+
if ((_authResult$data2 = authResult.data) !== null && _authResult$data2 !== void 0 && (_authResult$data2$rol = _authResult$data2.roles) !== null && _authResult$data2$rol !== void 0 && _authResult$data2$rol.includes("Admin") || ((_authResult$data3 = authResult.data) === null || _authResult$data3 === void 0 ? void 0 : _authResult$data3.role) === "Admin") {
|
|
1947
|
+
domain = "/admin";
|
|
1965
1948
|
}
|
|
1949
|
+
window.location.href = domain + "/dashboard";
|
|
1966
1950
|
dispatch(setLoading(false));
|
|
1967
1951
|
});
|
|
1968
1952
|
}
|
|
@@ -2011,7 +1995,7 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
2011
1995
|
};
|
|
2012
1996
|
dispatch(setLoading(true));
|
|
2013
1997
|
return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
|
|
2014
|
-
var _authResult$data4;
|
|
1998
|
+
var _authResult$data4, _authResult$data5, _authResult$data5$rol, _authResult$data6;
|
|
2015
1999
|
if (((_authResult$data4 = authResult.data) === null || _authResult$data4 === void 0 ? void 0 : _authResult$data4.id) == null) {
|
|
2016
2000
|
dispatch(setLoading(false));
|
|
2017
2001
|
alert("Please contact admin.");
|
|
@@ -2029,33 +2013,16 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
2029
2013
|
timestamp: new Date().toISOString()
|
|
2030
2014
|
}
|
|
2031
2015
|
});
|
|
2032
|
-
|
|
2033
|
-
|
|
2034
|
-
|
|
2035
|
-
|
|
2036
|
-
|
|
2037
|
-
|
|
2038
|
-
|
|
2039
|
-
|
|
2040
|
-
return ADMIN_ORIGIN;
|
|
2041
|
-
case "Teacher":
|
|
2042
|
-
return TEACHER_ORIGIN;
|
|
2043
|
-
default:
|
|
2044
|
-
return role + "." + REQUEST_ORIGIN;
|
|
2045
|
-
}
|
|
2046
|
-
};
|
|
2047
|
-
var redirectUrl = getRedirectUrl(authResult.data.role);
|
|
2048
|
-
window.location.href = redirectUrl + "/dashboard";
|
|
2049
|
-
dispatch(setLoading(false));
|
|
2050
|
-
} else {
|
|
2051
|
-
var _authResult$data5, _authResult$data5$rol, _authResult$data6;
|
|
2052
|
-
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
2053
|
-
var domain = "/teacher";
|
|
2054
|
-
if ((_authResult$data5 = authResult.data) !== null && _authResult$data5 !== void 0 && (_authResult$data5$rol = _authResult$data5.roles) !== null && _authResult$data5$rol !== void 0 && _authResult$data5$rol.includes("Admin") || ((_authResult$data6 = authResult.data) === null || _authResult$data6 === void 0 ? void 0 : _authResult$data6.role) === "Admin") {
|
|
2055
|
-
domain = "/admin";
|
|
2056
|
-
}
|
|
2057
|
-
window.location.href = domain + "/dashboard";
|
|
2016
|
+
CookieService.setAuthCookie({
|
|
2017
|
+
token: tokenJWT,
|
|
2018
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
2019
|
+
});
|
|
2020
|
+
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
2021
|
+
var domain = "/teacher";
|
|
2022
|
+
if ((_authResult$data5 = authResult.data) !== null && _authResult$data5 !== void 0 && (_authResult$data5$rol = _authResult$data5.roles) !== null && _authResult$data5$rol !== void 0 && _authResult$data5$rol.includes("Admin") || ((_authResult$data6 = authResult.data) === null || _authResult$data6 === void 0 ? void 0 : _authResult$data6.role) === "Admin") {
|
|
2023
|
+
domain = "/admin";
|
|
2058
2024
|
}
|
|
2025
|
+
window.location.href = domain + "/dashboard";
|
|
2059
2026
|
dispatch(setLoading(false));
|
|
2060
2027
|
});
|
|
2061
2028
|
}
|
|
@@ -2431,7 +2398,7 @@ var defaultInfo = {
|
|
|
2431
2398
|
rememberMe: false
|
|
2432
2399
|
};
|
|
2433
2400
|
var minutes = 15;
|
|
2434
|
-
var useLogin = function useLogin(
|
|
2401
|
+
var useLogin = function useLogin(_onNavigate, trackEvent) {
|
|
2435
2402
|
var _useState = React.useState(false),
|
|
2436
2403
|
openLogin = _useState[0],
|
|
2437
2404
|
setOpenLogin = _useState[1];
|
|
@@ -2498,6 +2465,7 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
|
|
|
2498
2465
|
})).then(function (res) {
|
|
2499
2466
|
var data = res.data;
|
|
2500
2467
|
if (data.success) {
|
|
2468
|
+
var _data$data$roles;
|
|
2501
2469
|
localStorage.clear();
|
|
2502
2470
|
var tokenJWT = data.data.token;
|
|
2503
2471
|
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
@@ -2509,26 +2477,15 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
|
|
|
2509
2477
|
timestamp: new Date().toISOString()
|
|
2510
2478
|
}
|
|
2511
2479
|
});
|
|
2512
|
-
|
|
2513
|
-
|
|
2514
|
-
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
var domain = TEACHER_ORIGIN;
|
|
2520
|
-
if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin")) {
|
|
2521
|
-
domain = ADMIN_ORIGIN;
|
|
2522
|
-
}
|
|
2523
|
-
onNavigate(domain + "/dashboard");
|
|
2524
|
-
} else {
|
|
2525
|
-
var _data$data$roles2;
|
|
2526
|
-
var _domain = "/teacher";
|
|
2527
|
-
if ((_data$data$roles2 = data.data.roles) !== null && _data$data$roles2 !== void 0 && _data$data$roles2.includes("Admin")) {
|
|
2528
|
-
_domain = "/admin";
|
|
2529
|
-
}
|
|
2530
|
-
onNavigate(_domain + "/dashboard");
|
|
2480
|
+
CookieService.setAuthCookie({
|
|
2481
|
+
token: tokenJWT,
|
|
2482
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
2483
|
+
});
|
|
2484
|
+
var domain = "/teacher";
|
|
2485
|
+
if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin") || data.data.role === "Admin") {
|
|
2486
|
+
domain = "/admin";
|
|
2531
2487
|
}
|
|
2488
|
+
window.location.href = domain + "/dashboard";
|
|
2532
2489
|
} else {
|
|
2533
2490
|
reactToastify.toast.error("The code is not correct. Please check again.");
|
|
2534
2491
|
}
|