touchstudy-core 0.1.51 → 0.1.52
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/index.js +21 -14
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +21 -14
- package/dist/index.modern.js.map +1 -1
- package/dist/utils/hooks/useAutoAcademyDomain.d.ts +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -8561,7 +8561,10 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
|
|
|
8561
8561
|
}));
|
|
8562
8562
|
};
|
|
8563
8563
|
|
|
8564
|
-
var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superUrls, homeUrl, homeAcademyUrl) {
|
|
8564
|
+
var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superUrls, homeUrl, homeAcademyUrl, isAuthPage) {
|
|
8565
|
+
if (isAuthPage === void 0) {
|
|
8566
|
+
isAuthPage = true;
|
|
8567
|
+
}
|
|
8565
8568
|
var searchParams = new URLSearchParams(window.location.search);
|
|
8566
8569
|
var user = reactRedux.useSelector(function (state) {
|
|
8567
8570
|
var _state$common;
|
|
@@ -8571,38 +8574,42 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
|
|
|
8571
8574
|
var paramAcademyDomain = searchParams.get("domain");
|
|
8572
8575
|
var domain = getAcademyDomain();
|
|
8573
8576
|
var pathname = window.location.pathname.toLowerCase();
|
|
8574
|
-
if (
|
|
8575
|
-
var academyDomain = user.academyDomain;
|
|
8577
|
+
if (!!user !== isAuthPage) return;
|
|
8578
|
+
var academyDomain = user === null || user === void 0 ? void 0 : user.academyDomain;
|
|
8576
8579
|
if (!academyDomain) {
|
|
8577
8580
|
if (!superUrls.some(function (i) {
|
|
8578
8581
|
return pathname.startsWith(i);
|
|
8579
8582
|
})) {
|
|
8583
|
+
!paramAcademyDomain && domain && searchParams.append("domain", domain);
|
|
8580
8584
|
pushTo({
|
|
8581
8585
|
pathname: homeUrl,
|
|
8582
|
-
search:
|
|
8586
|
+
search: searchParams.toString()
|
|
8583
8587
|
});
|
|
8588
|
+
return;
|
|
8584
8589
|
}
|
|
8585
|
-
if (
|
|
8586
|
-
searchParams
|
|
8587
|
-
pushTo({
|
|
8588
|
-
|
|
8589
|
-
|
|
8590
|
-
});
|
|
8590
|
+
if (paramAcademyDomain) {
|
|
8591
|
+
searchParams["delete"]("domain");
|
|
8592
|
+
pushTo(_extends({}, window.location, {
|
|
8593
|
+
search: searchParams.toString()
|
|
8594
|
+
}));
|
|
8591
8595
|
}
|
|
8592
8596
|
} else {
|
|
8593
8597
|
if (superUrls.some(function (i) {
|
|
8594
8598
|
return pathname.startsWith(i);
|
|
8595
8599
|
})) {
|
|
8600
|
+
searchParams["delete"]("domain");
|
|
8596
8601
|
pushTo({
|
|
8597
8602
|
pathname: homeAcademyUrl,
|
|
8598
|
-
search:
|
|
8603
|
+
search: searchParams.toString()
|
|
8599
8604
|
});
|
|
8605
|
+
return;
|
|
8600
8606
|
}
|
|
8601
8607
|
if (paramAcademyDomain && academyDomain.trim().toLocaleLowerCase() != (paramAcademyDomain === null || paramAcademyDomain === void 0 ? void 0 : paramAcademyDomain.trim().toLocaleLowerCase())) {
|
|
8602
8608
|
logout();
|
|
8609
|
+
return;
|
|
8603
8610
|
}
|
|
8604
|
-
if (!paramAcademyDomain
|
|
8605
|
-
searchParams.append("domain", academyDomain);
|
|
8611
|
+
if (!paramAcademyDomain) {
|
|
8612
|
+
!paramAcademyDomain && searchParams.append("domain", academyDomain);
|
|
8606
8613
|
pushTo(_extends({}, window.location, {
|
|
8607
8614
|
search: searchParams.toString()
|
|
8608
8615
|
}));
|
|
@@ -8614,7 +8621,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
|
|
|
8614
8621
|
};
|
|
8615
8622
|
React.useEffect(function () {
|
|
8616
8623
|
initialAcademySearchParam();
|
|
8617
|
-
}, [window.location.pathname, user === null || user === void 0 ? void 0 : user.academyDomain]);
|
|
8624
|
+
}, [window.location.pathname, user === null || user === void 0 ? void 0 : user.academyDomain, window.location.search]);
|
|
8618
8625
|
};
|
|
8619
8626
|
|
|
8620
8627
|
var DEFAULT_PAGING_RESPONSE = {
|