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