@bmc-soft/keycloak-auth 1.0.11 → 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 +123 -60
- package/dist/_lib/types/confirmAuthPhase.d.ts +1 -2
- package/dist/_lib/types/confirmAuthPhase.d.ts.map +1 -1
- package/dist/_lib/types/confirmAuthPhase.js +1 -2
- package/dist/_lib/types/confirmAuthPhase.js.map +1 -1
- package/dist/axios/adapters/KeycloakTokenProvider.js +8 -8
- package/dist/axios/adapters/KeycloakTokenProvider.js.map +1 -1
- package/dist/axios/interceptors.js +2 -2
- package/dist/axios/interceptors.js.map +1 -1
- package/dist/context/KeycloakConfigContext.d.ts +20 -1
- package/dist/context/KeycloakConfigContext.d.ts.map +1 -1
- package/dist/context/KeycloakConfigContext.js +52 -3
- package/dist/context/KeycloakConfigContext.js.map +1 -1
- package/dist/context/KeycloakInstanceContext.d.ts +2 -0
- package/dist/context/KeycloakInstanceContext.d.ts.map +1 -1
- package/dist/context/KeycloakInstanceContext.js +93 -18
- package/dist/context/KeycloakInstanceContext.js.map +1 -1
- package/dist/context/KeycloakProvider.d.ts +8 -1
- package/dist/context/KeycloakProvider.d.ts.map +1 -1
- package/dist/context/KeycloakProvider.js +3 -3
- package/dist/context/KeycloakProvider.js.map +1 -1
- package/dist/context/ReauthContext.d.ts +3 -1
- package/dist/context/ReauthContext.d.ts.map +1 -1
- package/dist/context/ReauthContext.js +6 -2
- package/dist/context/ReauthContext.js.map +1 -1
- package/dist/context/TokenContext.d.ts +2 -0
- package/dist/context/TokenContext.d.ts.map +1 -1
- package/dist/context/TokenContext.js +32 -10
- package/dist/context/TokenContext.js.map +1 -1
- package/dist/context/index.d.ts +2 -2
- package/dist/context/index.d.ts.map +1 -1
- package/dist/context/index.js +1 -1
- package/dist/context/index.js.map +1 -1
- package/dist/context/reauthRequiredRef.d.ts +2 -1
- package/dist/context/reauthRequiredRef.d.ts.map +1 -1
- package/dist/context/reauthRequiredRef.js.map +1 -1
- package/dist/core/adapter.d.ts.map +1 -1
- package/dist/core/adapter.js +37 -4
- package/dist/core/adapter.js.map +1 -1
- package/dist/core/index.d.ts +3 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/sessionPolicy.d.ts +21 -0
- package/dist/core/sessionPolicy.d.ts.map +1 -0
- package/dist/core/sessionPolicy.js +63 -0
- package/dist/core/sessionPolicy.js.map +1 -0
- package/dist/core/types.d.ts +17 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/hooks/useKeycloakAuth.d.ts +3 -0
- package/dist/hooks/useKeycloakAuth.d.ts.map +1 -1
- package/dist/hooks/useKeycloakAuth.js +12 -7
- package/dist/hooks/useKeycloakAuth.js.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/AuthPage/AuthPage.d.ts +2 -0
- package/dist/screens/AuthPage/AuthPage.d.ts.map +1 -1
- package/dist/screens/AuthPage/AuthPage.js +12 -15
- package/dist/screens/AuthPage/AuthPage.js.map +1 -1
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.d.ts +3 -1
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.d.ts.map +1 -1
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.js +132 -57
- package/dist/screens/ConfirmAuthPage/ConfirmAuthPage.js.map +1 -1
- package/dist/screens/ConfirmAuthPage/index.d.ts +1 -0
- package/dist/screens/ConfirmAuthPage/index.d.ts.map +1 -1
- package/dist/screens/index.d.ts +1 -0
- package/dist/screens/index.d.ts.map +1 -1
- package/dist/storage/credentialStorage.d.ts +8 -0
- package/dist/storage/credentialStorage.d.ts.map +1 -1
- package/dist/storage/credentialStorage.js +99 -1
- package/dist/storage/credentialStorage.js.map +1 -1
- package/dist/storage/tokenStorage.d.ts +10 -0
- package/dist/storage/tokenStorage.d.ts.map +1 -1
- package/dist/storage/tokenStorage.js +30 -8
- package/dist/storage/tokenStorage.js.map +1 -1
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.d.ts.map +1 -1
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.js +10 -7
- package/dist/ui/LogoutConfirmSheet/LogoutConfirmSheet.js.map +1 -1
- package/dist/ui/NumberPad/NumberPad.d.ts.map +1 -1
- package/dist/ui/NumberPad/NumberPad.js +16 -9
- package/dist/ui/NumberPad/NumberPad.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 +40 -12
- package/dist/ui/PINConfirm/PINConfirm.js.map +1 -1
- package/dist/ui/PINSetup/stages/BiometryStage.d.ts.map +1 -1
- package/dist/ui/PINSetup/stages/BiometryStage.js +6 -2
- package/dist/ui/PINSetup/stages/BiometryStage.js.map +1 -1
- package/dist/ui/PINSetup/styles.d.ts +0 -1
- package/dist/ui/PINSetup/styles.d.ts.map +1 -1
- package/dist/ui/PINSetup/styles.js +0 -1
- package/dist/ui/PINSetup/styles.js.map +1 -1
- package/dist/ui/WebViewLogin/WebViewLogin.d.ts.map +1 -1
- package/dist/ui/WebViewLogin/WebViewLogin.js +2 -2
- package/dist/ui/WebViewLogin/WebViewLogin.js.map +1 -1
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.d.ts +2 -0
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.d.ts.map +1 -1
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.js +19 -8
- package/dist/widgets/ReauthBottomSheet/ReauthBottomSheet.js.map +1 -1
- package/package.json +2 -1
|
@@ -14,6 +14,7 @@ export const saveToken = async (token) => {
|
|
|
14
14
|
throw error;
|
|
15
15
|
}
|
|
16
16
|
};
|
|
17
|
+
export const saveAccessToken = saveToken;
|
|
17
18
|
export const getToken = async () => {
|
|
18
19
|
try {
|
|
19
20
|
const credentials = await Keychain.getGenericPassword({
|
|
@@ -26,6 +27,7 @@ export const getToken = async () => {
|
|
|
26
27
|
return undefined;
|
|
27
28
|
}
|
|
28
29
|
};
|
|
30
|
+
export const getAccessToken = getToken;
|
|
29
31
|
export const saveRefreshToken = async (refreshToken) => {
|
|
30
32
|
try {
|
|
31
33
|
await Keychain.setGenericPassword('keycloak', refreshToken, {
|
|
@@ -38,6 +40,7 @@ export const saveRefreshToken = async (refreshToken) => {
|
|
|
38
40
|
throw error;
|
|
39
41
|
}
|
|
40
42
|
};
|
|
43
|
+
export const saveOfflineToken = saveRefreshToken;
|
|
41
44
|
export const getRefreshToken = async () => {
|
|
42
45
|
try {
|
|
43
46
|
const credentials = await Keychain.getGenericPassword({
|
|
@@ -50,6 +53,7 @@ export const getRefreshToken = async () => {
|
|
|
50
53
|
return undefined;
|
|
51
54
|
}
|
|
52
55
|
};
|
|
56
|
+
export const getOfflineToken = getRefreshToken;
|
|
53
57
|
export const saveIdToken = async (idToken) => {
|
|
54
58
|
try {
|
|
55
59
|
await Keychain.setGenericPassword('keycloak', idToken, {
|
|
@@ -77,11 +81,13 @@ export const getIdToken = async () => {
|
|
|
77
81
|
export const saveTokens = async (data) => {
|
|
78
82
|
try {
|
|
79
83
|
const promises = [];
|
|
80
|
-
|
|
81
|
-
|
|
84
|
+
const accessToken = data.accessToken ?? data.token;
|
|
85
|
+
const offlineToken = data.offlineToken ?? data.refreshToken;
|
|
86
|
+
if (accessToken) {
|
|
87
|
+
promises.push(saveToken(accessToken));
|
|
82
88
|
}
|
|
83
|
-
if (
|
|
84
|
-
promises.push(saveRefreshToken(
|
|
89
|
+
if (offlineToken) {
|
|
90
|
+
promises.push(saveRefreshToken(offlineToken));
|
|
85
91
|
}
|
|
86
92
|
if (data.idToken) {
|
|
87
93
|
promises.push(saveIdToken(data.idToken));
|
|
@@ -100,11 +106,23 @@ export const getTokens = async () => {
|
|
|
100
106
|
getRefreshToken(),
|
|
101
107
|
getIdToken(),
|
|
102
108
|
]);
|
|
103
|
-
return {
|
|
109
|
+
return {
|
|
110
|
+
accessToken: token,
|
|
111
|
+
token,
|
|
112
|
+
offlineToken: refreshToken,
|
|
113
|
+
refreshToken,
|
|
114
|
+
idToken,
|
|
115
|
+
};
|
|
104
116
|
}
|
|
105
117
|
catch (error) {
|
|
106
118
|
console.error('[TokenStorage] Get tokens error:', error);
|
|
107
|
-
return {
|
|
119
|
+
return {
|
|
120
|
+
accessToken: undefined,
|
|
121
|
+
token: undefined,
|
|
122
|
+
offlineToken: undefined,
|
|
123
|
+
refreshToken: undefined,
|
|
124
|
+
idToken: undefined,
|
|
125
|
+
};
|
|
108
126
|
}
|
|
109
127
|
};
|
|
110
128
|
export const clearTokens = async () => {
|
|
@@ -122,8 +140,8 @@ export const clearTokens = async () => {
|
|
|
122
140
|
};
|
|
123
141
|
export const hasTokens = async () => {
|
|
124
142
|
try {
|
|
125
|
-
const
|
|
126
|
-
return
|
|
143
|
+
const offlineToken = await getOfflineToken();
|
|
144
|
+
return offlineToken !== undefined;
|
|
127
145
|
}
|
|
128
146
|
catch (error) {
|
|
129
147
|
console.error('[TokenStorage] Has tokens error:', error);
|
|
@@ -132,9 +150,13 @@ export const hasTokens = async () => {
|
|
|
132
150
|
};
|
|
133
151
|
export const tokenStorage = {
|
|
134
152
|
saveToken,
|
|
153
|
+
saveAccessToken,
|
|
135
154
|
getToken,
|
|
155
|
+
getAccessToken,
|
|
136
156
|
saveRefreshToken,
|
|
157
|
+
saveOfflineToken,
|
|
137
158
|
getRefreshToken,
|
|
159
|
+
getOfflineToken,
|
|
138
160
|
saveIdToken,
|
|
139
161
|
getIdToken,
|
|
140
162
|
saveTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenStorage.js","sourceRoot":"","sources":["../../src/storage/tokenStorage.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAElD,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAC7C,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAC5D,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenStorage.js","sourceRoot":"","sources":["../../src/storage/tokenStorage.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAC;AAElD,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAC7C,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAC5D,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAgBlD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,KAAa,EAAiB,EAAE;IAC9D,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,EAAE;YACnD,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa;SAC9C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QACzD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;AAKzC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,IAAiC,EAAE;IAC9D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC;YACpD,OAAO,EAAE,aAAa;SACvB,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC;AAKvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,YAAoB,EAAiB,EAAE;IAC5E,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,EAAE;YAC1D,OAAO,EAAE,qBAAqB;YAC9B,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa;SAC9C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;QACjE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAKjD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,IAAiC,EAAE;IACrE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC;YACpD,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC;AAK/C,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAAe,EAAiB,EAAE;IAClE,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,EAAE;YACrD,OAAO,EAAE,gBAAgB;YACzB,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa;SAC9C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,IAAiC,EAAE;IAChE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC;YACpD,OAAO,EAAE,gBAAgB;SAC1B,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,IAAe,EAAiB,EAAE;IACjE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;QAE5D,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAwB,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,QAAQ,EAAE;YACV,eAAe,EAAE;YACjB,UAAU,EAAE;SACb,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,KAAK;YAClB,KAAK;YACL,YAAY,EAAE,YAAY;YAC1B,YAAY;YACZ,OAAO;SACR,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO;YACL,WAAW,EAAE,SAAS;YACtB,KAAK,EAAE,SAAS;YAChB,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,SAAS;YACvB,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,IAAmB,EAAE;IACnD,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,QAAQ,CAAC,oBAAoB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAC,CAAC;YACvD,QAAQ,CAAC,oBAAoB,CAAC,EAAC,OAAO,EAAE,qBAAqB,EAAC,CAAC;YAC/D,QAAQ,CAAC,oBAAoB,CAAC,EAAC,OAAO,EAAE,gBAAgB,EAAC,CAAC;SAC3D,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAsB,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;QAC7C,OAAO,YAAY,KAAK,SAAS,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,SAAS;IACT,eAAe;IACf,QAAQ;IACR,cAAc;IACd,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;IACf,eAAe;IACf,WAAW;IACX,UAAU;IACV,UAAU;IACV,SAAS;IACT,WAAW;IACX,SAAS;CACV,CAAC"}
|
|
@@ -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>
|
|
@@ -34,7 +32,7 @@ export const LogoutConfirmSheet = forwardRef(({ title = DEFAULT_TITLE, message =
|
|
|
34
32
|
<OutlinedButtonComponent style={styles.buttonFlex} onPress={handleCancel}>
|
|
35
33
|
{cancelText}
|
|
36
34
|
</OutlinedButtonComponent>
|
|
37
|
-
<ContainedButtonComponent style={styles.buttonFlex} onPress={handleConfirm}>
|
|
35
|
+
<ContainedButtonComponent style={[styles.buttonFlex, styles.confirmButton]} onPress={handleConfirm}>
|
|
38
36
|
{confirmText}
|
|
39
37
|
</ContainedButtonComponent>
|
|
40
38
|
</View>
|
|
@@ -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,
|
|
@@ -59,10 +60,12 @@ const styles = StyleSheet.create({
|
|
|
59
60
|
buttons: {
|
|
60
61
|
flexDirection: 'row',
|
|
61
62
|
justifyContent: 'space-between',
|
|
62
|
-
gap: 12,
|
|
63
63
|
},
|
|
64
64
|
buttonFlex: {
|
|
65
65
|
flex: 1,
|
|
66
66
|
},
|
|
67
|
+
confirmButton: {
|
|
68
|
+
marginLeft: 12,
|
|
69
|
+
},
|
|
67
70
|
});
|
|
68
71
|
//# sourceMappingURL=LogoutConfirmSheet.js.map
|
|
@@ -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":"NumberPad.d.ts","sourceRoot":"","sources":["../../../src/ui/NumberPad/NumberPad.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgB,MAAM,OAAO,CAAC;AACrC,OAAO,EAAuD,SAAS,EAAC,MAAM,cAAc,CAAC;AAsB7F,UAAU,cAAc;IAItB,KAAK,EAAE,MAAM,EAAE,CAAC;IAKhB,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAMzC,UAAU,CAAC,EAAE,MAAM,CAAC;IAKpB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IAKxB,YAAY,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,IAAI,CAAC;IAK3D,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAK/B,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAKhC,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AA2BD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"NumberPad.d.ts","sourceRoot":"","sources":["../../../src/ui/NumberPad/NumberPad.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgB,MAAM,OAAO,CAAC;AACrC,OAAO,EAAuD,SAAS,EAAC,MAAM,cAAc,CAAC;AAsB7F,UAAU,cAAc;IAItB,KAAK,EAAE,MAAM,EAAE,CAAC;IAKhB,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAMzC,UAAU,CAAC,EAAE,MAAM,CAAC;IAKpB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IAKxB,YAAY,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,aAAa,GAAG,IAAI,CAAC;IAK3D,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAK/B,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAKhC,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AA2BD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA0H9C,CAAC"}
|
|
@@ -47,24 +47,26 @@ export const NumberPad = ({ value, onChangeValue, codeLength = 4, onBiometry, bi
|
|
|
47
47
|
}
|
|
48
48
|
return <Text style={[styles.icon, { color: !value.length ? disabledColor : textColor }]}>⌫</Text>;
|
|
49
49
|
}, [BackspaceIcon, value.length, textColor, disabledColor]);
|
|
50
|
-
const renderKey = ({ number, letters }) => (<TouchableOpacity key={number} activeOpacity={0.7} onPress={() => onNumberPress(number)} style={[
|
|
50
|
+
const renderKey = ({ number, letters }, index = 0) => (<TouchableOpacity key={number} activeOpacity={0.7} onPress={() => onNumberPress(number)} style={[
|
|
51
51
|
styles.numberButton,
|
|
52
52
|
{
|
|
53
53
|
width: BUTTON_SIZE,
|
|
54
54
|
height: BUTTON_SIZE,
|
|
55
55
|
backgroundColor: buttonBackgroundColor,
|
|
56
56
|
},
|
|
57
|
+
index > 0 && styles.keySpacing,
|
|
57
58
|
]}>
|
|
58
59
|
<View style={styles.keyContent}>
|
|
59
60
|
<Text style={[styles.number, { color: textColor }]}>{number}</Text>
|
|
60
|
-
{letters
|
|
61
|
+
{letters ? <Text style={[styles.letters, { color: textColor }]}>{letters}</Text> : null}
|
|
61
62
|
</View>
|
|
62
63
|
</TouchableOpacity>);
|
|
64
|
+
const renderNumberRow = (keys, index) => (<View key={index} style={[styles.numberRow, index > 0 && styles.rowSpacing]}>
|
|
65
|
+
{keys.map(renderKey)}
|
|
66
|
+
</View>);
|
|
63
67
|
return (<View style={[styles.container, style]}>
|
|
64
|
-
|
|
65
|
-
<View style={styles.numberRow
|
|
66
|
-
<View style={styles.numberRow}>{numberKeys.slice(6, 9).map(renderKey)}</View>
|
|
67
|
-
<View style={styles.numberRow}>
|
|
68
|
+
{[numberKeys.slice(0, 3), numberKeys.slice(3, 6), numberKeys.slice(6, 9)].map(renderNumberRow)}
|
|
69
|
+
<View style={[styles.numberRow, styles.rowSpacing]}>
|
|
68
70
|
<View style={styles.sideButtonContainer}>
|
|
69
71
|
{onBiometry ? (<TouchableOpacity style={[styles.sideButton, { width: BUTTON_SIZE }]} onPress={onBiometryPress}>
|
|
70
72
|
{defaultBiometryIcon}
|
|
@@ -72,6 +74,7 @@ export const NumberPad = ({ value, onChangeValue, codeLength = 4, onBiometry, bi
|
|
|
72
74
|
</View>
|
|
73
75
|
<TouchableOpacity key={0} onPress={() => onNumberPress(0)} style={[
|
|
74
76
|
styles.numberButton,
|
|
77
|
+
styles.keySpacing,
|
|
75
78
|
{
|
|
76
79
|
backgroundColor: buttonBackgroundColor,
|
|
77
80
|
width: BUTTON_SIZE,
|
|
@@ -82,7 +85,7 @@ export const NumberPad = ({ value, onChangeValue, codeLength = 4, onBiometry, bi
|
|
|
82
85
|
<Text style={[styles.number, { color: textColor }]}>0</Text>
|
|
83
86
|
</View>
|
|
84
87
|
</TouchableOpacity>
|
|
85
|
-
<View style={styles.sideButtonContainer}>
|
|
88
|
+
<View style={[styles.sideButtonContainer, styles.keySpacing]}>
|
|
86
89
|
<TouchableOpacity style={[styles.sideButton, { width: BUTTON_SIZE }]} disabled={!value.length} key="backspace" onPress={onNumberBackspace}>
|
|
87
90
|
{defaultBackspaceIcon}
|
|
88
91
|
</TouchableOpacity>
|
|
@@ -95,12 +98,16 @@ const styles = StyleSheet.create({
|
|
|
95
98
|
flexDirection: 'column',
|
|
96
99
|
paddingHorizontal: HORIZONTAL_PADDING,
|
|
97
100
|
justifyContent: 'flex-end',
|
|
98
|
-
gap: BUTTON_GAP,
|
|
99
101
|
},
|
|
100
102
|
numberRow: {
|
|
101
103
|
flexDirection: 'row',
|
|
102
104
|
justifyContent: 'center',
|
|
103
|
-
|
|
105
|
+
},
|
|
106
|
+
rowSpacing: {
|
|
107
|
+
marginTop: BUTTON_GAP,
|
|
108
|
+
},
|
|
109
|
+
keySpacing: {
|
|
110
|
+
marginLeft: BUTTON_GAP,
|
|
104
111
|
},
|
|
105
112
|
numberButton: {
|
|
106
113
|
alignItems: 'center',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberPad.js","sourceRoot":"","sources":["../../../src/ui/NumberPad/NumberPad.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NumberPad.js","sourceRoot":"","sources":["../../../src/ui/NumberPad/NumberPad.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
|
-
import { getBiometryEnabled,
|
|
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
|
}
|
|
@@ -49,9 +57,11 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
49
57
|
setIsVerifying(true);
|
|
50
58
|
try {
|
|
51
59
|
const pinStr = pin.join('');
|
|
52
|
-
const
|
|
53
|
-
if (
|
|
54
|
-
|
|
60
|
+
const isPINValid = await verifyPIN(pinStr);
|
|
61
|
+
if (!mountedRef.current)
|
|
62
|
+
return;
|
|
63
|
+
if (isPINValid) {
|
|
64
|
+
onSuccess?.();
|
|
55
65
|
}
|
|
56
66
|
else {
|
|
57
67
|
const errorMsg = 'Неверный PIN';
|
|
@@ -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 () => {
|
|
@@ -75,23 +89,28 @@ export const PINConfirm = ({ pinLength = 4, onSuccess, onError, allowBiometry =
|
|
|
75
89
|
return;
|
|
76
90
|
}
|
|
77
91
|
try {
|
|
78
|
-
const
|
|
79
|
-
if (
|
|
80
|
-
|
|
92
|
+
const isBiometryValid = await verifyBiometry();
|
|
93
|
+
if (!mountedRef.current)
|
|
94
|
+
return;
|
|
95
|
+
if (isBiometryValid) {
|
|
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":"BiometryStage.d.ts","sourceRoot":"","sources":["../../../../src/ui/PINSetup/stages/BiometryStage.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAS3C,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"BiometryStage.d.ts","sourceRoot":"","sources":["../../../../src/ui/PINSetup/stages/BiometryStage.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAS3C,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC7B;AAwDD,eAAO,MAAM,aAAa,gDAuCxB,CAAC"}
|
|
@@ -24,7 +24,9 @@ const styles = StyleSheet.create({
|
|
|
24
24
|
},
|
|
25
25
|
buttonsBlock: {
|
|
26
26
|
marginTop: 24,
|
|
27
|
-
|
|
27
|
+
},
|
|
28
|
+
secondaryButtonWrap: {
|
|
29
|
+
marginTop: 16,
|
|
28
30
|
},
|
|
29
31
|
primaryButton: {
|
|
30
32
|
fontSize: 18,
|
|
@@ -69,7 +71,9 @@ export const BiometryStage = memo(function BiometryStage({ title, biometryType,
|
|
|
69
71
|
|
|
70
72
|
<View style={styles.buttonsBlock}>
|
|
71
73
|
<ContainedButtonComponent onPress={onAccept}>{texts.acceptLabel}</ContainedButtonComponent>
|
|
72
|
-
<OutlinedButtonComponent onPress={onSkip}>
|
|
74
|
+
<OutlinedButtonComponent style={styles.secondaryButtonWrap} onPress={onSkip}>
|
|
75
|
+
{TEXTS.skipLabel}
|
|
76
|
+
</OutlinedButtonComponent>
|
|
73
77
|
</View>
|
|
74
78
|
</View>);
|
|
75
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BiometryStage.js","sourceRoot":"","sources":["../../../../src/ui/PINSetup/stages/BiometryStage.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,MAAM,eAAe,GAAG,OAAO,CAAC,iDAAiD,CAAC,CAAC;AACnF,MAAM,oBAAoB,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAC;AAW7F,MAAM,QAAQ,GAAG,CAAC,IAAmB,EAAE,EAAE,CACvC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,SAAS,CAAC;AAE7D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,WAAW,EAAE;QACX,SAAS,EAAE,CAAC;KACb;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,SAAS,EAAE,GAAG;KACf;IACD,SAAS,EAAE;QACT,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,GAAG;QACb,SAAS,EAAE,GAAG;KACf;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"BiometryStage.js","sourceRoot":"","sources":["../../../../src/ui/PINSetup/stages/BiometryStage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/ui/PINSetup/styles.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/ui/PINSetup/styles.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/ui/PINSetup/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;IAC9C,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,iBAAiB,EAAE,EAAE;KACtB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,eAAe;QAC/B,eAAe,EAAE,EAAE;KACpB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,QAAQ;KACpB;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;QACnB,OAAO,EAAE,GAAG;KACb;IACD,kBAAkB,EAAE;QAClB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,EAAE;KACnB;IACD,iBAAiB,EAAE;QACjB,cAAc,EAAE,QAAQ;KACzB;IACD,eAAe,EAAE;QACf,SAAS,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/ui/PINSetup/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;IAC9C,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,iBAAiB,EAAE,EAAE;KACtB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,eAAe;QAC/B,eAAe,EAAE,EAAE;KACpB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,QAAQ;KACpB;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;QACnB,OAAO,EAAE,GAAG;KACb;IACD,kBAAkB,EAAE;QAClB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,EAAE;KACnB;IACD,iBAAiB,EAAE;QACjB,cAAc,EAAE,QAAQ;KACzB;IACD,eAAe,EAAE;QACf,SAAS,EAAE,EAAE;KACd;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,QAAQ;QACnB,eAAe,EAAE,EAAE;QACnB,UAAU,EAAE,KAAK;KAClB;CACF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebViewLogin.d.ts","sourceRoot":"","sources":["../../../src/ui/WebViewLogin/WebViewLogin.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAOxE,UAAU,iBAAiB;IAKzB,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAKrF,KAAK,CAAC,EAAE,GAAG,CAAC;IAKZ,UAAU,CAAC,EAAE,MAAM,CAAC;IAKpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAoBD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"WebViewLogin.d.ts","sourceRoot":"","sources":["../../../src/ui/WebViewLogin/WebViewLogin.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAOxE,UAAU,iBAAiB;IAKzB,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAKrF,KAAK,CAAC,EAAE,GAAG,CAAC;IAKZ,UAAU,CAAC,EAAE,MAAM,CAAC;IAKpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAoBD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiJpD,CAAC"}
|
|
@@ -52,7 +52,7 @@ export const WebViewLogin = ({ onLoginSuccess, style, }) => {
|
|
|
52
52
|
}
|
|
53
53
|
}, []);
|
|
54
54
|
const handleNavigationStateChange = useCallback((event) => {
|
|
55
|
-
if (
|
|
55
|
+
if (event.url.startsWith(redirectUri)) {
|
|
56
56
|
onLoginSuccess?.({
|
|
57
57
|
...user,
|
|
58
58
|
url: event.url,
|
|
@@ -97,7 +97,7 @@ export const WebViewLogin = ({ onLoginSuccess, style, }) => {
|
|
|
97
97
|
styles.flex
|
|
98
98
|
]}>
|
|
99
99
|
|
|
100
|
-
<WebView ref={webViewRef} source={{ uri: loginUrl }} onLoadEnd={() => setLoading(false)} onError={() => setLoading(false)} onNavigationStateChange={
|
|
100
|
+
{loginUrl ? (<WebView ref={webViewRef} source={{ uri: loginUrl }} androidLayerType="software" onLoadEnd={() => setLoading(false)} onError={() => setLoading(false)} onNavigationStateChange={handleNavigationStateChange} onMessage={handleMessage} javaScriptEnabled={true} injectedJavaScript={defaultInjectedJS} incognito={true} style={[styles.flex, { backgroundColor }]}/>) : null}
|
|
101
101
|
|
|
102
102
|
{loading || !loginUrl ? (<View style={[StyleSheet.absoluteFillObject, { backgroundColor }]}>
|
|
103
103
|
<LoaderComponent />
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebViewLogin.js","sourceRoot":"","sources":["../../../src/ui/WebViewLogin/WebViewLogin.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WebViewLogin.js","sourceRoot":"","sources":["../../../src/ui/WebViewLogin/WebViewLogin.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,OAAgC,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AA2CnE,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EACxD,cAAc,EACd,KAAK,GACN,EAAE,EAAE;IACH,MAAM,EACJ,MAAM,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,EACvC,eAAe,GAChB,GAAG,gBAAgB,EAAE,CAAC;IACvB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAU,IAAI,CAAC,CAAC;IAEzC,MAAM,EAAE,WAAW,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAC9C,MAAM,EAAE,cAAc,EAAE,GAAG,eAAe,EAAE,CAAC;IAG7C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;QAC7B,WAAW,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAGrB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,cAAc,GAAG,CAAC,KAAsB,EAAE,EAAE;gBAChD,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBACtC,cAAc,EAAE,CAAC;wBACf,GAAG,IAAI;wBACP,GAAG,EAAE,KAAK,CAAC,GAAG;qBACf,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC;YAGF,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBACxC,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBACrD,cAAc,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC,CAAC;YAGH,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAErE,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;IAGxC,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,KAA0B,EAAE,EAAE;QAC/D,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACjD,OAAO,CAAC;oBACN,QAAQ,EAAE,WAAW,CAAC,QAAQ;oBAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;iBAC/B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAGP,MAAM,2BAA2B,GAAG,WAAW,CAC7C,CAAC,KAAsB,EAAE,EAAE;QACzB,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,cAAc,EAAE,CAAC;gBACf,GAAG,IAAI;gBACP,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EACD,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CACpC,CAAC;IAGF,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCzB,CAAC;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACrC;MAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC;YACL,MAAM,CAAC,IAAI;SACZ,CAAC,CACF;QACA;QAAA,CAAC,QAAQ,CAAC,CAAC,CAAC,CACV,CAAC,OAAO,CACN,GAAG,CAAC,CAAC,UAAU,CAAC,CAChB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAC1B,gBAAgB,CAAC,UAAU,CAC3B,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CACnC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CACjC,uBAAuB,CAAC,CAAC,2BAA2B,CAAC,CACrD,SAAS,CAAC,CAAC,aAAa,CAAC,CACzB,iBAAiB,CAAC,CAAC,IAAI,CAAC,CACxB,kBAAkB,CAAC,CAAC,iBAAiB,CAAC,CACtC,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,EAC1C,CACH,CAAC,CAAC,CAAC,IAAI,CAER;;QAAA,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CACtB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,CAChE;YAAA,CAAC,eAAe,CAAC,AAAD,EAClB;UAAA,EAAE,IAAI,CAAC,CACR,CAAC,CAAC,CAAC,IAAI,CACV;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;KACR;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC;KACR;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;KACrB;CACF,CAAC,CAAC"}
|