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
package/dist/index.modern.js
CHANGED
|
@@ -1839,7 +1839,8 @@ var msalConfig = function msalConfig(clientId, redirectUri) {
|
|
|
1839
1839
|
};
|
|
1840
1840
|
|
|
1841
1841
|
var BlockLogin = function BlockLogin(_ref) {
|
|
1842
|
-
var role = _ref.role,
|
|
1842
|
+
var _ref$role = _ref.role,
|
|
1843
|
+
role = _ref$role === void 0 ? "LandingPage" : _ref$role,
|
|
1843
1844
|
hiddenSignup = _ref.hiddenSignup,
|
|
1844
1845
|
email = _ref.email,
|
|
1845
1846
|
setEmail = _ref.setEmail,
|
|
@@ -1919,7 +1920,7 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
1919
1920
|
};
|
|
1920
1921
|
dispatch(setLoading(true));
|
|
1921
1922
|
return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
|
|
1922
|
-
var _authResult$data;
|
|
1923
|
+
var _authResult$data, _authResult$data2, _authResult$data2$rol, _authResult$data3;
|
|
1923
1924
|
if (((_authResult$data = authResult.data) === null || _authResult$data === void 0 ? void 0 : _authResult$data.id) == null) {
|
|
1924
1925
|
dispatch(setLoading(false));
|
|
1925
1926
|
alert("Please contact admin.");
|
|
@@ -1937,33 +1938,16 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
1937
1938
|
timestamp: new Date().toISOString()
|
|
1938
1939
|
}
|
|
1939
1940
|
});
|
|
1940
|
-
|
|
1941
|
-
|
|
1942
|
-
|
|
1943
|
-
|
|
1944
|
-
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
|
|
1948
|
-
return ADMIN_ORIGIN;
|
|
1949
|
-
case "Teacher":
|
|
1950
|
-
return TEACHER_ORIGIN;
|
|
1951
|
-
default:
|
|
1952
|
-
return role + "." + REQUEST_ORIGIN;
|
|
1953
|
-
}
|
|
1954
|
-
};
|
|
1955
|
-
var redirectUrl = getRedirectUrl(authResult.data.role);
|
|
1956
|
-
window.location.href = redirectUrl + "/dashboard";
|
|
1957
|
-
dispatch(setLoading(false));
|
|
1958
|
-
} else {
|
|
1959
|
-
var _authResult$data2, _authResult$data2$rol, _authResult$data3;
|
|
1960
|
-
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
1961
|
-
var domain = "/teacher";
|
|
1962
|
-
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") {
|
|
1963
|
-
domain = "/admin";
|
|
1964
|
-
}
|
|
1965
|
-
window.location.href = domain + "/dashboard";
|
|
1941
|
+
CookieService.setAuthCookie({
|
|
1942
|
+
token: tokenJWT,
|
|
1943
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
1944
|
+
});
|
|
1945
|
+
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
1946
|
+
var domain = "/teacher";
|
|
1947
|
+
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") {
|
|
1948
|
+
domain = "/admin";
|
|
1966
1949
|
}
|
|
1950
|
+
window.location.href = domain + "/dashboard";
|
|
1967
1951
|
dispatch(setLoading(false));
|
|
1968
1952
|
});
|
|
1969
1953
|
}
|
|
@@ -2012,7 +1996,7 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
2012
1996
|
};
|
|
2013
1997
|
dispatch(setLoading(true));
|
|
2014
1998
|
return Promise.resolve(apiLoginGoogle(infoLogin)).then(function (authResult) {
|
|
2015
|
-
var _authResult$data4;
|
|
1999
|
+
var _authResult$data4, _authResult$data5, _authResult$data5$rol, _authResult$data6;
|
|
2016
2000
|
if (((_authResult$data4 = authResult.data) === null || _authResult$data4 === void 0 ? void 0 : _authResult$data4.id) == null) {
|
|
2017
2001
|
dispatch(setLoading(false));
|
|
2018
2002
|
alert("Please contact admin.");
|
|
@@ -2030,33 +2014,16 @@ var BlockLogin = function BlockLogin(_ref) {
|
|
|
2030
2014
|
timestamp: new Date().toISOString()
|
|
2031
2015
|
}
|
|
2032
2016
|
});
|
|
2033
|
-
|
|
2034
|
-
|
|
2035
|
-
|
|
2036
|
-
|
|
2037
|
-
|
|
2038
|
-
|
|
2039
|
-
|
|
2040
|
-
|
|
2041
|
-
return ADMIN_ORIGIN;
|
|
2042
|
-
case "Teacher":
|
|
2043
|
-
return TEACHER_ORIGIN;
|
|
2044
|
-
default:
|
|
2045
|
-
return role + "." + REQUEST_ORIGIN;
|
|
2046
|
-
}
|
|
2047
|
-
};
|
|
2048
|
-
var redirectUrl = getRedirectUrl(authResult.data.role);
|
|
2049
|
-
window.location.href = redirectUrl + "/dashboard";
|
|
2050
|
-
dispatch(setLoading(false));
|
|
2051
|
-
} else {
|
|
2052
|
-
var _authResult$data5, _authResult$data5$rol, _authResult$data6;
|
|
2053
|
-
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
2054
|
-
var domain = "/teacher";
|
|
2055
|
-
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") {
|
|
2056
|
-
domain = "/admin";
|
|
2057
|
-
}
|
|
2058
|
-
window.location.href = domain + "/dashboard";
|
|
2017
|
+
CookieService.setAuthCookie({
|
|
2018
|
+
token: tokenJWT,
|
|
2019
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
2020
|
+
});
|
|
2021
|
+
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
2022
|
+
var domain = "/teacher";
|
|
2023
|
+
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") {
|
|
2024
|
+
domain = "/admin";
|
|
2059
2025
|
}
|
|
2026
|
+
window.location.href = domain + "/dashboard";
|
|
2060
2027
|
dispatch(setLoading(false));
|
|
2061
2028
|
});
|
|
2062
2029
|
}
|
|
@@ -2432,7 +2399,7 @@ var defaultInfo = {
|
|
|
2432
2399
|
rememberMe: false
|
|
2433
2400
|
};
|
|
2434
2401
|
var minutes = 15;
|
|
2435
|
-
var useLogin = function useLogin(
|
|
2402
|
+
var useLogin = function useLogin(_onNavigate, trackEvent) {
|
|
2436
2403
|
var _useState = useState(false),
|
|
2437
2404
|
openLogin = _useState[0],
|
|
2438
2405
|
setOpenLogin = _useState[1];
|
|
@@ -2499,6 +2466,7 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
|
|
|
2499
2466
|
})).then(function (res) {
|
|
2500
2467
|
var data = res.data;
|
|
2501
2468
|
if (data.success) {
|
|
2469
|
+
var _data$data$roles;
|
|
2502
2470
|
localStorage.clear();
|
|
2503
2471
|
var tokenJWT = data.data.token;
|
|
2504
2472
|
localStorage.setItem(ACCESS_TOKEN, tokenJWT);
|
|
@@ -2510,26 +2478,15 @@ var useLogin = function useLogin(onNavigate, trackEvent) {
|
|
|
2510
2478
|
timestamp: new Date().toISOString()
|
|
2511
2479
|
}
|
|
2512
2480
|
});
|
|
2513
|
-
|
|
2514
|
-
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
|
|
2520
|
-
var domain = TEACHER_ORIGIN;
|
|
2521
|
-
if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin")) {
|
|
2522
|
-
domain = ADMIN_ORIGIN;
|
|
2523
|
-
}
|
|
2524
|
-
onNavigate(domain + "/dashboard");
|
|
2525
|
-
} else {
|
|
2526
|
-
var _data$data$roles2;
|
|
2527
|
-
var _domain = "/teacher";
|
|
2528
|
-
if ((_data$data$roles2 = data.data.roles) !== null && _data$data$roles2 !== void 0 && _data$data$roles2.includes("Admin")) {
|
|
2529
|
-
_domain = "/admin";
|
|
2530
|
-
}
|
|
2531
|
-
onNavigate(_domain + "/dashboard");
|
|
2481
|
+
CookieService.setAuthCookie({
|
|
2482
|
+
token: tokenJWT,
|
|
2483
|
+
expiresAt: Date.now() + 24 * 60 * 60 * 1000
|
|
2484
|
+
});
|
|
2485
|
+
var domain = "/teacher";
|
|
2486
|
+
if ((_data$data$roles = data.data.roles) !== null && _data$data$roles !== void 0 && _data$data$roles.includes("Admin") || data.data.role === "Admin") {
|
|
2487
|
+
domain = "/admin";
|
|
2532
2488
|
}
|
|
2489
|
+
window.location.href = domain + "/dashboard";
|
|
2533
2490
|
} else {
|
|
2534
2491
|
toast.error("The code is not correct. Please check again.");
|
|
2535
2492
|
}
|