keycloakify 4.7.5 → 4.7.6

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/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ### **4.7.6** (2022-04-12)
2
+
3
+ - Fix bugs with language switch #85
4
+
1
5
  ### **4.7.5** (2022-04-09)
2
6
 
3
7
  - Fix #85
@@ -64,17 +64,21 @@ exports.Template = (0, react_1.memo)(function (props) {
64
64
  var onTryAnotherWayClick = (0, useConstCallback_1.useConstCallback)(function () { return (document.forms["kc-select-try-another-way-form"].submit(), false); });
65
65
  var realm = kcContext.realm, locale = kcContext.locale, auth = kcContext.auth, url = kcContext.url, message = kcContext.message, isAppInitiatedAction = kcContext.isAppInitiatedAction;
66
66
  (0, react_1.useEffect)(function () {
67
- if (!realm.internationalizationEnabled || kcContext.pageId === "error.ftl") {
67
+ if (!realm.internationalizationEnabled) {
68
68
  return;
69
69
  }
70
70
  (0, assert_1.assert)(locale !== undefined);
71
- if (kcLanguageTag === (0, KcLanguageTag_1.getBestMatchAmongKcLanguageTag)(locale.current)) {
71
+ var kcContext_kcLanguageTag = (0, KcLanguageTag_1.getBestMatchAmongKcLanguageTag)(locale.current);
72
+ if (["error.ftl", "info.ftl", "login-page-expired.ftl"].indexOf(kcContext.pageId) >= 0) {
73
+ setKcLanguageTag(kcContext_kcLanguageTag);
72
74
  return;
73
75
  }
74
- window.location.href = locale.supported.find(function (_a) {
75
- var languageTag = _a.languageTag;
76
- return languageTag === kcLanguageTag;
77
- }).url;
76
+ if (kcLanguageTag !== kcContext_kcLanguageTag) {
77
+ window.location.href = locale.supported.find(function (_a) {
78
+ var languageTag = _a.languageTag;
79
+ return languageTag === kcLanguageTag;
80
+ }).url;
81
+ }
78
82
  }, [kcLanguageTag]);
79
83
  var _j = __read((0, react_1.useReducer)(function () { return true; }, false), 2), isExtraCssLoaded = _j[0], setExtraCssLoaded = _j[1];
80
84
  (0, react_1.useEffect)(function () {
@@ -1 +1 @@
1
- {"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/lib/components/Template.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/lib/components/Template.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "4.7.5",
3
+ "version": "4.7.6",
4
4
  "description": "Keycloak theme generator for Reacts app",
5
5
  "repository": {
6
6
  "type": "git",
@@ -62,17 +62,23 @@ export const Template = memo((props: TemplateProps) => {
62
62
  const { realm, locale, auth, url, message, isAppInitiatedAction } = kcContext;
63
63
 
64
64
  useEffect(() => {
65
- if (!realm.internationalizationEnabled || kcContext.pageId === "error.ftl") {
65
+ if (!realm.internationalizationEnabled) {
66
66
  return;
67
67
  }
68
68
 
69
69
  assert(locale !== undefined);
70
70
 
71
- if (kcLanguageTag === getBestMatchAmongKcLanguageTag(locale.current)) {
71
+ const kcContext_kcLanguageTag = getBestMatchAmongKcLanguageTag(locale.current);
72
+
73
+ if (["error.ftl", "info.ftl", "login-page-expired.ftl"].indexOf(kcContext.pageId) >= 0) {
74
+ setKcLanguageTag(kcContext_kcLanguageTag);
75
+
72
76
  return;
73
77
  }
74
78
 
75
- window.location.href = locale.supported.find(({ languageTag }) => languageTag === kcLanguageTag)!.url;
79
+ if (kcLanguageTag !== kcContext_kcLanguageTag) {
80
+ window.location.href = locale.supported.find(({ languageTag }) => languageTag === kcLanguageTag)!.url;
81
+ }
76
82
  }, [kcLanguageTag]);
77
83
 
78
84
  const [isExtraCssLoaded, setExtraCssLoaded] = useReducer(() => true, false);