keycloakify 11.3.26 → 11.3.28
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/account/i18n/noJsx/getI18n.js +4 -5
- package/account/i18n/noJsx/getI18n.js.map +1 -1
- package/login/KcContext/KcContext.d.ts +2 -2
- package/login/KcContext/kcContextMocks.d.ts +1 -1
- package/login/TemplateProps.d.ts +0 -1
- package/login/i18n/noJsx/getI18n.js +4 -5
- package/login/i18n/noJsx/getI18n.js.map +1 -1
- package/package.json +5 -2
- package/src/account/i18n/noJsx/getI18n.tsx +4 -5
- package/src/login/KcContext/KcContext.ts +2 -2
- package/src/login/KcContext/kcContextMocks.ts +1 -1
- package/src/login/TemplateProps.ts +0 -1
- package/src/login/i18n/noJsx/getI18n.tsx +4 -5
- package/src/tools/extractLastParenthesisContent.ts +43 -0
- package/stories/login/pages/Info.stories.tsx +3 -39
- package/tools/extractLastParenthesisContent.d.ts +6 -0
- package/tools/extractLastParenthesisContent.js +36 -0
- package/tools/extractLastParenthesisContent.js.map +1 -0
- package/stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx +0 -18
@@ -1,5 +1,6 @@
|
|
1
1
|
import "../../../tools/Object.fromEntries";
|
2
2
|
import { assert, is } from "tsafe/assert";
|
3
|
+
import { extractLastParenthesisContent } from "../../../tools/extractLastParenthesisContent";
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
5
6
|
import { FALLBACK_LANGUAGE_TAG } from "../../../bin/shared/constants";
|
@@ -90,11 +91,9 @@ export function createGetI18n(params) {
|
|
90
91
|
if (supportedEntry === undefined) {
|
91
92
|
break from_server;
|
92
93
|
}
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
if (match !== null) {
|
97
|
-
return match[1];
|
94
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
95
|
+
if (lastParenthesisContent !== undefined) {
|
96
|
+
return lastParenthesisContent;
|
98
97
|
}
|
99
98
|
return supportedEntry.label;
|
100
99
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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"}
|
@@ -15,7 +15,7 @@ export type ExtendKcContext<KcContextExtension extends {
|
|
15
15
|
* Some values might be undefined on some pages.
|
16
16
|
* (ex: url.loginAction is undefined on error.ftl)
|
17
17
|
*/
|
18
|
-
export type KcContext = KcContext.Login | KcContext.Register | KcContext.Info | KcContext.Error | KcContext.LoginResetPassword | KcContext.LoginVerifyEmail | KcContext.Terms | KcContext.
|
18
|
+
export type KcContext = KcContext.Login | KcContext.Register | KcContext.Info | KcContext.Error | KcContext.LoginResetPassword | KcContext.LoginVerifyEmail | KcContext.Terms | KcContext.LoginOauth2DeviceVerifyUserCode | KcContext.LoginOauthGrant | KcContext.LoginOtp | KcContext.LoginUsername | KcContext.WebauthnAuthenticate | KcContext.WebauthnRegister | KcContext.LoginPassword | KcContext.LoginUpdatePassword | KcContext.LoginUpdateProfile | KcContext.LoginIdpLinkConfirm | KcContext.LoginIdpLinkEmail | KcContext.LoginPageExpired | KcContext.LoginConfigTotp | KcContext.LogoutConfirm | KcContext.IdpReviewUserProfile | KcContext.UpdateEmail | KcContext.SelectAuthenticator | KcContext.SamlPostForm | KcContext.DeleteCredential | KcContext.Code | KcContext.DeleteAccountConfirm | KcContext.FrontchannelLogout | KcContext.LoginRecoveryAuthnCodeConfig | KcContext.LoginRecoveryAuthnCodeInput | KcContext.LoginResetOtp | KcContext.LoginX509Info | KcContext.WebauthnError | KcContext.LoginPasskeysConditionalAuthenticate | KcContext.LoginIdpLinkConfirmOverride;
|
19
19
|
export declare namespace KcContext {
|
20
20
|
type Common = {
|
21
21
|
themeVersion: string;
|
@@ -213,7 +213,7 @@ export declare namespace KcContext {
|
|
213
213
|
};
|
214
214
|
__localizationRealmOverridesTermsText?: string;
|
215
215
|
};
|
216
|
-
type
|
216
|
+
type LoginOauth2DeviceVerifyUserCode = Common & {
|
217
217
|
pageId: "login-oauth2-device-verify-user-code.ftl";
|
218
218
|
url: {
|
219
219
|
oauth2DeviceVerificationAction: string;
|
@@ -1,4 +1,4 @@
|
|
1
1
|
import "../../tools/Object.fromEntries";
|
2
2
|
import type { KcContext } from "./KcContext";
|
3
3
|
export declare const kcContextCommonMock: KcContext.Common;
|
4
|
-
export declare const kcContextMocks: (KcContext.Login | KcContext.Register | KcContext.Info | KcContext.Error | KcContext.LoginResetPassword | KcContext.LoginVerifyEmail | KcContext.Terms | KcContext.
|
4
|
+
export declare const kcContextMocks: (KcContext.Login | KcContext.Register | KcContext.Info | KcContext.Error | KcContext.LoginResetPassword | KcContext.LoginVerifyEmail | KcContext.Terms | KcContext.LoginOauth2DeviceVerifyUserCode | KcContext.LoginOauthGrant | KcContext.LoginOtp | KcContext.LoginUsername | KcContext.WebauthnAuthenticate | KcContext.WebauthnRegister | KcContext.LoginPassword | KcContext.LoginUpdatePassword | KcContext.LoginUpdateProfile | KcContext.LoginIdpLinkConfirm | KcContext.LoginIdpLinkEmail | KcContext.LoginPageExpired | KcContext.LoginConfigTotp | KcContext.LogoutConfirm | KcContext.IdpReviewUserProfile | KcContext.UpdateEmail | KcContext.SelectAuthenticator | KcContext.SamlPostForm | KcContext.DeleteCredential | KcContext.Code | KcContext.DeleteAccountConfirm | KcContext.FrontchannelLogout | KcContext.LoginRecoveryAuthnCodeConfig | KcContext.LoginRecoveryAuthnCodeInput | KcContext.LoginResetOtp | KcContext.LoginX509Info | KcContext.WebauthnError | KcContext.LoginPasskeysConditionalAuthenticate | KcContext.LoginIdpLinkConfirmOverride)[];
|
package/login/TemplateProps.d.ts
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
import "../../../tools/Object.fromEntries";
|
2
2
|
import { assert, is } from "tsafe/assert";
|
3
|
+
import { extractLastParenthesisContent } from "../../../tools/extractLastParenthesisContent";
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
5
6
|
import { FALLBACK_LANGUAGE_TAG } from "../../../bin/shared/constants";
|
@@ -90,11 +91,9 @@ export function createGetI18n(params) {
|
|
90
91
|
if (supportedEntry === undefined) {
|
91
92
|
break from_server;
|
92
93
|
}
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
if (match !== null) {
|
97
|
-
return match[1];
|
94
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
95
|
+
if (lastParenthesisContent !== undefined) {
|
96
|
+
return lastParenthesisContent;
|
98
97
|
}
|
99
98
|
return supportedEntry.label;
|
100
99
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "keycloakify",
|
3
|
-
"version": "11.3.
|
3
|
+
"version": "11.3.28",
|
4
4
|
"description": "Framework to create custom Keycloak UIs",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
@@ -867,6 +867,7 @@
|
|
867
867
|
"src/tools/clsx_withTransform.ts",
|
868
868
|
"src/tools/deepAssign.ts",
|
869
869
|
"src/tools/emailRegExp.ts",
|
870
|
+
"src/tools/extractLastParenthesisContent.ts",
|
870
871
|
"src/tools/formatNumber.ts",
|
871
872
|
"src/tools/pathBasename.ts",
|
872
873
|
"src/tools/structuredCloneButFunctions.ts",
|
@@ -900,7 +901,6 @@
|
|
900
901
|
"stories/login/pages/Info.stories.tsx",
|
901
902
|
"stories/login/pages/Login.stories.tsx",
|
902
903
|
"stories/login/pages/LoginConfigTotp.stories.tsx",
|
903
|
-
"stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx",
|
904
904
|
"stories/login/pages/LoginIdpLinkConfirm.stories.tsx",
|
905
905
|
"stories/login/pages/LoginIdpLinkConfirmOverride.stories.tsx",
|
906
906
|
"stories/login/pages/LoginIdpLinkEmail.stories.tsx",
|
@@ -976,6 +976,9 @@
|
|
976
976
|
"tools/emailRegExp.d.ts",
|
977
977
|
"tools/emailRegExp.js",
|
978
978
|
"tools/emailRegExp.js.map",
|
979
|
+
"tools/extractLastParenthesisContent.d.ts",
|
980
|
+
"tools/extractLastParenthesisContent.js",
|
981
|
+
"tools/extractLastParenthesisContent.js.map",
|
979
982
|
"tools/formatNumber.d.ts",
|
980
983
|
"tools/formatNumber.js",
|
981
984
|
"tools/formatNumber.js.map",
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import "keycloakify/tools/Object.fromEntries";
|
2
2
|
import { assert, is } from "tsafe/assert";
|
3
|
+
import { extractLastParenthesisContent } from "keycloakify/tools/extractLastParenthesisContent";
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
5
6
|
import type { KcContext } from "../../KcContext";
|
@@ -168,12 +169,10 @@ export function createGetI18n<
|
|
168
169
|
break from_server;
|
169
170
|
}
|
170
171
|
|
171
|
-
|
172
|
-
// from "Espagnol (Español)" we want to extract "Español"
|
173
|
-
const match = supportedEntry.label.match(/[^(]+\(([^)]+)\)/);
|
172
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
174
173
|
|
175
|
-
if (
|
176
|
-
return
|
174
|
+
if (lastParenthesisContent !== undefined) {
|
175
|
+
return lastParenthesisContent;
|
177
176
|
}
|
178
177
|
|
179
178
|
return supportedEntry.label;
|
@@ -33,7 +33,7 @@ export type KcContext =
|
|
33
33
|
| KcContext.LoginResetPassword
|
34
34
|
| KcContext.LoginVerifyEmail
|
35
35
|
| KcContext.Terms
|
36
|
-
| KcContext.
|
36
|
+
| KcContext.LoginOauth2DeviceVerifyUserCode
|
37
37
|
| KcContext.LoginOauthGrant
|
38
38
|
| KcContext.LoginOtp
|
39
39
|
| KcContext.LoginUsername
|
@@ -277,7 +277,7 @@ export declare namespace KcContext {
|
|
277
277
|
__localizationRealmOverridesTermsText?: string;
|
278
278
|
};
|
279
279
|
|
280
|
-
export type
|
280
|
+
export type LoginOauth2DeviceVerifyUserCode = Common & {
|
281
281
|
pageId: "login-oauth2-device-verify-user-code.ftl";
|
282
282
|
url: {
|
283
283
|
oauth2DeviceVerificationAction: string;
|
@@ -290,7 +290,7 @@ export const kcContextMocks = [
|
|
290
290
|
...kcContextCommonMock,
|
291
291
|
pageId: "terms.ftl"
|
292
292
|
}),
|
293
|
-
id<KcContext.
|
293
|
+
id<KcContext.LoginOauth2DeviceVerifyUserCode>({
|
294
294
|
...kcContextCommonMock,
|
295
295
|
pageId: "login-oauth2-device-verify-user-code.ftl",
|
296
296
|
url: loginUrl
|
@@ -11,7 +11,6 @@ export type TemplateProps<KcContext, I18n> = {
|
|
11
11
|
displayInfo?: boolean;
|
12
12
|
displayMessage?: boolean;
|
13
13
|
displayRequiredFields?: boolean;
|
14
|
-
showAnotherWayIfPresent?: boolean;
|
15
14
|
headerNode: ReactNode;
|
16
15
|
socialProvidersNode?: ReactNode;
|
17
16
|
infoNode?: ReactNode;
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import "keycloakify/tools/Object.fromEntries";
|
2
2
|
import { assert, is } from "tsafe/assert";
|
3
|
+
import { extractLastParenthesisContent } from "keycloakify/tools/extractLastParenthesisContent";
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
5
6
|
import type { KcContext } from "../../KcContext";
|
@@ -168,12 +169,10 @@ export function createGetI18n<
|
|
168
169
|
break from_server;
|
169
170
|
}
|
170
171
|
|
171
|
-
|
172
|
-
// from "Espagnol (Español)" we want to extract "Español"
|
173
|
-
const match = supportedEntry.label.match(/[^(]+\(([^)]+)\)/);
|
172
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
174
173
|
|
175
|
-
if (
|
176
|
-
return
|
174
|
+
if (lastParenthesisContent !== undefined) {
|
175
|
+
return lastParenthesisContent;
|
177
176
|
}
|
178
177
|
|
179
178
|
return supportedEntry.label;
|
@@ -0,0 +1,43 @@
|
|
1
|
+
/**
|
2
|
+
* "Hello (world)" => "world"
|
3
|
+
* "Hello (world) (foo)" => "foo"
|
4
|
+
* "Hello (world (foo))" => "world (foo)"
|
5
|
+
*/
|
6
|
+
export function extractLastParenthesisContent(str: string): string | undefined {
|
7
|
+
const chars: string[] = [];
|
8
|
+
|
9
|
+
for (const char of str) {
|
10
|
+
chars.push(char);
|
11
|
+
}
|
12
|
+
|
13
|
+
const extractedChars: string[] = [];
|
14
|
+
let openingCount = 0;
|
15
|
+
|
16
|
+
loop_through_char: for (let i = chars.length - 1; i >= 0; i--) {
|
17
|
+
const char = chars[i];
|
18
|
+
|
19
|
+
if (i === chars.length - 1) {
|
20
|
+
if (char !== ")") {
|
21
|
+
return undefined;
|
22
|
+
}
|
23
|
+
|
24
|
+
continue;
|
25
|
+
}
|
26
|
+
|
27
|
+
switch (char) {
|
28
|
+
case ")":
|
29
|
+
openingCount++;
|
30
|
+
break;
|
31
|
+
case "(":
|
32
|
+
if (openingCount === 0) {
|
33
|
+
return extractedChars.join("");
|
34
|
+
}
|
35
|
+
openingCount--;
|
36
|
+
break;
|
37
|
+
}
|
38
|
+
|
39
|
+
extractedChars.unshift(char);
|
40
|
+
}
|
41
|
+
|
42
|
+
return undefined;
|
43
|
+
}
|
@@ -17,6 +17,7 @@ export const Default: Story = {
|
|
17
17
|
render: () => (
|
18
18
|
<KcPageStory
|
19
19
|
kcContext={{
|
20
|
+
messageHeader: "Message header",
|
20
21
|
message: {
|
21
22
|
summary: "Server info message"
|
22
23
|
}
|
@@ -29,6 +30,7 @@ export const WithLinkBack: Story = {
|
|
29
30
|
render: () => (
|
30
31
|
<KcPageStory
|
31
32
|
kcContext={{
|
33
|
+
messageHeader: "Message header",
|
32
34
|
message: {
|
33
35
|
summary: "Server message"
|
34
36
|
},
|
@@ -42,6 +44,7 @@ export const WithRequiredActions: Story = {
|
|
42
44
|
render: () => (
|
43
45
|
<KcPageStory
|
44
46
|
kcContext={{
|
47
|
+
messageHeader: "Message header",
|
45
48
|
message: {
|
46
49
|
summary: "Required actions: "
|
47
50
|
},
|
@@ -55,42 +58,3 @@ export const WithRequiredActions: Story = {
|
|
55
58
|
/>
|
56
59
|
)
|
57
60
|
};
|
58
|
-
export const WithPageRedirect: Story = {
|
59
|
-
render: () => (
|
60
|
-
<KcPageStory
|
61
|
-
kcContext={{
|
62
|
-
message: { summary: "You will be redirected shortly." },
|
63
|
-
pageRedirectUri: "https://example.com"
|
64
|
-
}}
|
65
|
-
/>
|
66
|
-
)
|
67
|
-
};
|
68
|
-
export const WithoutClientBaseUrl: Story = {
|
69
|
-
render: () => (
|
70
|
-
<KcPageStory
|
71
|
-
kcContext={{
|
72
|
-
message: { summary: "No client base URL defined." },
|
73
|
-
client: { baseUrl: undefined }
|
74
|
-
}}
|
75
|
-
/>
|
76
|
-
)
|
77
|
-
};
|
78
|
-
export const WithMessageHeader: Story = {
|
79
|
-
render: () => (
|
80
|
-
<KcPageStory
|
81
|
-
kcContext={{
|
82
|
-
messageHeader: "Important Notice",
|
83
|
-
message: { summary: "This is an important message." }
|
84
|
-
}}
|
85
|
-
/>
|
86
|
-
)
|
87
|
-
};
|
88
|
-
export const WithAdvancedMessage: Story = {
|
89
|
-
render: () => (
|
90
|
-
<KcPageStory
|
91
|
-
kcContext={{
|
92
|
-
message: { summary: "Please take note of this <strong>important</strong> information." }
|
93
|
-
}}
|
94
|
-
/>
|
95
|
-
)
|
96
|
-
};
|
@@ -0,0 +1,36 @@
|
|
1
|
+
/**
|
2
|
+
* "Hello (world)" => "world"
|
3
|
+
* "Hello (world) (foo)" => "foo"
|
4
|
+
* "Hello (world (foo))" => "world (foo)"
|
5
|
+
*/
|
6
|
+
export function extractLastParenthesisContent(str) {
|
7
|
+
const chars = [];
|
8
|
+
for (const char of str) {
|
9
|
+
chars.push(char);
|
10
|
+
}
|
11
|
+
const extractedChars = [];
|
12
|
+
let openingCount = 0;
|
13
|
+
loop_through_char: for (let i = chars.length - 1; i >= 0; i--) {
|
14
|
+
const char = chars[i];
|
15
|
+
if (i === chars.length - 1) {
|
16
|
+
if (char !== ")") {
|
17
|
+
return undefined;
|
18
|
+
}
|
19
|
+
continue;
|
20
|
+
}
|
21
|
+
switch (char) {
|
22
|
+
case ")":
|
23
|
+
openingCount++;
|
24
|
+
break;
|
25
|
+
case "(":
|
26
|
+
if (openingCount === 0) {
|
27
|
+
return extractedChars.join("");
|
28
|
+
}
|
29
|
+
openingCount--;
|
30
|
+
break;
|
31
|
+
}
|
32
|
+
extractedChars.unshift(char);
|
33
|
+
}
|
34
|
+
return undefined;
|
35
|
+
}
|
36
|
+
//# sourceMappingURL=extractLastParenthesisContent.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"extractLastParenthesisContent.js","sourceRoot":"","sources":["../src/tools/extractLastParenthesisContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,GAAW;IACrD,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACpB;IAED,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,iBAAiB,EAAE,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAEtB,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,IAAI,IAAI,KAAK,GAAG,EAAE;gBACd,OAAO,SAAS,CAAC;aACpB;YAED,SAAS;SACZ;QAED,QAAQ,IAAI,EAAE;YACV,KAAK,GAAG;gBACJ,YAAY,EAAE,CAAC;gBACf,MAAM;YACV,KAAK,GAAG;gBACJ,IAAI,YAAY,KAAK,CAAC,EAAE;oBACpB,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClC;gBACD,YAAY,EAAE,CAAC;gBACf,MAAM;SACb;QAED,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAChC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}
|
@@ -1,18 +0,0 @@
|
|
1
|
-
import React from "react";
|
2
|
-
import type { Meta, StoryObj } from "@storybook/react";
|
3
|
-
import { createKcPageStory } from "../KcPageStory";
|
4
|
-
|
5
|
-
const { KcPageStory } = createKcPageStory({ pageId: "login-device-verify-user-code.ftl" });
|
6
|
-
|
7
|
-
const meta = {
|
8
|
-
title: "login/login-device-verify-user-code.ftl",
|
9
|
-
component: KcPageStory
|
10
|
-
} satisfies Meta<typeof KcPageStory>;
|
11
|
-
|
12
|
-
export default meta;
|
13
|
-
|
14
|
-
type Story = StoryObj<typeof meta>;
|
15
|
-
|
16
|
-
export const Default: Story = {
|
17
|
-
render: () => <KcPageStory />
|
18
|
-
};
|