@bmc-soft/keycloak-auth 2.0.1 → 2.0.2
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/README.md +8 -1
- package/dist/context/KeycloakConfigContext.d.ts +4 -1
- package/dist/context/KeycloakConfigContext.d.ts.map +1 -1
- package/dist/context/KeycloakConfigContext.js +17 -2
- package/dist/context/KeycloakConfigContext.js.map +1 -1
- package/dist/context/KeycloakInstanceContext.d.ts.map +1 -1
- package/dist/context/KeycloakInstanceContext.js +39 -7
- package/dist/context/KeycloakInstanceContext.js.map +1 -1
- package/dist/context/KeycloakProvider.d.ts +1 -0
- package/dist/context/KeycloakProvider.d.ts.map +1 -1
- package/dist/context/KeycloakProvider.js +2 -2
- package/dist/context/KeycloakProvider.js.map +1 -1
- package/dist/context/TokenContext.d.ts.map +1 -1
- package/dist/context/TokenContext.js +18 -4
- package/dist/context/TokenContext.js.map +1 -1
- package/dist/core/adapter.d.ts.map +1 -1
- package/dist/core/adapter.js +8 -1
- package/dist/core/adapter.js.map +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/types.d.ts +3 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/hooks/useKeycloakAuthScreen.d.ts +1 -1
- package/dist/hooks/useKeycloakAuthScreen.d.ts.map +1 -1
- package/dist/hooks/useKeycloakAuthScreen.js +3 -2
- package/dist/hooks/useKeycloakAuthScreen.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.d.ts +1 -0
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.d.ts.map +1 -1
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.js +73 -13
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.js.map +1 -1
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.d.ts.map +1 -1
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.js +6 -5
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.js.map +1 -1
- package/dist/ui/PINConfirm/PINConfirm.d.ts +1 -0
- package/dist/ui/PINConfirm/PINConfirm.d.ts.map +1 -1
- package/dist/ui/PINConfirm/PINConfirm.js +33 -5
- package/dist/ui/PINConfirm/PINConfirm.js.map +1 -1
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.d.ts.map +1 -1
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.js +9 -5
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -101,10 +101,16 @@ const LoginScreen = () => (
|
|
|
101
101
|
| `onTokens` | (tokens: KeycloakTokens) => void | нет | Вызывается при изменении токенов (логин, refresh, logout) |
|
|
102
102
|
| `offlineAccessEnabled` | boolean | нет | Запрашивать `offline_access` в login URL; по умолчанию `true` |
|
|
103
103
|
| `backgroundReauth` | `{ enabled?: boolean; thresholdMs?: number; internalNetworkMode?: 'ip-host-is-internal' }` | нет | Настройки PIN/биометрии после возврата из background; по умолчанию `enabled: true`, `thresholdMs: 60000` |
|
|
104
|
+
| `clientSecret` | string | нет | Секрет confidential client для legacy-конфигураций; для новых мобильных flows предпочтителен public client + PKCE |
|
|
105
|
+
| `getClientSecret` | () => string \| undefined \| Promise<string \| undefined> | нет | Ленивый резолвер секрета; имеет приоритет над `clientSecret` |
|
|
106
|
+
| `initRecoveryStrategy` | `'none' \| 'clear-tokens-and-retry'` | нет | Что делать, если init со stored tokens упал; по умолчанию `none` |
|
|
107
|
+
| `deferStoredTokensUntilRefresh` | boolean | нет | Не передавать persisted tokens в `keycloak.init()` до локального PIN/биометрии; по умолчанию `false` |
|
|
104
108
|
| `autoRefreshToken` | boolean | нет | По умолчанию `true` |
|
|
105
109
|
| `autoRefreshTokenMinValidity` | number | нет | За сколько секунд до истечения вызывать refresh; по умолчанию `5` |
|
|
106
110
|
| `onReauthRequired` | () => void | нет | Вызывается при ошибке обновления токена (например показать экран реавторизации) |
|
|
107
111
|
|
|
112
|
+
`deferStoredTokensUntilRefresh` полезен для mobile unlock flow: приложение может сначала показать PIN/биометрию, а уже после успешного локального подтверждения выполнить refresh через сохранённый offline token. Это предотвращает преждевременный расход refresh/offline token при старте приложения.
|
|
113
|
+
|
|
108
114
|
### KeycloakTheme
|
|
109
115
|
|
|
110
116
|
Все поля опциональны; недостающие подставляются из дефолтной темы. Передаётся в KeycloakProvider как `theme`.
|
|
@@ -157,6 +163,7 @@ const LoginScreen = () => (
|
|
|
157
163
|
| `pinLength` | number | 4 | Длина PIN |
|
|
158
164
|
| `allowBiometry`, `autoShowBiometry` | boolean | true | Биометрия |
|
|
159
165
|
| `title`, `description` | string | — | Заголовок и описание блока PIN |
|
|
166
|
+
| `layout` | `'screen' \| 'sheet'` | `"screen"` | Компактная раскладка `sheet` для встраивания в BottomSheet |
|
|
160
167
|
| `style` | ViewStyle | — | Стиль контейнера |
|
|
161
168
|
|
|
162
169
|
### Виджеты
|
|
@@ -173,7 +180,7 @@ BottomSheet с подтверждением PIN для реавторизаци
|
|
|
173
180
|
| `pinLength` | number | 4 | Длина PIN |
|
|
174
181
|
| `allowBiometry`, `autoShowBiometry` | boolean | true | Биометрия |
|
|
175
182
|
| `mode` | `'login' \| 'unlock' \| 'reauth'` | авто | Если не передан, `background` открывается как `unlock`, остальные причины как `reauth` |
|
|
176
|
-
| `title` | string | "
|
|
183
|
+
| `title` | string | "Введите PIN" | Заголовок |
|
|
177
184
|
| `description` | string | "Введите PIN-код" | Описание |
|
|
178
185
|
|
|
179
186
|
### Кнопки выхода
|
|
@@ -2,11 +2,13 @@ import React, { type ReactNode } from 'react';
|
|
|
2
2
|
import type { BackgroundReauthConfig, InitRecoveryStrategy, KeycloakConfig, KeycloakConfigWith2FA } from '../core';
|
|
3
3
|
interface KeycloakConfigContextValue {
|
|
4
4
|
config: KeycloakConfig;
|
|
5
|
+
isConfigReady: boolean;
|
|
5
6
|
offlineAccessEnabled: boolean;
|
|
6
7
|
backgroundReauth: BackgroundReauthConfig;
|
|
7
8
|
clientSecret?: string;
|
|
8
9
|
getClientSecret?: () => string | undefined | Promise<string | undefined>;
|
|
9
10
|
initRecoveryStrategy: InitRecoveryStrategy;
|
|
11
|
+
deferStoredTokensUntilRefresh: boolean;
|
|
10
12
|
refreshPinCheck: () => Promise<void>;
|
|
11
13
|
}
|
|
12
14
|
export interface KeycloakConfigProviderProps {
|
|
@@ -17,10 +19,11 @@ export interface KeycloakConfigProviderProps {
|
|
|
17
19
|
clientSecret?: string;
|
|
18
20
|
getClientSecret?: () => string | undefined | Promise<string | undefined>;
|
|
19
21
|
initRecoveryStrategy?: InitRecoveryStrategy;
|
|
22
|
+
deferStoredTokensUntilRefresh?: boolean;
|
|
20
23
|
}
|
|
21
24
|
export declare const KeycloakConfigProvider: React.NamedExoticComponent<KeycloakConfigProviderProps>;
|
|
22
25
|
export declare const useKeycloakConfig: () => KeycloakConfig;
|
|
23
|
-
export declare const useKeycloakSessionOptions: () => Pick<KeycloakConfigContextValue, "offlineAccessEnabled" | "backgroundReauth" | "clientSecret" | "getClientSecret" | "initRecoveryStrategy">;
|
|
26
|
+
export declare const useKeycloakSessionOptions: () => Pick<KeycloakConfigContextValue, "offlineAccessEnabled" | "isConfigReady" | "backgroundReauth" | "clientSecret" | "getClientSecret" | "initRecoveryStrategy" | "deferStoredTokensUntilRefresh">;
|
|
24
27
|
export declare const useKeycloakConfigRefresh: () => (() => Promise<void>);
|
|
25
28
|
export {};
|
|
26
29
|
//# sourceMappingURL=KeycloakConfigContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakConfigContext.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakConfigContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAGjB,UAAU,0BAA0B;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,gBAAgB,EAAE,sBAAsB,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACzE,oBAAoB,EAAE,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"KeycloakConfigContext.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakConfigContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAGjB,UAAU,0BAA0B;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,gBAAgB,EAAE,sBAAsB,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACzE,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,6BAA6B,EAAE,OAAO,CAAC;IAEvC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAID,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,SAAS,CAAC;IAEpB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACzE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAiBD,eAAO,MAAM,sBAAsB,yDAkFlC,CAAC;AASF,eAAO,MAAM,iBAAiB,QAAO,cAQpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,IAAI,CAC/C,0BAA0B,EACxB,sBAAsB,GACtB,eAAe,GACf,kBAAkB,GAClB,cAAc,GACd,iBAAiB,GACjB,sBAAsB,GACtB,+BAA+B,CAiBlC,CAAC;AAKF,eAAO,MAAM,wBAAwB,QAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAM/D,CAAC"}
|
|
@@ -11,14 +11,22 @@ function getEffectiveConfig(config, pinSet) {
|
|
|
11
11
|
...(config.oidcProvider != null && { oidcProvider: config.oidcProvider }),
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
-
export const KeycloakConfigProvider = React.memo(({ children, config, offlineAccessEnabled, backgroundReauth, clientSecret, getClientSecret, initRecoveryStrategy, }) => {
|
|
14
|
+
export const KeycloakConfigProvider = React.memo(({ children, config, offlineAccessEnabled, backgroundReauth, clientSecret, getClientSecret, initRecoveryStrategy, deferStoredTokensUntilRefresh, }) => {
|
|
15
15
|
const [pinSet, setPinSet] = useState(null);
|
|
16
16
|
useEffect(() => {
|
|
17
17
|
let mounted = true;
|
|
18
|
-
credentialStorage
|
|
18
|
+
credentialStorage
|
|
19
|
+
.hasPIN()
|
|
20
|
+
.then(hasPin => {
|
|
19
21
|
if (mounted) {
|
|
20
22
|
setPinSet(hasPin);
|
|
21
23
|
}
|
|
24
|
+
})
|
|
25
|
+
.catch(error => {
|
|
26
|
+
console.error('[KeycloakConfigProvider] PIN check error:', error);
|
|
27
|
+
if (mounted) {
|
|
28
|
+
setPinSet(false);
|
|
29
|
+
}
|
|
22
30
|
});
|
|
23
31
|
return () => {
|
|
24
32
|
mounted = false;
|
|
@@ -33,22 +41,27 @@ export const KeycloakConfigProvider = React.memo(({ children, config, offlineAcc
|
|
|
33
41
|
const resolvedClientSecret = clientSecret ?? config.clientSecret;
|
|
34
42
|
const resolvedGetClientSecret = getClientSecret ?? config.getClientSecret;
|
|
35
43
|
const resolvedInitRecoveryStrategy = initRecoveryStrategy ?? 'none';
|
|
44
|
+
const resolvedDeferStoredTokensUntilRefresh = deferStoredTokensUntilRefresh ?? false;
|
|
36
45
|
const resolvedBackgroundReauth = useMemo(() => backgroundReauth ?? config.backgroundReauth ?? {}, [backgroundReauth, config.backgroundReauth]);
|
|
37
46
|
const value = useMemo(() => ({
|
|
38
47
|
config: effectiveConfig,
|
|
48
|
+
isConfigReady: pinSet !== null,
|
|
39
49
|
offlineAccessEnabled: resolvedOfflineAccessEnabled,
|
|
40
50
|
backgroundReauth: resolvedBackgroundReauth,
|
|
41
51
|
clientSecret: resolvedClientSecret,
|
|
42
52
|
getClientSecret: resolvedGetClientSecret,
|
|
43
53
|
initRecoveryStrategy: resolvedInitRecoveryStrategy,
|
|
54
|
+
deferStoredTokensUntilRefresh: resolvedDeferStoredTokensUntilRefresh,
|
|
44
55
|
refreshPinCheck,
|
|
45
56
|
}), [
|
|
46
57
|
effectiveConfig,
|
|
58
|
+
pinSet,
|
|
47
59
|
resolvedOfflineAccessEnabled,
|
|
48
60
|
resolvedBackgroundReauth,
|
|
49
61
|
resolvedClientSecret,
|
|
50
62
|
resolvedGetClientSecret,
|
|
51
63
|
resolvedInitRecoveryStrategy,
|
|
64
|
+
resolvedDeferStoredTokensUntilRefresh,
|
|
52
65
|
refreshPinCheck,
|
|
53
66
|
]);
|
|
54
67
|
return (<KeycloakConfigContext.Provider value={value}>{children}</KeycloakConfigContext.Provider>);
|
|
@@ -68,10 +81,12 @@ export const useKeycloakSessionOptions = () => {
|
|
|
68
81
|
}
|
|
69
82
|
return {
|
|
70
83
|
offlineAccessEnabled: context.offlineAccessEnabled,
|
|
84
|
+
isConfigReady: context.isConfigReady,
|
|
71
85
|
backgroundReauth: context.backgroundReauth,
|
|
72
86
|
clientSecret: context.clientSecret,
|
|
73
87
|
getClientSecret: context.getClientSecret,
|
|
74
88
|
initRecoveryStrategy: context.initRecoveryStrategy,
|
|
89
|
+
deferStoredTokensUntilRefresh: context.deferStoredTokensUntilRefresh,
|
|
75
90
|
};
|
|
76
91
|
};
|
|
77
92
|
export const useKeycloakConfigRefresh = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakConfigContext.js","sourceRoot":"","sources":["../../src/context/KeycloakConfigContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EACZ,aAAa,EAEb,WAAW,EACX,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AAQf,OAAO,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"KeycloakConfigContext.js","sourceRoot":"","sources":["../../src/context/KeycloakConfigContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakInstanceContext.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakInstanceContext.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAGf,OAAO,yBAAyB,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAMnD,UAAU,4BAA4B;IACpC,QAAQ,EAAE,yBAAyB,GAAG,IAAI,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAID,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IAEpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAErC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAE9B,UAAU,CAAC,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;CAC9C;AAID,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"KeycloakInstanceContext.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakInstanceContext.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAGf,OAAO,yBAAyB,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAMnD,UAAU,4BAA4B;IACpC,QAAQ,EAAE,yBAAyB,GAAG,IAAI,CAAC;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAID,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IAEpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAErC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAE9B,UAAU,CAAC,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;CAC9C;AAID,eAAO,MAAM,wBAAwB,2DA8NpC,CAAC;AAQF,eAAO,MAAM,mBAAmB,QAAO,4BAQtC,CAAC"}
|
|
@@ -16,16 +16,25 @@ export const KeycloakInstanceProvider = React.memo(({ children, redirectUri, aut
|
|
|
16
16
|
const [tokenVersion, setTokenVersion] = useState(0);
|
|
17
17
|
const appStateRef = useRef(AppState.currentState);
|
|
18
18
|
const backgroundedAtRef = useRef(null);
|
|
19
|
-
const { backgroundReauth, clientSecret, getClientSecret, initRecoveryStrategy, } = useKeycloakSessionOptions();
|
|
19
|
+
const { backgroundReauth, clientSecret, deferStoredTokensUntilRefresh, getClientSecret, initRecoveryStrategy, isConfigReady, } = useKeycloakSessionOptions();
|
|
20
20
|
const resolvedBackgroundReauth = useMemo(() => resolveBackgroundReauthConfig(backgroundReauth), [backgroundReauth]);
|
|
21
21
|
useEffect(() => {
|
|
22
|
+
if (!isConfigReady) {
|
|
23
|
+
setIsLoading(true);
|
|
24
|
+
setIsInitialized(false);
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
22
27
|
let mounted = true;
|
|
23
28
|
const buildInitOptions = async () => {
|
|
24
29
|
const { accessToken = undefined, token = undefined, idToken = undefined, offlineToken = undefined, refreshToken = undefined, } = await tokenStorage.getTokens();
|
|
25
30
|
return {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
31
|
+
...(deferStoredTokensUntilRefresh
|
|
32
|
+
? {}
|
|
33
|
+
: {
|
|
34
|
+
token: accessToken ?? token,
|
|
35
|
+
refreshToken: offlineToken ?? refreshToken,
|
|
36
|
+
idToken,
|
|
37
|
+
}),
|
|
29
38
|
...(initOnLoad != null && { onLoad: initOnLoad }),
|
|
30
39
|
flow: 'standard',
|
|
31
40
|
pkceMethod: 'S256',
|
|
@@ -81,13 +90,29 @@ export const KeycloakInstanceProvider = React.memo(({ children, redirectUri, aut
|
|
|
81
90
|
return () => {
|
|
82
91
|
mounted = false;
|
|
83
92
|
};
|
|
84
|
-
}, [
|
|
93
|
+
}, [
|
|
94
|
+
clientSecret,
|
|
95
|
+
config,
|
|
96
|
+
deferStoredTokensUntilRefresh,
|
|
97
|
+
getClientSecret,
|
|
98
|
+
initOnLoad,
|
|
99
|
+
initRecoveryStrategy,
|
|
100
|
+
isConfigReady,
|
|
101
|
+
redirectUri,
|
|
102
|
+
]);
|
|
85
103
|
useEffect(() => {
|
|
86
104
|
if (!keycloak || autoRefreshToken === false)
|
|
87
105
|
return;
|
|
88
106
|
const minValidity = autoRefreshTokenMinValidity ?? 5;
|
|
89
107
|
keycloak.onTokenExpired = () => {
|
|
90
|
-
keycloak
|
|
108
|
+
keycloak
|
|
109
|
+
.updateToken(minValidity)
|
|
110
|
+
.then(refreshed => {
|
|
111
|
+
if (refreshed) {
|
|
112
|
+
setTokenVersion(v => v + 1);
|
|
113
|
+
}
|
|
114
|
+
})
|
|
115
|
+
.catch(err => {
|
|
91
116
|
const message = err === true
|
|
92
117
|
? 'Token refresh failed (session expired or refresh token invalid)'
|
|
93
118
|
: err === 'missing refreshToken'
|
|
@@ -127,7 +152,14 @@ export const KeycloakInstanceProvider = React.memo(({ children, redirectUri, aut
|
|
|
127
152
|
}
|
|
128
153
|
if (!keycloak || !onReauthRequired || !keycloak?.authenticated)
|
|
129
154
|
return;
|
|
130
|
-
keycloak
|
|
155
|
+
keycloak
|
|
156
|
+
.updateToken(MIN_VALIDITY_ON_APP_RESUME)
|
|
157
|
+
.then(refreshed => {
|
|
158
|
+
if (refreshed) {
|
|
159
|
+
setTokenVersion(v => v + 1);
|
|
160
|
+
}
|
|
161
|
+
})
|
|
162
|
+
.catch(err => {
|
|
131
163
|
const message = err === true
|
|
132
164
|
? 'Token refresh failed on app resume (session expired or refresh token invalid)'
|
|
133
165
|
: err instanceof Error
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakInstanceContext.js","sourceRoot":"","sources":["../../src/context/KeycloakInstanceContext.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EACZ,aAAa,EAEb,UAAU,EACV,SAAS,EACT,OAAO,EACP,MAAM,EACN,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,QAAQ,EAAsB,MAAM,cAAc,CAAC;AAE3D,OAAO,yBAAyB,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAC,6BAA6B,EAAE,0BAA0B,EAAC,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,iBAAiB,EAAE,yBAAyB,EAAC,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAYtD,MAAM,uBAAuB,GAAG,aAAa,CAAsC,IAAI,CAAC,CAAC;AAezF,MAAM,0BAA0B,GAAG,CAAC,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC,IAAI,CAChD,CAAC,EACC,QAAQ,EACR,WAAW,EACX,gBAAgB,GAAG,IAAI,EACvB,2BAA2B,GAAG,CAAC,EAC/B,gBAAgB,EAChB,UAAU,GACX,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IACnC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAmC,IAAI,CAAC,CAAC;IACjF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,CAAiB,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClE,MAAM,iBAAiB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACtD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,oBAAoB,
|
|
1
|
+
{"version":3,"file":"KeycloakInstanceContext.js","sourceRoot":"","sources":["../../src/context/KeycloakInstanceContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export interface KeycloakProviderProps {
|
|
|
12
12
|
clientSecret?: string;
|
|
13
13
|
getClientSecret?: () => string | undefined | Promise<string | undefined>;
|
|
14
14
|
initRecoveryStrategy?: InitRecoveryStrategy;
|
|
15
|
+
deferStoredTokensUntilRefresh?: boolean;
|
|
15
16
|
initOnLoad?: RNKeycloakInitOptions['onLoad'];
|
|
16
17
|
autoRefreshToken?: boolean;
|
|
17
18
|
autoRefreshTokenMinValidity?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakProvider.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EAAC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAE5C,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAIjB,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,aAAa,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IAE5C,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAE1C,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEzE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"KeycloakProvider.d.ts","sourceRoot":"","sources":["../../src/context/KeycloakProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EAAC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAE5C,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAIjB,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAI1D,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,aAAa,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IAE5C,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAE1C,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEzE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAK5C,6BAA6B,CAAC,EAAE,OAAO,CAAC;IAExC,UAAU,CAAC,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAE7C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAErC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAwBD,eAAO,MAAM,gBAAgB,mDA0C5B,CAAC"}
|
|
@@ -4,8 +4,8 @@ import { KeycloakInstanceProvider } from './KeycloakInstanceContext';
|
|
|
4
4
|
import { KeycloakThemeProvider } from './KeycloakThemeContext';
|
|
5
5
|
import { ReauthProvider } from './ReauthContext';
|
|
6
6
|
import { TokenProvider } from './TokenContext';
|
|
7
|
-
export const KeycloakProvider = React.memo(({ children, config, redirectUri, theme, onTokens, offlineAccessEnabled, backgroundReauth, clientSecret, getClientSecret, initRecoveryStrategy, initOnLoad, autoRefreshToken = true, autoRefreshTokenMinValidity = 5, onReauthRequired, }) => {
|
|
8
|
-
return (<KeycloakConfigProvider config={config} offlineAccessEnabled={offlineAccessEnabled} backgroundReauth={backgroundReauth} clientSecret={clientSecret} getClientSecret={getClientSecret} initRecoveryStrategy={initRecoveryStrategy}>
|
|
7
|
+
export const KeycloakProvider = React.memo(({ children, config, redirectUri, theme, onTokens, offlineAccessEnabled, backgroundReauth, clientSecret, getClientSecret, initRecoveryStrategy, deferStoredTokensUntilRefresh, initOnLoad, autoRefreshToken = true, autoRefreshTokenMinValidity = 5, onReauthRequired, }) => {
|
|
8
|
+
return (<KeycloakConfigProvider config={config} offlineAccessEnabled={offlineAccessEnabled} backgroundReauth={backgroundReauth} clientSecret={clientSecret} getClientSecret={getClientSecret} deferStoredTokensUntilRefresh={deferStoredTokensUntilRefresh} initRecoveryStrategy={initRecoveryStrategy}>
|
|
9
9
|
<KeycloakInstanceProvider redirectUri={redirectUri} autoRefreshToken={autoRefreshToken} autoRefreshTokenMinValidity={autoRefreshTokenMinValidity} initOnLoad={initOnLoad} onReauthRequired={onReauthRequired}>
|
|
10
10
|
<KeycloakThemeProvider theme={theme}>
|
|
11
11
|
<TokenProvider onTokens={onTokens}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakProvider.js","sourceRoot":"","sources":["../../src/context/KeycloakProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAuB,MAAM,OAAO,CAAC;AAS5C,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,wBAAwB,EAAC,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"KeycloakProvider.js","sourceRoot":"","sources":["../../src/context/KeycloakProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAuB,MAAM,OAAO,CAAC;AAS5C,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,wBAAwB,EAAC,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAyD7C,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CACxC,CAAC,EACC,QAAQ,EACR,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,6BAA6B,EAC7B,UAAU,EACV,gBAAgB,GAAG,IAAI,EACvB,2BAA2B,GAAG,CAAC,EAC/B,gBAAgB,GACjB,EAAE,EAAE;IACH,OAAO,CACL,CAAC,sBAAsB,CACrB,MAAM,CAAC,CAAC,MAAM,CAAC,CACf,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,CAC3C,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,6BAA6B,CAAC,CAAC,6BAA6B,CAAC,CAC7D,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,CAC3C;QAAA,CAAC,wBAAwB,CACvB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC,2BAA2B,CAAC,CAAC,2BAA2B,CAAC,CACzD,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC;UAAA,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAClC;YAAA,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAChC;cAAA,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,EAAE,cAAc,CAC5C;YAAA,EAAE,aAAa,CACjB;UAAA,EAAE,qBAAqB,CACzB;QAAA,EAAE,wBAAwB,CAC5B;MAAA,EAAE,sBAAsB,CAAC,CAC1B,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,gBAAgB,CAAC,WAAW,GAAG,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenContext.d.ts","sourceRoot":"","sources":["../../src/context/TokenContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"TokenContext.d.ts","sourceRoot":"","sources":["../../src/context/TokenContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAQlD,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAID,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAC;IAEpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;CAC7C;AAED,eAAO,MAAM,aAAa,gDAoKxB,CAAC;AASH,eAAO,MAAM,QAAQ,QAAO,iBAQ3B,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { tokenStorage } from '../storage';
|
|
|
3
3
|
import { useKeycloakInstance } from './KeycloakInstanceContext';
|
|
4
4
|
const TokenContext = createContext(null);
|
|
5
5
|
export const TokenProvider = React.memo(({ children, onTokens }) => {
|
|
6
|
-
const { keycloak, isInitialized } = useKeycloakInstance();
|
|
6
|
+
const { keycloak, isInitialized, tokenVersion } = useKeycloakInstance();
|
|
7
7
|
const [token, setToken] = useState(null);
|
|
8
8
|
const [refreshToken, setRefreshToken] = useState(null);
|
|
9
9
|
const [idToken, setIdToken] = useState(null);
|
|
@@ -56,7 +56,17 @@ export const TokenProvider = React.memo(({ children, onTokens }) => {
|
|
|
56
56
|
tokenStorage.saveIdToken(currentIdToken).catch(console.error);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
-
}, [
|
|
59
|
+
}, [
|
|
60
|
+
keycloak,
|
|
61
|
+
keycloak?.token,
|
|
62
|
+
keycloak?.refreshToken,
|
|
63
|
+
keycloak?.idToken,
|
|
64
|
+
idToken,
|
|
65
|
+
isInitialized,
|
|
66
|
+
refreshToken,
|
|
67
|
+
token,
|
|
68
|
+
tokenVersion,
|
|
69
|
+
]);
|
|
60
70
|
const updateToken = useCallback(async (minValidity = 120) => {
|
|
61
71
|
if (!keycloak || !isInitialized) {
|
|
62
72
|
throw new Error('[TokenContext] Keycloak not initialized');
|
|
@@ -77,8 +87,12 @@ export const TokenProvider = React.memo(({ children, onTokens }) => {
|
|
|
77
87
|
return keycloak.token || token || '';
|
|
78
88
|
}
|
|
79
89
|
catch (error) {
|
|
80
|
-
|
|
81
|
-
|
|
90
|
+
const refreshError = error === true
|
|
91
|
+
? keycloak.__lastTokenRefreshError ??
|
|
92
|
+
new Error('Keycloak token refresh failed')
|
|
93
|
+
: error;
|
|
94
|
+
console.error('[TokenContext] Update token error:', refreshError);
|
|
95
|
+
throw refreshError;
|
|
82
96
|
}
|
|
83
97
|
}, [keycloak, isInitialized, token]);
|
|
84
98
|
const clearTokens = useCallback(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenContext.js","sourceRoot":"","sources":["../../src/context/TokenContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EACZ,aAAa,EAEb,WAAW,EACX,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AAGf,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"TokenContext.js","sourceRoot":"","sources":["../../src/context/TokenContext.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EACZ,aAAa,EAEb,WAAW,EACX,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AAGf,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAiB9D,MAAM,YAAY,GAAG,aAAa,CAA2B,IAAI,CAAC,CAAC;AAQnE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAqB,CAAC,EAAC,QAAQ,EAAE,QAAQ,EAAC,EAAE,EAAE;IACnF,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAC,GAAG,mBAAmB,EAAE,CAAC;IACtE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACtE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAG5D,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,EAAE,CAAC;YACT,WAAW,EAAE,KAAK;YAClB,KAAK;YACL,YAAY,EAAE,YAAY;YAC1B,YAAY;YACZ,OAAO;SACR,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAG7C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,IAAI,CAAC,QAAQ;YAAE,OAAO;QAExC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;gBAC9C,QAAQ,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;gBACrD,eAAe,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;gBACpE,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC;QAEF,UAAU,EAAE,CAAC;IACf,CAAC,EAAE,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;IAG9B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa;YAAE,OAAO;QAExC,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC;QAClD,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC;QAExC,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;YAC3B,QAAQ,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;YAC/B,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,IAAI,mBAAmB,KAAK,YAAY,EAAE,CAAC;YACzC,eAAe,CAAC,mBAAmB,IAAI,IAAI,CAAC,CAAC;YAC7C,IAAI,mBAAmB,EAAE,CAAC;gBACxB,YAAY,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAED,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;YAC/B,UAAU,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC;YACnC,IAAI,cAAc,EAAE,CAAC;gBACnB,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC,EAAE;QACD,QAAQ;QACR,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,YAAY;QACtB,QAAQ,EAAE,OAAO;QACjB,OAAO;QACP,aAAa;QACb,YAAY;QACZ,KAAK;QACL,YAAY;KACb,CAAC,CAAC;IAQH,MAAM,WAAW,GAAG,WAAW,CAC7B,KAAK,EAAE,cAAsB,GAAG,EAAmB,EAAE;QACnD,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAExD,IAAI,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC9B,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACzB,eAAe,CAAC,QAAQ,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;gBAC/C,UAAU,CAAC,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;gBAErC,MAAM,YAAY,CAAC,UAAU,CAAC;oBAC5B,WAAW,EAAE,QAAQ,CAAC,KAAK;oBAC3B,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,SAAS;oBAChD,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,SAAS;iBACvC,CAAC,CAAC;gBAEH,OAAO,QAAQ,CAAC,KAAK,CAAC;YACxB,CAAC;YAGD,OAAO,QAAQ,CAAC,KAAK,IAAI,KAAK,IAAI,EAAE,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,KAAK,IAAI;gBACZ,CAAC,CAAE,QAAoD,CAAC,uBAAuB;oBAC7E,IAAI,KAAK,CAAC,+BAA+B,CAAC;gBAC5C,CAAC,CAAC,KAAK,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,YAAY,CAAC,CAAC;YAClE,MAAM,YAAY,CAAC;QACrB,CAAC;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,CACjC,CAAC;IAKF,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,IAAmB,EAAE;QACxD,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjB,MAAM,YAAY,CAAC,WAAW,EAAE,CAAC;QAEjC,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAKf,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QAC1D,IAAI,CAAC;YACH,OAAO,QAAQ,CAAC,cAAc,EAAE,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAItB,MAAM,KAAK,GAAG,OAAO,CACnB,GAAG,EAAE,CAAC,CAAC;QACL,KAAK;QACL,WAAW,EAAE,KAAK;QAClB,YAAY;QACZ,YAAY,EAAE,YAAY;QAC1B,OAAO;QACP,SAAS;QACT,WAAW;QACX,WAAW;KACZ,CAAC,EACF,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CACpE,CAAC;IAEF,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;AACjF,CAAC,CAAC,CAAC;AAEH,aAAa,CAAC,WAAW,GAAG,eAAe,CAAC;AAO5C,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAsB,EAAE;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAEzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/core/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/core/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC;AA+CnD,cAAM,SAAU,YAAW,eAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkC;gBAG5D,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAClC,eAAe,EAAE,QAAQ,CAAC,cAAc,CAAC,EACzC,WAAW,EAAE,QAAQ,CAAC,qBAAqB,CAAC;IAM9C,qBAAqB,IAAI,eAAe;IAIxC,cAAc,CAAC,OAAO,EAAE,oBAAoB;IAItC,KAAK,CAAC,GAAG,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IASlC,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIjE,2BAA2B,CAAC,qBAAqB,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIvF,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAa1E,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmB5E,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAI7E,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzE,WAAW,CAAC,OAAO,CAAC,EAAE;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM;CAW7E;AAED,eAAe,SAAS,CAAC"}
|
package/dist/core/adapter.js
CHANGED
|
@@ -81,7 +81,14 @@ class RNAdapter {
|
|
|
81
81
|
},
|
|
82
82
|
body,
|
|
83
83
|
});
|
|
84
|
-
|
|
84
|
+
try {
|
|
85
|
+
return await readTokenResponse(tokenRes, 'refresh');
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
this.client.__lastTokenRefreshError =
|
|
89
|
+
error instanceof Error ? error : new Error(String(error));
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
85
92
|
}
|
|
86
93
|
async fetchUserProfile(profileUrl, token) {
|
|
87
94
|
return await fetchJSON(profileUrl, token);
|
package/dist/core/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/core/adapter.ts"],"names":[],"mappings":"AAaA,OAAO,YAAY,MAAM,WAAW,CAAC;AAErC,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/core/adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/core/index.d.ts
CHANGED
|
@@ -3,5 +3,5 @@ export { KeycloakReactNativeClient };
|
|
|
3
3
|
export { LocalStorage } from './storage';
|
|
4
4
|
export { OFFLINE_ACCESS_SCOPE, getUrlHost, isInternalNetworkUrl, isIpAddressHost, resolveBackgroundReauthConfig, shouldShowBackgroundReauth, withOfflineAccessScope, } from './sessionPolicy';
|
|
5
5
|
export type { BackgroundReauthConfig, BackgroundReauthCheck } from './sessionPolicy';
|
|
6
|
-
export type { KeycloakConfig, KeycloakConfigWith2FA, RNKeycloakInitOptions, KeycloakLoginOptions, KeycloakTokens, TokenUpdateResult, KeycloakProfile, AuthState, InitRecoveryStrategy, } from './types';
|
|
6
|
+
export type { KeycloakConfig, KeycloakConfigWith2FA, RNKeycloakInitOptions, KeycloakLoginOptions, KeycloakTokens, TokenUpdateResult, KeycloakProfile, AuthState, InitRecoveryStrategy, StoredTokenInitPolicy, } from './types';
|
|
7
7
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/core/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,UAAU,CAAC;AAMjD,OAAO,EAAC,yBAAyB,EAAC,CAAC;AACnC,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,eAAe,EACf,6BAA6B,EAC7B,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAC,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AACnF,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,UAAU,CAAC;AAMjD,OAAO,EAAC,yBAAyB,EAAC,CAAC;AACnC,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,eAAe,EACf,6BAA6B,EAC7B,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAC,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AACnF,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,SAAS,CAAC"}
|
package/dist/core/types.d.ts
CHANGED
|
@@ -20,6 +20,9 @@ export interface RNKeycloakInitOptions extends KeycloakInitOptions {
|
|
|
20
20
|
clientSecret?: string;
|
|
21
21
|
getClientSecret?: () => string | undefined | Promise<string | undefined>;
|
|
22
22
|
}
|
|
23
|
+
export interface StoredTokenInitPolicy {
|
|
24
|
+
deferStoredTokensUntilRefresh?: boolean;
|
|
25
|
+
}
|
|
23
26
|
export interface TokenUpdateResult {
|
|
24
27
|
token: string;
|
|
25
28
|
accessToken?: string;
|
package/dist/core/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAE5D,YAAY,EAAC,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAC,CAAC;AAQpE,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAK3D,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAK1C,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1E;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,wBAAwB,CAAC;AAKrE,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAEhE,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAAC,KAAK,IAAI,CAAC;IAEhF,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAE5C,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAE7B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1E;AAKD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAKD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAKD,MAAM,WAAW,SAAS;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;CACjC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAE5D,YAAY,EAAC,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAC,CAAC;AAQpE,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAK3D,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAK1C,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1E;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,wBAAwB,CAAC;AAKrE,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;IAEhE,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAAC,KAAK,IAAI,CAAC;IAEhF,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAE5C,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAE7B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,qBAAqB;IAMpC,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAKD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAKD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAKD,MAAM,WAAW,SAAS;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;CACjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useKeycloakAuthScreen.d.ts","sourceRoot":"","sources":["../../src/hooks/useKeycloakAuthScreen.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"useKeycloakAuthScreen.d.ts","sourceRoot":"","sources":["../../src/hooks/useKeycloakAuthScreen.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnE,MAAM,WAAW,4BAA4B;IAK3C,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB;AAMD,wBAAgB,qBAAqB,CACnC,OAAO,GAAE,4BAAiC,GACzC,2BAA2B,CA6D7B"}
|
|
@@ -4,7 +4,7 @@ import { credentialStorage, tokenStorage } from '../storage';
|
|
|
4
4
|
export function useKeycloakAuthScreen(options = {}) {
|
|
5
5
|
const { isInitialized } = useKeycloakInstance();
|
|
6
6
|
const { shouldShowConfirm } = options;
|
|
7
|
-
const [screen, setScreen] = useState(
|
|
7
|
+
const [screen, setScreen] = useState('resolving');
|
|
8
8
|
const [isLoading, setIsLoading] = useState(true);
|
|
9
9
|
const [error, setError] = useState(null);
|
|
10
10
|
const resolveScreen = useCallback(async () => {
|
|
@@ -25,6 +25,7 @@ export function useKeycloakAuthScreen(options = {}) {
|
|
|
25
25
|
let mounted = true;
|
|
26
26
|
const run = async () => {
|
|
27
27
|
try {
|
|
28
|
+
setScreen('resolving');
|
|
28
29
|
setIsLoading(true);
|
|
29
30
|
setError(null);
|
|
30
31
|
const result = await resolveScreen();
|
|
@@ -51,7 +52,7 @@ export function useKeycloakAuthScreen(options = {}) {
|
|
|
51
52
|
};
|
|
52
53
|
}, [isInitialized, resolveScreen]);
|
|
53
54
|
return {
|
|
54
|
-
screen: isInitialized ? screen :
|
|
55
|
+
screen: isInitialized ? screen : 'resolving',
|
|
55
56
|
isLoading: !isInitialized || isLoading,
|
|
56
57
|
error,
|
|
57
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useKeycloakAuthScreen.js","sourceRoot":"","sources":["../../src/hooks/useKeycloakAuthScreen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAsB3D,MAAM,UAAU,qBAAqB,CACnC,UAAwC,EAAE;IAE1C,MAAM,EAAC,aAAa,EAAC,GAAG,mBAAmB,EAAE,CAAC;IAC9C,MAAM,EAAC,iBAAiB,EAAC,GAAG,OAAO,CAAC;IAEpC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"useKeycloakAuthScreen.js","sourceRoot":"","sources":["../../src/hooks/useKeycloakAuthScreen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAsB3D,MAAM,UAAU,qBAAqB,CACnC,UAAwC,EAAE;IAE1C,MAAM,EAAC,aAAa,EAAC,GAAG,mBAAmB,EAAE,CAAC;IAC9C,MAAM,EAAC,iBAAiB,EAAC,GAAG,OAAO,CAAC;IAEpC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAqB,WAAW,CAAC,CAAC;IACtE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,IAAI,CAAC,CAAC;IAEvD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAiC,EAAE;QACxE,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,MAAM,iBAAiB,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QACpC,CAAC;QACD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,YAAY,CAAC,SAAS,EAAE;YACxB,iBAAiB,CAAC,MAAM,EAAE;SAC3B,CAAC,CAAC;QACH,OAAO,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;IACnD,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,CAAC;QAEnB,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC;gBACH,SAAS,CAAC,WAAW,CAAC,CAAC;gBACvB,YAAY,CAAC,IAAI,CAAC,CAAC;gBACnB,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACf,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;gBACrC,IAAI,OAAO,EAAE,CAAC;oBACZ,SAAS,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,SAAS,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtE,IAAI,OAAO,EAAE,CAAC;oBACZ,QAAQ,CAAC,SAAS,CAAC,CAAC;oBACpB,SAAS,CAAC,OAAO,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,IAAI,OAAO,EAAE,CAAC;oBACZ,YAAY,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,GAAG,EAAE,CAAC;QAEN,OAAO,GAAG,EAAE;YACV,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;IAEnC,OAAO;QACL,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW;QAC5C,SAAS,EAAE,CAAC,aAAa,IAAI,SAAS;QACtC,KAAK;KACN,CAAC;AACJ,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'react-native-get-random-values';
|
|
2
2
|
import KeycloakReactNativeClient from './core/client';
|
|
3
|
-
export type { KeycloakConfig, KeycloakConfigWith2FA, KeycloakTokens, RNKeycloakInitOptions, KeycloakLoginOptions, TokenUpdateResult, KeycloakProfile, AuthState, InitRecoveryStrategy, } from './core/types';
|
|
3
|
+
export type { KeycloakConfig, KeycloakConfigWith2FA, KeycloakTokens, RNKeycloakInitOptions, KeycloakLoginOptions, TokenUpdateResult, KeycloakProfile, AuthState, InitRecoveryStrategy, StoredTokenInitPolicy, } from './core/types';
|
|
4
4
|
export { KeycloakReactNativeClient };
|
|
5
5
|
export { KeycloakProvider, useKeycloakTheme } from './context';
|
|
6
6
|
export type { KeycloakProviderProps, KeycloakTheme, KeycloakThemeButtonProps, KeycloakThemeIconButtonProps, } from './context';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,gCAAgC,CAAC;AAExC,OAAO,yBAAyB,MAAM,eAAe,CAAC;AAGtD,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,gCAAgC,CAAC;AAExC,OAAO,yBAAyB,MAAM,eAAe,CAAC;AAGtD,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAC,yBAAyB,EAAC,CAAC;AAGnC,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAC7D,YAAY,EACV,qBAAqB,EACrB,aAAa,EACb,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAC;AACpF,YAAY,EACV,qBAAqB,EACrB,kBAAkB,EAClB,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC1D,YAAY,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAG5D,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAC,QAAQ,EAAE,eAAe,EAAC,MAAM,WAAW,CAAC;AAGpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAC,sBAAsB,EAAE,oBAAoB,EAAC,MAAM,SAAS,CAAC;AACrE,YAAY,EAAC,uBAAuB,EAAE,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAC1E,YAAY,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,gCAAgC,CAAC;AAExC,OAAO,yBAAyB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,gCAAgC,CAAC;AAExC,OAAO,yBAAyB,MAAM,eAAe,CAAC;AAgBtD,OAAO,EAAC,yBAAyB,EAAC,CAAC;AAGnC,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAS7D,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAC;AASpF,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAI1D,OAAO,EACL,YAAY,EACZ,aAAa,EACb,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAC,QAAQ,EAAE,eAAe,EAAC,MAAM,WAAW,CAAC;AAGpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAG5C,OAAO,EAAC,sBAAsB,EAAE,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAGrE,OAAO,EAAC,qBAAqB,EAAC,MAAM,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfirmAuthPage.d.ts","sourceRoot":"","sources":["../../../src/screens/ConfirmAuthPage/ConfirmAuthPage.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ConfirmAuthPage.d.ts","sourceRoot":"","sources":["../../../src/screens/ConfirmAuthPage/ConfirmAuthPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AACjF,OAAO,EAEL,mBAAmB,EAOnB,SAAS,EACV,MAAM,cAAc,CAAC;AAUtB,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAW5D,UAAU,oBAAoB;IAI5B,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAKvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAKjC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IAStB,IAAI,CAAC,EAAE,eAAe,CAAC;IAMvB,UAAU,CAAC,EAAE,MAAM,CAAC;IAKpB,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,mBAAmB,CAAC;IAE7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AASD,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAkT1D,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { useKeycloakConfigRefresh, useKeycloakInstance, useKeycloakTheme } from
|
|
|
7
7
|
import { useKeycloakAuth } from '../../hooks';
|
|
8
8
|
import { credentialStorage, tokenStorage } from '../../storage';
|
|
9
9
|
import { LogoutConfirmSheet, PINConfirm } from '../../ui';
|
|
10
|
-
export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login', logo, logoHeight = 80, logoWidth = 80, pinLength = 4, allowBiometry = true, autoShowBiometry = true, title, description, logoutText = 'Выйти из аккаунта', style, }) => {
|
|
10
|
+
export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login', logo, logoHeight = 80, logoWidth = 80, pinLength = 4, allowBiometry = true, autoShowBiometry = true, title, description, layout = 'screen', logoutText = 'Выйти из аккаунта', style, }) => {
|
|
11
11
|
const { redirectUri, keycloak, isInitialized } = useKeycloakInstance();
|
|
12
12
|
const refreshPinCheck = useKeycloakConfigRefresh();
|
|
13
13
|
const { colors: { background: backgroundColor, error }, LoaderComponent, } = useKeycloakTheme();
|
|
@@ -15,15 +15,23 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
15
15
|
const insets = useSafeAreaInsets();
|
|
16
16
|
const containerStyleWithInsets = useMemo(() => [
|
|
17
17
|
styles.container,
|
|
18
|
-
{
|
|
18
|
+
{
|
|
19
|
+
backgroundColor,
|
|
20
|
+
paddingTop: layout === 'sheet' ? 0 : insets.top,
|
|
21
|
+
paddingBottom: layout === 'sheet' ? 0 : insets.bottom,
|
|
22
|
+
},
|
|
19
23
|
style,
|
|
20
|
-
], [backgroundColor, insets.top, insets.bottom, style]);
|
|
24
|
+
], [backgroundColor, insets.top, insets.bottom, layout, style]);
|
|
21
25
|
const [phase, setPhase] = useState(CONFIRM_AUTH_PHASE.PIN);
|
|
22
26
|
const [webViewError, setWebViewError] = useState(null);
|
|
23
27
|
const [isProcessingPIN, setIsProcessingPIN] = useState(false);
|
|
24
28
|
const loginSuccessHandled = useRef(false);
|
|
25
29
|
const logoutSheetRef = useRef(null);
|
|
30
|
+
const mountedRef = useRef(true);
|
|
26
31
|
const loginUrl = createLoginUrl() ?? '';
|
|
32
|
+
useEffect(() => () => {
|
|
33
|
+
mountedRef.current = false;
|
|
34
|
+
}, []);
|
|
27
35
|
const openLogoutSheet = useCallback(() => {
|
|
28
36
|
logoutSheetRef.current?.open();
|
|
29
37
|
}, []);
|
|
@@ -69,9 +77,13 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
69
77
|
return;
|
|
70
78
|
try {
|
|
71
79
|
await login({ url });
|
|
80
|
+
if (!mountedRef.current)
|
|
81
|
+
return;
|
|
72
82
|
handleSuccess();
|
|
73
83
|
}
|
|
74
84
|
catch (err) {
|
|
85
|
+
if (!mountedRef.current)
|
|
86
|
+
return;
|
|
75
87
|
const loginError = err instanceof Error ? err : new Error('Ошибка входа');
|
|
76
88
|
console.error('[ConfirmAuthPage] login error:', loginError);
|
|
77
89
|
setWebViewError(loginError.message);
|
|
@@ -94,7 +106,7 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
94
106
|
}
|
|
95
107
|
};
|
|
96
108
|
Linking.getInitialURL().then(initialUrl => {
|
|
97
|
-
if (initialUrl && initialUrl.startsWith(redirectUri)) {
|
|
109
|
+
if (mountedRef.current && initialUrl && initialUrl.startsWith(redirectUri)) {
|
|
98
110
|
handleDeepLink({ url: initialUrl });
|
|
99
111
|
}
|
|
100
112
|
});
|
|
@@ -105,11 +117,27 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
105
117
|
setWebViewError(null);
|
|
106
118
|
setPhase(CONFIRM_AUTH_PHASE.WEBVIEW_LOGIN);
|
|
107
119
|
}, []);
|
|
120
|
+
const hydrateKeycloakTokensFromStorage = useCallback(async () => {
|
|
121
|
+
if (!keycloak)
|
|
122
|
+
return offlineToken;
|
|
123
|
+
if (keycloak.refreshToken)
|
|
124
|
+
return keycloak.refreshToken;
|
|
125
|
+
const stored = await tokenStorage.getTokens();
|
|
126
|
+
const storedAccessToken = stored.accessToken ?? stored.token;
|
|
127
|
+
const storedRefreshToken = stored.offlineToken ?? stored.refreshToken;
|
|
128
|
+
if (!storedAccessToken || !storedRefreshToken) {
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
keycloak.setToken?.(storedAccessToken, storedRefreshToken, stored.idToken ?? null);
|
|
132
|
+
return storedRefreshToken;
|
|
133
|
+
}, [keycloak, offlineToken]);
|
|
108
134
|
const finishAfterPIN = useCallback(async () => {
|
|
109
135
|
if (isProcessingPIN)
|
|
110
136
|
return;
|
|
111
|
-
|
|
112
|
-
|
|
137
|
+
if (mountedRef.current) {
|
|
138
|
+
setIsProcessingPIN(true);
|
|
139
|
+
setWebViewError(null);
|
|
140
|
+
}
|
|
113
141
|
try {
|
|
114
142
|
const forceRefresh = mode === 'reauth';
|
|
115
143
|
const refreshNeeded = forceRefresh || !token || isExpired;
|
|
@@ -117,7 +145,8 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
117
145
|
handleSuccess();
|
|
118
146
|
return;
|
|
119
147
|
}
|
|
120
|
-
|
|
148
|
+
const refreshTokenForUnlock = await hydrateKeycloakTokensFromStorage();
|
|
149
|
+
if (!refreshTokenForUnlock) {
|
|
121
150
|
if (mode === 'login') {
|
|
122
151
|
openLoginFallback();
|
|
123
152
|
return;
|
|
@@ -125,12 +154,16 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
125
154
|
throw new Error('Offline token is missing');
|
|
126
155
|
}
|
|
127
156
|
const nextToken = await updateToken(forceRefresh ? -1 : 120);
|
|
157
|
+
if (!mountedRef.current)
|
|
158
|
+
return;
|
|
128
159
|
if (!nextToken) {
|
|
129
160
|
throw new Error('Access token is missing after refresh');
|
|
130
161
|
}
|
|
131
162
|
handleSuccess();
|
|
132
163
|
}
|
|
133
164
|
catch (err) {
|
|
165
|
+
if (!mountedRef.current)
|
|
166
|
+
return;
|
|
134
167
|
const refreshError = err instanceof Error ? err : new Error('Ошибка обновления сессии');
|
|
135
168
|
console.error('[ConfirmAuthPage] token refresh error:', refreshError);
|
|
136
169
|
if (mode === 'login') {
|
|
@@ -141,12 +174,15 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
141
174
|
onError?.(refreshError);
|
|
142
175
|
}
|
|
143
176
|
finally {
|
|
144
|
-
|
|
177
|
+
if (mountedRef.current) {
|
|
178
|
+
setIsProcessingPIN(false);
|
|
179
|
+
}
|
|
145
180
|
}
|
|
146
181
|
}, [
|
|
147
182
|
handleSuccess,
|
|
148
183
|
isExpired,
|
|
149
184
|
isProcessingPIN,
|
|
185
|
+
hydrateKeycloakTokensFromStorage,
|
|
150
186
|
mode,
|
|
151
187
|
offlineToken,
|
|
152
188
|
onError,
|
|
@@ -176,11 +212,15 @@ export const ConfirmAuthPage = ({ onSuccess, onError, onLogout, mode = 'login',
|
|
|
176
212
|
{webViewError ? (<View style={styles.errorBanner}>
|
|
177
213
|
<Text style={[styles.errorText, { color: error }]}>{webViewError}</Text>
|
|
178
214
|
</View>) : null}
|
|
179
|
-
<View style={styles.pinContainer}>
|
|
180
|
-
<
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
215
|
+
<View style={[styles.pinContainer, layout === 'sheet' && styles.sheetPinContainer]}>
|
|
216
|
+
<View style={[styles.pinContent, layout === 'sheet' && styles.sheetPinContent]}>
|
|
217
|
+
<PINConfirm pinLength={pinLength} onSuccess={finishAfterPIN} onError={onError} allowBiometry={allowBiometry} autoShowBiometry={autoShowBiometry} title={title} description={description} compact={layout === 'sheet'} style={layout === 'sheet' ? styles.sheetPINConfirm : undefined}/>
|
|
218
|
+
</View>
|
|
219
|
+
<View style={[styles.logoutFooter, layout === 'sheet' && styles.sheetLogoutFooter]}>
|
|
220
|
+
<TouchableOpacity onPress={openLogoutSheet} style={styles.logoutLinkContainer} activeOpacity={0.7}>
|
|
221
|
+
<Text style={[styles.logoutLinkText, { color: error }]}>{logoutText}</Text>
|
|
222
|
+
</TouchableOpacity>
|
|
223
|
+
</View>
|
|
184
224
|
</View>
|
|
185
225
|
|
|
186
226
|
<LogoutConfirmSheet ref={logoutSheetRef} title={logoutText} confirmText="Выход" onConfirm={handleLogoutConfirm}/>
|
|
@@ -212,6 +252,26 @@ const styles = StyleSheet.create({
|
|
|
212
252
|
flex: 1,
|
|
213
253
|
justifyContent: 'center',
|
|
214
254
|
},
|
|
255
|
+
pinContent: {
|
|
256
|
+
flex: 1,
|
|
257
|
+
},
|
|
258
|
+
sheetPinContainer: {
|
|
259
|
+
justifyContent: 'space-between',
|
|
260
|
+
paddingVertical: 16,
|
|
261
|
+
},
|
|
262
|
+
sheetPinContent: {
|
|
263
|
+
flex: 1,
|
|
264
|
+
},
|
|
265
|
+
sheetPINConfirm: {
|
|
266
|
+
flex: 1,
|
|
267
|
+
minHeight: 0,
|
|
268
|
+
},
|
|
269
|
+
logoutFooter: {
|
|
270
|
+
alignItems: 'center',
|
|
271
|
+
},
|
|
272
|
+
sheetLogoutFooter: {
|
|
273
|
+
paddingTop: 24,
|
|
274
|
+
},
|
|
215
275
|
logoutLinkContainer: {
|
|
216
276
|
paddingVertical: 12,
|
|
217
277
|
alignItems: 'center',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfirmAuthPage.js","sourceRoot":"","sources":["../../../src/screens/ConfirmAuthPage/ConfirmAuthPage.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ConfirmAuthPage.js","sourceRoot":"","sources":["../../../src/screens/ConfirmAuthPage/ConfirmAuthPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoutConfirmSheet.d.ts","sourceRoot":"","sources":["../../../src/ui/LogoutConfirmSheet/LogoutConfirmSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6D,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"LogoutConfirmSheet.d.ts","sourceRoot":"","sources":["../../../src/ui/LogoutConfirmSheet/LogoutConfirmSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6D,MAAM,OAAO,CAAC;AAKlF,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IAEtC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IAEtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAOD,eAAO,MAAM,kBAAkB,uGAmE9B,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import BottomSheet, { BottomSheetBackdrop, BottomSheetView } from '@gorhom/bottom-sheet';
|
|
2
2
|
import React, { forwardRef, useCallback, useImperativeHandle, useRef } from 'react';
|
|
3
3
|
import { StyleSheet, Text, View } from 'react-native';
|
|
4
|
-
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
5
4
|
import { useKeycloakTheme } from '../../context';
|
|
6
5
|
const DEFAULT_TITLE = 'Выйти из аккаунта';
|
|
7
6
|
const DEFAULT_MESSAGE = 'Вы уверены что хотите выйти?';
|
|
@@ -9,7 +8,6 @@ const DEFAULT_CANCEL_TEXT = 'Отмена';
|
|
|
9
8
|
const DEFAULT_CONFIRM_TEXT = 'Выход';
|
|
10
9
|
export const LogoutConfirmSheet = forwardRef(({ title = DEFAULT_TITLE, message = DEFAULT_MESSAGE, cancelText = DEFAULT_CANCEL_TEXT, confirmText = DEFAULT_CONFIRM_TEXT, onCancel, onConfirm, }, ref) => {
|
|
11
10
|
const { ContainedButtonComponent, OutlinedButtonComponent } = useKeycloakTheme();
|
|
12
|
-
const { bottom } = useSafeAreaInsets();
|
|
13
11
|
const bottomSheetRef = useRef(null);
|
|
14
12
|
const open = useCallback(() => {
|
|
15
13
|
bottomSheetRef.current?.snapToIndex(0);
|
|
@@ -26,7 +24,7 @@ export const LogoutConfirmSheet = forwardRef(({ title = DEFAULT_TITLE, message =
|
|
|
26
24
|
const handleConfirm = useCallback(() => {
|
|
27
25
|
onConfirm?.();
|
|
28
26
|
}, [onConfirm]);
|
|
29
|
-
return (<BottomSheet ref={bottomSheetRef} index={-1} enableDynamicSizing bottomInset={
|
|
27
|
+
return (<BottomSheet ref={bottomSheetRef} index={-1} snapPoints={['23%']} enableDynamicSizing={false} bottomInset={0} handleComponent={null} enablePanDownToClose enableOverDrag={false} backdropComponent={renderBackdrop}>
|
|
30
28
|
<BottomSheetView style={styles.content}>
|
|
31
29
|
<Text style={styles.title}>{title}</Text>
|
|
32
30
|
<Text style={styles.message}>{message}</Text>
|
|
@@ -44,8 +42,11 @@ export const LogoutConfirmSheet = forwardRef(({ title = DEFAULT_TITLE, message =
|
|
|
44
42
|
LogoutConfirmSheet.displayName = 'LogoutConfirmSheet';
|
|
45
43
|
const styles = StyleSheet.create({
|
|
46
44
|
content: {
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
flex: 1,
|
|
46
|
+
justifyContent: 'flex-start',
|
|
47
|
+
paddingHorizontal: 16,
|
|
48
|
+
paddingTop: 18,
|
|
49
|
+
paddingBottom: 16,
|
|
49
50
|
},
|
|
50
51
|
title: {
|
|
51
52
|
fontSize: 18,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoutConfirmSheet.js","sourceRoot":"","sources":["../../../src/ui/LogoutConfirmSheet/LogoutConfirmSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,WAAW,EAAE,EAAC,mBAAmB,EAAE,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACvF,OAAO,KAAK,EAAE,EAAC,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAClF,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"LogoutConfirmSheet.js","sourceRoot":"","sources":["../../../src/ui/LogoutConfirmSheet/LogoutConfirmSheet.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PINConfirm.d.ts","sourceRoot":"","sources":["../../../src/ui/PINConfirm/PINConfirm.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PINConfirm.d.ts","sourceRoot":"","sources":["../../../src/ui/PINConfirm/PINConfirm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiD,MAAM,OAAO,CAAC;AACtE,OAAO,EAAyB,SAAS,EAAC,MAAM,cAAc,CAAC;AAY/D,UAAU,eAAe;IAKvB,SAAS,CAAC,EAAE,MAAM,CAAC;IAMnB,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,KAAK,IAAI,CAAC;IAKzE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAMjC,aAAa,CAAC,EAAE,OAAO,CAAC;IAMxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAK3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAKf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAKlB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAoBD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiJhD,CAAC"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
|
-
import React, { useCallback, useEffect, useState } from 'react';
|
|
1
|
+
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
2
|
import { StyleSheet, Text, View } from 'react-native';
|
|
3
3
|
import { useKeycloakTheme } from '../../context/KeycloakThemeContext';
|
|
4
4
|
import { getBiometryEnabled, getSupportedBiometryType, verifyBiometry, verifyPIN, } from '../../storage';
|
|
5
5
|
import { NumberPad } from '../NumberPad';
|
|
6
6
|
import { PINIndicator } from '../PINIndicator';
|
|
7
|
-
export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry = true, autoShowBiometry = true, title = 'Введите PIN', style, }) => {
|
|
7
|
+
export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry = true, autoShowBiometry = true, title = 'Введите PIN', description, compact = false, style, }) => {
|
|
8
8
|
const { colors } = useKeycloakTheme();
|
|
9
9
|
const [pin, setPin] = useState([]);
|
|
10
10
|
const [error, setError] = useState(null);
|
|
11
11
|
const [biometryType, setBiometryType] = useState(null);
|
|
12
12
|
const [biometryEnabled, setBiometryEnabled] = useState(false);
|
|
13
13
|
const [isVerifying, setIsVerifying] = useState(false);
|
|
14
|
+
const mountedRef = useRef(true);
|
|
14
15
|
const { background, text } = colors;
|
|
16
|
+
useEffect(() => () => {
|
|
17
|
+
mountedRef.current = false;
|
|
18
|
+
}, []);
|
|
15
19
|
useEffect(() => {
|
|
16
20
|
const checkBiometry = async () => {
|
|
17
21
|
try {
|
|
@@ -19,11 +23,15 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
19
23
|
getSupportedBiometryType(),
|
|
20
24
|
getBiometryEnabled(),
|
|
21
25
|
]);
|
|
26
|
+
if (!mountedRef.current)
|
|
27
|
+
return;
|
|
22
28
|
setBiometryType(type);
|
|
23
29
|
setBiometryEnabled(enabled && !!type);
|
|
24
30
|
}
|
|
25
31
|
catch (err) {
|
|
26
32
|
console.error('[PINConfirm] Ошибка проверки биометрии:', err);
|
|
33
|
+
if (!mountedRef.current)
|
|
34
|
+
return;
|
|
27
35
|
setBiometryType(null);
|
|
28
36
|
setBiometryEnabled(false);
|
|
29
37
|
}
|
|
@@ -50,6 +58,8 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
50
58
|
try {
|
|
51
59
|
const pinStr = pin.join('');
|
|
52
60
|
const isPINValid = await verifyPIN(pinStr);
|
|
61
|
+
if (!mountedRef.current)
|
|
62
|
+
return;
|
|
53
63
|
if (isPINValid) {
|
|
54
64
|
onSuccess?.();
|
|
55
65
|
}
|
|
@@ -61,13 +71,17 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
61
71
|
}
|
|
62
72
|
}
|
|
63
73
|
catch (err) {
|
|
74
|
+
if (!mountedRef.current)
|
|
75
|
+
return;
|
|
64
76
|
const pinError = err instanceof Error ? err : new Error('Ошибка проверки PIN');
|
|
65
77
|
setError(pinError.message);
|
|
66
78
|
setPin([]);
|
|
67
79
|
onError?.(pinError);
|
|
68
80
|
}
|
|
69
81
|
finally {
|
|
70
|
-
|
|
82
|
+
if (mountedRef.current) {
|
|
83
|
+
setIsVerifying(false);
|
|
84
|
+
}
|
|
71
85
|
}
|
|
72
86
|
};
|
|
73
87
|
const handleBiometry = useCallback(async () => {
|
|
@@ -76,22 +90,27 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
76
90
|
}
|
|
77
91
|
try {
|
|
78
92
|
const isBiometryValid = await verifyBiometry();
|
|
93
|
+
if (!mountedRef.current)
|
|
94
|
+
return;
|
|
79
95
|
if (isBiometryValid) {
|
|
80
96
|
onSuccess?.();
|
|
81
97
|
}
|
|
82
98
|
}
|
|
83
99
|
catch (err) {
|
|
84
100
|
console.error('[PINConfirm] Биометрия не удалась:', err);
|
|
101
|
+
if (!mountedRef.current)
|
|
102
|
+
return;
|
|
85
103
|
setError('Ошибка биометрической аутентификации');
|
|
86
104
|
}
|
|
87
105
|
}, [biometryEnabled, biometryType, onSuccess]);
|
|
88
106
|
return (<View style={[styles.container, { backgroundColor: background }, style]}>
|
|
89
|
-
<View style={styles.content}>
|
|
107
|
+
<View style={[styles.content, compact && styles.compactContent]}>
|
|
90
108
|
<View style={styles.header}>
|
|
91
109
|
<Text style={[styles.title, { color: text }]}>{title}</Text>
|
|
110
|
+
{description ? (<Text style={[styles.description, { color: text }]}>{description}</Text>) : null}
|
|
92
111
|
</View>
|
|
93
112
|
|
|
94
|
-
<View style={styles.indicatorContainer}>
|
|
113
|
+
<View style={[styles.indicatorContainer, compact && styles.compactIndicatorContainer]}>
|
|
95
114
|
<PINIndicator value={pin} codeLength={pinLength} error={error}/>
|
|
96
115
|
</View>
|
|
97
116
|
|
|
@@ -109,6 +128,11 @@ const styles = StyleSheet.create({
|
|
|
109
128
|
justifyContent: 'space-between',
|
|
110
129
|
paddingTop: 24,
|
|
111
130
|
},
|
|
131
|
+
compactContent: {
|
|
132
|
+
flex: 1,
|
|
133
|
+
justifyContent: 'space-between',
|
|
134
|
+
paddingTop: 0,
|
|
135
|
+
},
|
|
112
136
|
header: {
|
|
113
137
|
alignItems: 'center',
|
|
114
138
|
},
|
|
@@ -127,6 +151,10 @@ const styles = StyleSheet.create({
|
|
|
127
151
|
alignItems: 'center',
|
|
128
152
|
marginVertical: 40,
|
|
129
153
|
},
|
|
154
|
+
compactIndicatorContainer: {
|
|
155
|
+
marginTop: 24,
|
|
156
|
+
marginBottom: 28,
|
|
157
|
+
},
|
|
130
158
|
errorContainer: {
|
|
131
159
|
alignItems: 'center',
|
|
132
160
|
marginTop: -20,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PINConfirm.js","sourceRoot":"","sources":["../../../src/ui/PINConfirm/PINConfirm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"PINConfirm.js","sourceRoot":"","sources":["../../../src/ui/PINConfirm/PINConfirm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReauthBottomSheet.d.ts","sourceRoot":"","sources":["../../../src/widgets/ReauthBottomSheet/ReauthBottomSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAKtE,UAAU,sBAAsB;IAI9B,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAKvB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAKvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAMjC,SAAS,CAAC,EAAE,MAAM,CAAC;IAMnB,aAAa,CAAC,EAAE,OAAO,CAAC;IAMxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAM3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAMf,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAiCD,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"ReauthBottomSheet.d.ts","sourceRoot":"","sources":["../../../src/widgets/ReauthBottomSheet/ReauthBottomSheet.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAKtE,UAAU,sBAAsB;IAI9B,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAKvB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IAKvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAMjC,SAAS,CAAC,EAAE,MAAM,CAAC;IAMnB,aAAa,CAAC,EAAE,OAAO,CAAC;IAMxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAM3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAMf,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAiCD,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAqG9D,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { BackHandler, StyleSheet, View } from 'react-native';
|
|
|
4
4
|
import { useKeycloakTheme, useReauth } from '../../context';
|
|
5
5
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
6
6
|
import { ConfirmAuthPage } from '../../screens';
|
|
7
|
-
export const ReauthBottomSheet = React.memo(({ onSuccess, onDismiss, pinLength = 4, allowBiometry = true, autoShowBiometry = true, title = '
|
|
7
|
+
export const ReauthBottomSheet = React.memo(({ onSuccess, onDismiss, onError, pinLength = 4, allowBiometry = true, autoShowBiometry = true, title = 'Введите PIN', description = 'Введите PIN-код', mode, }) => {
|
|
8
8
|
const { colors: { background }, } = useKeycloakTheme();
|
|
9
9
|
const { top } = useSafeAreaInsets();
|
|
10
10
|
const { hideReauth, isReauthRequired, reauthReason } = useReauth();
|
|
@@ -29,16 +29,18 @@ export const ReauthBottomSheet = React.memo(({ onSuccess, onDismiss, pinLength =
|
|
|
29
29
|
onSuccess?.();
|
|
30
30
|
}, [hideReauth, onSuccess]);
|
|
31
31
|
const handleDismiss = useCallback(() => {
|
|
32
|
+
hideReauth();
|
|
33
|
+
bottomSheetRef.current?.close();
|
|
32
34
|
onDismiss?.();
|
|
33
|
-
}, [onDismiss]);
|
|
35
|
+
}, [hideReauth, onDismiss]);
|
|
34
36
|
const renderBackdrop = useCallback((props) => (<BottomSheetBackdrop pressBehavior={'none'} opacity={0.8} {...props} appearsOnIndex={0} disappearsOnIndex={-1}/>), []);
|
|
35
37
|
const backgroundStyle = useMemo(() => ({
|
|
36
38
|
backgroundColor: background,
|
|
37
39
|
}), [background]);
|
|
38
40
|
const confirmMode = mode ?? (reauthReason === 'background' ? 'unlock' : 'reauth');
|
|
39
|
-
return (<BottomSheetModal ref={bottomSheetRef} snapPoints={snapPoints} handleComponent={null} topInset={top +
|
|
41
|
+
return (<BottomSheetModal ref={bottomSheetRef} snapPoints={snapPoints} handleComponent={null} topInset={top + 4} enableOverDrag={false} enableDynamicSizing={false} enablePanDownToClose={false} onDismiss={handleDismiss} backdropComponent={renderBackdrop} backgroundStyle={backgroundStyle}>
|
|
40
42
|
<View style={styles.container}>
|
|
41
|
-
<ConfirmAuthPage onSuccess={handleSuccess} onLogout={handleDismiss} pinLength={pinLength} allowBiometry={allowBiometry} autoShowBiometry={autoShowBiometry} mode={confirmMode} title={title} description={description}/>
|
|
43
|
+
<ConfirmAuthPage onSuccess={handleSuccess} onLogout={handleDismiss} pinLength={pinLength} allowBiometry={allowBiometry} autoShowBiometry={autoShowBiometry} onError={onError} mode={confirmMode} title={title} description={description} layout="sheet"/>
|
|
42
44
|
</View>
|
|
43
45
|
</BottomSheetModal>);
|
|
44
46
|
});
|
|
@@ -49,7 +51,9 @@ const styles = StyleSheet.create({
|
|
|
49
51
|
borderTopLeftRadius: 12,
|
|
50
52
|
borderTopRightRadius: 12,
|
|
51
53
|
overflow: 'hidden',
|
|
52
|
-
|
|
54
|
+
paddingHorizontal: 16,
|
|
55
|
+
paddingTop: 4,
|
|
56
|
+
paddingBottom: 16,
|
|
53
57
|
},
|
|
54
58
|
footer: {
|
|
55
59
|
marginTop: 16,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReauthBottomSheet.js","sourceRoot":"","sources":["../../../src/widgets/ReauthBottomSheet/ReauthBottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAwB,MAAM,eAAe,CAAC;AAwFtE,MAAM,CAAC,MAAM,iBAAiB,GAAqC,KAAK,CAAC,IAAI,CAC3E,CAAC,EACC,SAAS,EACT,SAAS,EACT,SAAS,GAAG,CAAC,EACb,aAAa,GAAG,IAAI,EACpB,gBAAgB,GAAG,IAAI,EACvB,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"ReauthBottomSheet.js","sourceRoot":"","sources":["../../../src/widgets/ReauthBottomSheet/ReauthBottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAwB,MAAM,eAAe,CAAC;AAwFtE,MAAM,CAAC,MAAM,iBAAiB,GAAqC,KAAK,CAAC,IAAI,CAC3E,CAAC,EACC,SAAS,EACT,SAAS,EACT,OAAO,EACP,SAAS,GAAG,CAAC,EACb,aAAa,GAAG,IAAI,EACpB,gBAAgB,GAAG,IAAI,EACvB,KAAK,GAAG,aAAa,EACrB,WAAW,GAAG,iBAAiB,EAC/B,IAAI,GACL,EAAE,EAAE;IACH,MAAM,EACJ,MAAM,EAAE,EAAE,UAAU,EAAE,GACvB,GAAG,gBAAgB,EAAE,CAAC;IACvB,MAAM,EAAE,GAAG,EAAE,GAAG,iBAAiB,EAAE,CAAA;IACnC,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAC;IACnE,MAAM,cAAc,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAG9C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,gBAAgB,EAAE,CAAC;YACrB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;IACH,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEvB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAC9B,MAAM,GAAG,GAAG,WAAW,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAGvB,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QAChC,SAAS,EAAE,EAAE,CAAC;IAChB,CAAC,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAG5B,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,UAAU,EAAE,CAAC;QACb,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QAChC,SAAS,EAAE,EAAE,CAAC;IAChB,CAAC,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAG5B,MAAM,cAAc,GAAG,WAAW,CAChC,CAAC,KAAU,EAAE,EAAE,CAAC,CACd,CAAC,mBAAmB,CAClB,aAAa,CAAC,CAAC,MAAM,CAAC,CACtB,OAAO,CAAC,CAAC,GAAG,CAAC,CACb,IAAI,KAAK,CAAC,CACV,cAAc,CAAC,CAAC,CAAC,CAAC,CAClB,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,EACtB,CACH,EACD,EAAE,CACH,CAAC;IAGF,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CAAC,CAAC;QACL,eAAe,EAAE,UAAU;KAC5B,CAAC,EACF,CAAC,UAAU,CAAC,CACb,CAAC;IACF,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAElF,OAAO,CACL,CAAC,gBAAgB,CACf,GAAG,CAAC,CAAC,cAAc,CAAC,CACpB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,eAAe,CAAC,CAAC,IAAI,CAAC,CACtB,QAAQ,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAClB,cAAc,CAAC,CAAC,KAAK,CAAC,CACtB,mBAAmB,CAAC,CAAC,KAAK,CAAC,CAC3B,oBAAoB,CAAC,CAAC,KAAK,CAAC,CAC5B,SAAS,CAAC,CAAC,aAAa,CAAC,CACzB,iBAAiB,CAAC,CAAC,cAAc,CAAC,CAClC,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC;QAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAC5B;UAAA,CAAC,eAAe,CACd,SAAS,CAAC,CAAC,aAAa,CAAC,CACzB,QAAQ,CAAC,CAAC,aAAa,CAAC,CACxB,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACnC,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,IAAI,CAAC,CAAC,WAAW,CAAC,CAClB,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,MAAM,CAAC,OAAO,EAElB;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,iBAAiB,CAAC,WAAW,GAAG,mBAAmB,CAAC;AAEpD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,mBAAmB,EAAE,EAAE;QACvB,oBAAoB,EAAE,EAAE;QACxB,QAAQ,EAAE,QAAQ;QAClB,iBAAiB,EAAE,EAAE;QACrB,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,EAAE;KAClB;IACD,MAAM,EAAE;QACN,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,EAAE;QACd,cAAc,EAAE,CAAC;KAClB;CACF,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bmc-soft/keycloak-auth",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"description": "Production-ready Keycloak authentication package for React Native with optimized performance and security",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -67,6 +67,7 @@
|
|
|
67
67
|
"clean": "rm -rf dist && rm -f tsconfig.tsbuildinfo",
|
|
68
68
|
"prepack": "npm run build",
|
|
69
69
|
"prepublishOnly": "npm run clean && npm run build",
|
|
70
|
+
"test": "node tests/sessionPolicy.test.cjs && node tests/publicApiExports.test.cjs && node tests/authPatchRegression.test.cjs",
|
|
70
71
|
"typecheck": "tsc --noEmit"
|
|
71
72
|
},
|
|
72
73
|
"keywords": [
|