@turnkey/sdk-react 5.0.0 → 5.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/components/auth/Apple.d.ts +0 -1
- package/dist/components/auth/Apple.d.ts.map +1 -1
- package/dist/components/auth/Apple.js +10 -3
- package/dist/components/auth/Apple.js.map +1 -1
- package/dist/components/auth/Apple.mjs +93 -60
- package/dist/components/auth/Apple.mjs.map +1 -1
- package/dist/components/auth/Auth.d.ts.map +1 -1
- package/dist/components/auth/Auth.js +18 -18
- package/dist/components/auth/Auth.js.map +1 -1
- package/dist/components/auth/Auth.mjs +101 -101
- package/dist/components/auth/Auth.mjs.map +1 -1
- package/dist/components/auth/Facebook.d.ts +0 -1
- package/dist/components/auth/Facebook.d.ts.map +1 -1
- package/dist/components/auth/Facebook.js +9 -2
- package/dist/components/auth/Facebook.js.map +1 -1
- package/dist/components/auth/Facebook.mjs +17 -5
- package/dist/components/auth/Facebook.mjs.map +1 -1
- package/dist/components/auth/Google.d.ts +0 -1
- package/dist/components/auth/Google.d.ts.map +1 -1
- package/dist/components/auth/Google.js +9 -2
- package/dist/components/auth/Google.js.map +1 -1
- package/dist/components/auth/Google.mjs +22 -10
- package/dist/components/auth/Google.mjs.map +1 -1
- package/dist/components/auth/constants.js +1 -1
- package/dist/components/auth/constants.js.map +1 -1
- package/dist/components/auth/constants.mjs +1 -1
- package/dist/components/auth/constants.mjs.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @turnkey/sdk-react
|
|
2
2
|
|
|
3
|
+
## 5.0.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#646](https://github.com/tkhq/sdk/pull/646) [`c6754f2`](https://github.com/tkhq/sdk/commit/c6754f29cce16f0d4451e380742f581a2bf55e77) Thanks [@moe-dev](https://github.com/moe-dev)! - Patch releases fixes Google Oauth edge case in the Auth Component where logins fail due to indexedDbPublic key not being available yet
|
|
8
|
+
|
|
3
9
|
## 5.0.0
|
|
4
10
|
|
|
5
11
|
### Major Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Apple.d.ts","sourceRoot":"","sources":["../../../src/components/auth/Apple.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Apple.d.ts","sourceRoot":"","sources":["../../../src/components/auth/Apple.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAoBnD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,CAAC,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnD,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,CAAC,EAAE,GAAG,CAAC;KACf;CACF;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAgJnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -10,12 +10,12 @@ var apple = require('../../assets/apple.svg.js');
|
|
|
10
10
|
var Socials_module = require('./Socials.module.css.js');
|
|
11
11
|
var constants = require('./constants.js');
|
|
12
12
|
var material = require('@mui/material');
|
|
13
|
+
var useTurnkey = require('../../hooks/use-turnkey.js');
|
|
13
14
|
|
|
14
15
|
function isMobileBrowser() {
|
|
15
16
|
return /Android|iPhone|iPad|iPod|Opera Mini|IEMobile|WPDesktop/i.test(navigator.userAgent);
|
|
16
17
|
}
|
|
17
18
|
const AppleAuthButton = ({
|
|
18
|
-
publicKey,
|
|
19
19
|
clientId,
|
|
20
20
|
onSuccess,
|
|
21
21
|
layout,
|
|
@@ -24,6 +24,9 @@ const AppleAuthButton = ({
|
|
|
24
24
|
const [loading, setLoading] = React.useState(false);
|
|
25
25
|
const [appleSDKLoaded, setAppleSDKLoaded] = React.useState(false);
|
|
26
26
|
const redirectURI = process.env.NEXT_PUBLIC_OAUTH_REDIRECT_URI;
|
|
27
|
+
const {
|
|
28
|
+
indexedDbClient
|
|
29
|
+
} = useTurnkey.useTurnkey();
|
|
27
30
|
React.useEffect(() => {
|
|
28
31
|
// 1. Load Apple's JS if not already present
|
|
29
32
|
if (!window.AppleID) {
|
|
@@ -53,9 +56,13 @@ const AppleAuthButton = ({
|
|
|
53
56
|
window.history.replaceState({}, document.title, window.location.pathname);
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
|
-
}, [onSuccess]);
|
|
57
|
-
const handleLogin = () => {
|
|
59
|
+
}, [onSuccess, indexedDbClient]);
|
|
60
|
+
const handleLogin = async () => {
|
|
58
61
|
setLoading(true);
|
|
62
|
+
const publicKey = await indexedDbClient?.getPublicKey();
|
|
63
|
+
if (!publicKey) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
59
66
|
const nonce = utils.bytesToHex(sha2.sha256(publicKey));
|
|
60
67
|
const appleAuthUrl = new URL(constants.APPLE_AUTH_URL);
|
|
61
68
|
appleAuthUrl.searchParams.set("client_id", clientId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Apple.js","sources":["../../../src/components/auth/Apple.tsx"],"sourcesContent":[null],"names":["isMobileBrowser","test","navigator","userAgent","AppleAuthButton","
|
|
1
|
+
{"version":3,"file":"Apple.js","sources":["../../../src/components/auth/Apple.tsx"],"sourcesContent":[null],"names":["isMobileBrowser","test","navigator","userAgent","AppleAuthButton","clientId","onSuccess","layout","openInPage","loading","setLoading","useState","appleSDKLoaded","setAppleSDKLoaded","redirectURI","process","env","NEXT_PUBLIC_OAUTH_REDIRECT_URI","indexedDbClient","useTurnkey","useEffect","window","AppleID","script","document","createElement","src","APPLE_AUTH_SCRIPT_URL","onload","onerror","console","error","body","appendChild","location","hash","hashParams","URLSearchParams","slice","idToken","get","state","provider","split","history","replaceState","title","pathname","handleLogin","publicKey","getPublicKey","nonce","bytesToHex","sha256","appleAuthUrl","URL","APPLE_AUTH_URL","searchParams","set","href","toString","width","popupWidth","height","popupHeight","left","screenX","innerWidth","top","screenY","innerHeight","authWindow","open","interval","setInterval","closed","clearInterval","url","startsWith","origin","close","_jsx","className","styles","iconButton","socialButton","onClick","undefined","children","CircularProgress","size","thickness","buttonProgress","_jsxs","_Fragment","appleIcon","iconLarge","iconSmall","alt"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { slicedToArray as _slicedToArray } from '../../_virtual/_rollupPluginBabelHelpers.mjs';
|
|
1
|
+
import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../../_virtual/_rollupPluginBabelHelpers.mjs';
|
|
2
2
|
import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
|
|
3
3
|
import { useState, useEffect } from 'react';
|
|
4
4
|
import { sha256 } from '@noble/hashes/sha2';
|
|
@@ -7,13 +7,13 @@ import appleIcon from '../../assets/apple.svg.mjs';
|
|
|
7
7
|
import styles from './Socials.module.css.mjs';
|
|
8
8
|
import { APPLE_AUTH_SCRIPT_URL, APPLE_AUTH_URL, popupWidth, popupHeight } from './constants.mjs';
|
|
9
9
|
import { CircularProgress } from '@mui/material';
|
|
10
|
+
import { useTurnkey } from '../../hooks/use-turnkey.mjs';
|
|
10
11
|
|
|
11
12
|
function isMobileBrowser() {
|
|
12
13
|
return /Android|iPhone|iPad|iPod|Opera Mini|IEMobile|WPDesktop/i.test(navigator.userAgent);
|
|
13
14
|
}
|
|
14
15
|
var AppleAuthButton = function AppleAuthButton(_ref) {
|
|
15
|
-
var
|
|
16
|
-
clientId = _ref.clientId,
|
|
16
|
+
var clientId = _ref.clientId,
|
|
17
17
|
onSuccess = _ref.onSuccess,
|
|
18
18
|
layout = _ref.layout,
|
|
19
19
|
_ref$openInPage = _ref.openInPage,
|
|
@@ -27,6 +27,8 @@ var AppleAuthButton = function AppleAuthButton(_ref) {
|
|
|
27
27
|
appleSDKLoaded = _useState4[0],
|
|
28
28
|
setAppleSDKLoaded = _useState4[1];
|
|
29
29
|
var redirectURI = process.env.NEXT_PUBLIC_OAUTH_REDIRECT_URI;
|
|
30
|
+
var _useTurnkey = useTurnkey(),
|
|
31
|
+
indexedDbClient = _useTurnkey.indexedDbClient;
|
|
30
32
|
useEffect(function () {
|
|
31
33
|
// 1. Load Apple's JS if not already present
|
|
32
34
|
if (!window.AppleID) {
|
|
@@ -60,65 +62,96 @@ var AppleAuthButton = function AppleAuthButton(_ref) {
|
|
|
60
62
|
window.history.replaceState({}, document.title, window.location.pathname);
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
|
-
}, [onSuccess]);
|
|
64
|
-
var handleLogin = function
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
setLoading(false);
|
|
93
|
-
clearInterval(interval);
|
|
94
|
-
return;
|
|
95
|
-
}
|
|
96
|
-
var url = authWindow.location.href;
|
|
97
|
-
if (url.startsWith(window.location.origin)) {
|
|
98
|
-
var hashParams = new URLSearchParams(url.split("#")[1]);
|
|
99
|
-
var idToken = hashParams.get("id_token");
|
|
100
|
-
if (idToken) {
|
|
101
|
-
authWindow.close();
|
|
102
|
-
setLoading(false);
|
|
103
|
-
clearInterval(interval);
|
|
104
|
-
onSuccess({
|
|
105
|
-
idToken: idToken
|
|
106
|
-
});
|
|
65
|
+
}, [onSuccess, indexedDbClient]);
|
|
66
|
+
var handleLogin = /*#__PURE__*/function () {
|
|
67
|
+
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
68
|
+
var publicKey, nonce, appleAuthUrl, width, height, left, top, authWindow, interval;
|
|
69
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
70
|
+
while (1) switch (_context.prev = _context.next) {
|
|
71
|
+
case 0:
|
|
72
|
+
setLoading(true);
|
|
73
|
+
_context.next = 3;
|
|
74
|
+
return indexedDbClient === null || indexedDbClient === void 0 ? void 0 : indexedDbClient.getPublicKey();
|
|
75
|
+
case 3:
|
|
76
|
+
publicKey = _context.sent;
|
|
77
|
+
if (publicKey) {
|
|
78
|
+
_context.next = 6;
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
81
|
+
return _context.abrupt("return");
|
|
82
|
+
case 6:
|
|
83
|
+
nonce = bytesToHex(sha256(publicKey));
|
|
84
|
+
appleAuthUrl = new URL(APPLE_AUTH_URL);
|
|
85
|
+
appleAuthUrl.searchParams.set("client_id", clientId);
|
|
86
|
+
appleAuthUrl.searchParams.set("redirect_uri", redirectURI);
|
|
87
|
+
appleAuthUrl.searchParams.set("response_type", "code id_token");
|
|
88
|
+
appleAuthUrl.searchParams.set("response_mode", "fragment");
|
|
89
|
+
appleAuthUrl.searchParams.set("nonce", nonce);
|
|
90
|
+
appleAuthUrl.searchParams.set("state", "provider=apple");
|
|
91
|
+
if (!(isMobileBrowser() || openInPage)) {
|
|
92
|
+
_context.next = 18;
|
|
93
|
+
break;
|
|
107
94
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
95
|
+
// Redirect the entire window
|
|
96
|
+
window.location.href = appleAuthUrl.toString();
|
|
97
|
+
_context.next = 27;
|
|
98
|
+
break;
|
|
99
|
+
case 18:
|
|
100
|
+
// Desktop: open a popup
|
|
101
|
+
width = popupWidth;
|
|
102
|
+
height = popupHeight;
|
|
103
|
+
left = window.screenX + (window.innerWidth - width) / 2;
|
|
104
|
+
top = window.screenY + (window.innerHeight - height) / 2;
|
|
105
|
+
authWindow = window.open(appleAuthUrl.toString(), "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
|
|
106
|
+
if (authWindow) {
|
|
107
|
+
_context.next = 26;
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
console.error("Failed to open Apple login popup.");
|
|
111
|
+
return _context.abrupt("return");
|
|
112
|
+
case 26:
|
|
113
|
+
// Poll for the redirect
|
|
114
|
+
interval = setInterval(function () {
|
|
115
|
+
try {
|
|
116
|
+
if (authWindow.closed) {
|
|
117
|
+
setLoading(false);
|
|
118
|
+
clearInterval(interval);
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
var url = authWindow.location.href;
|
|
122
|
+
if (url.startsWith(window.location.origin)) {
|
|
123
|
+
var hashParams = new URLSearchParams(url.split("#")[1]);
|
|
124
|
+
var idToken = hashParams.get("id_token");
|
|
125
|
+
if (idToken) {
|
|
126
|
+
authWindow.close();
|
|
127
|
+
setLoading(false);
|
|
128
|
+
clearInterval(interval);
|
|
129
|
+
onSuccess({
|
|
130
|
+
idToken: idToken
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
} catch (error) {
|
|
135
|
+
// Ignore cross-origin errors until the popup redirects to the same origin.
|
|
136
|
+
// These errors occur because the script attempts to access the URL of the popup window while it's on a different domain.
|
|
137
|
+
// Due to browser security policies (Same-Origin Policy), accessing properties like location.href on a window that is on a different domain will throw an exception.
|
|
138
|
+
// Once the popup redirects to the same origin as the parent window, these errors will no longer occur, and the script can safely access the popup's location to extract parameters.
|
|
139
|
+
if (authWindow !== null && authWindow !== void 0 && authWindow.closed) {
|
|
140
|
+
setLoading(false);
|
|
141
|
+
clearInterval(interval);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}, 500);
|
|
145
|
+
case 27:
|
|
146
|
+
case "end":
|
|
147
|
+
return _context.stop();
|
|
118
148
|
}
|
|
119
|
-
},
|
|
120
|
-
}
|
|
121
|
-
|
|
149
|
+
}, _callee);
|
|
150
|
+
}));
|
|
151
|
+
return function handleLogin() {
|
|
152
|
+
return _ref2.apply(this, arguments);
|
|
153
|
+
};
|
|
154
|
+
}();
|
|
122
155
|
if (!appleSDKLoaded) {
|
|
123
156
|
return null;
|
|
124
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Apple.mjs","sources":["../../../src/components/auth/Apple.tsx"],"sourcesContent":[null],"names":["isMobileBrowser","test","navigator","userAgent","AppleAuthButton","_ref","
|
|
1
|
+
{"version":3,"file":"Apple.mjs","sources":["../../../src/components/auth/Apple.tsx"],"sourcesContent":[null],"names":["isMobileBrowser","test","navigator","userAgent","AppleAuthButton","_ref","clientId","onSuccess","layout","_ref$openInPage","openInPage","_useState","useState","_useState2","_slicedToArray","loading","setLoading","_useState3","_useState4","appleSDKLoaded","setAppleSDKLoaded","redirectURI","process","env","NEXT_PUBLIC_OAUTH_REDIRECT_URI","_useTurnkey","useTurnkey","indexedDbClient","useEffect","window","AppleID","script","document","createElement","src","APPLE_AUTH_SCRIPT_URL","onload","onerror","console","error","body","appendChild","location","hash","hashParams","URLSearchParams","slice","idToken","get","state","provider","split","history","replaceState","title","pathname","handleLogin","_ref2","_asyncToGenerator","_regeneratorRuntime","mark","_callee","publicKey","nonce","appleAuthUrl","width","height","left","top","authWindow","interval","wrap","_callee$","_context","prev","next","getPublicKey","sent","abrupt","bytesToHex","sha256","URL","APPLE_AUTH_URL","searchParams","set","href","toString","popupWidth","popupHeight","screenX","innerWidth","screenY","innerHeight","open","concat","setInterval","closed","clearInterval","url","startsWith","origin","close","stop","apply","arguments","_jsx","className","styles","iconButton","socialButton","onClick","undefined","children","CircularProgress","size","thickness","buttonProgress","_jsxs","_Fragment","appleIcon","iconLarge","iconSmall","alt"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/components/auth/Auth.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAcnD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI3E,oBAAY,WAAW;IACrB,SAAS,2BAA2B;IACpC,UAAU,4BAA4B;CACvC;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAoCD,UAAU,SAAS;IACjB,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,EAAE;QACV,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,eAAe,EAAE,OAAO,CAAC;QACzB,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,OAAO,CAAC;QACvB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE,eAAe,CAAC,4BAA4B,CAAC,CAAC;IACnE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/components/auth/Auth.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAcnD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI3E,oBAAY,WAAW;IACrB,SAAS,2BAA2B;IACpC,UAAU,4BAA4B;CACvC;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAoCD,UAAU,SAAS;IACjB,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,EAAE;QACV,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,eAAe,EAAE,OAAO,CAAC;QACzB,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,OAAO,CAAC;QACvB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE,eAAe,CAAC,4BAA4B,CAAC,CAAC;IACnE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAkqB7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -79,7 +79,6 @@ const Auth = ({
|
|
|
79
79
|
indexedDbClient,
|
|
80
80
|
turnkey: turnkey$1
|
|
81
81
|
} = useTurnkey.useTurnkey();
|
|
82
|
-
const [publicKey, setPublicKey] = React.useState("");
|
|
83
82
|
const [email, setEmail] = React.useState("");
|
|
84
83
|
const [phone, setPhone] = React.useState("");
|
|
85
84
|
const [otpId, setOtpId] = React.useState(null);
|
|
@@ -99,22 +98,22 @@ const Auth = ({
|
|
|
99
98
|
}
|
|
100
99
|
};
|
|
101
100
|
React.useEffect(() => {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
const manageClient = async () => {
|
|
101
|
+
const manageClient = async () => {
|
|
102
|
+
if (indexedDbClient && turnkey$1) {
|
|
105
103
|
const session = await turnkey$1.getSession();
|
|
106
|
-
if (session) {
|
|
107
|
-
const publicKey = await indexedDbClient.getPublicKey();
|
|
108
|
-
setPublicKey(publicKey);
|
|
109
|
-
} else {
|
|
104
|
+
if (!session) {
|
|
110
105
|
await indexedDbClient.resetKeyPair();
|
|
111
|
-
const publicKey = await indexedDbClient.getPublicKey();
|
|
112
|
-
setPublicKey(publicKey);
|
|
113
106
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
107
|
+
const retrievedPublicKey = await indexedDbClient.getPublicKey();
|
|
108
|
+
if (retrievedPublicKey) {
|
|
109
|
+
setComponentReady(true);
|
|
110
|
+
} else {
|
|
111
|
+
onError("Failed to retrieve public key.");
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
manageClient();
|
|
116
|
+
}, [indexedDbClient, turnkey$1]);
|
|
118
117
|
if (!componentReady) {
|
|
119
118
|
return jsxRuntime.jsx("div", {
|
|
120
119
|
className: Auth_module.default.defaultLoader,
|
|
@@ -234,6 +233,10 @@ const Auth = ({
|
|
|
234
233
|
setLoading(undefined);
|
|
235
234
|
};
|
|
236
235
|
const handleOAuthLogin = async (credential, providerName) => {
|
|
236
|
+
const pubKey = await indexedDbClient?.getPublicKey();
|
|
237
|
+
if (!pubKey) {
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
237
240
|
setOauthLoading(providerName);
|
|
238
241
|
const createSuborgData = {
|
|
239
242
|
oauthProviders: [{
|
|
@@ -258,7 +261,7 @@ const Auth = ({
|
|
|
258
261
|
const sessionResponse = await sdkServer.server.oauthLogin({
|
|
259
262
|
suborgID: suborgId,
|
|
260
263
|
oidcToken: credential,
|
|
261
|
-
publicKey:
|
|
264
|
+
publicKey: pubKey,
|
|
262
265
|
sessionLengthSeconds: authConfig.sessionLengthSeconds
|
|
263
266
|
});
|
|
264
267
|
if (sessionResponse && sessionResponse.session) {
|
|
@@ -343,18 +346,15 @@ const Auth = ({
|
|
|
343
346
|
layout: layout,
|
|
344
347
|
clientId: authConfig.googleClientId ?? process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID,
|
|
345
348
|
openInPage: authConfig.openOAuthInPage,
|
|
346
|
-
publicKey: publicKey,
|
|
347
349
|
onSuccess: response => handleOAuthLogin(response.idToken, "Google")
|
|
348
350
|
}), appleEnabled && jsxRuntime.jsx(Apple.default, {
|
|
349
351
|
layout: layout,
|
|
350
352
|
clientId: authConfig.appleClientId ?? process.env.NEXT_PUBLIC_APPLE_CLIENT_ID,
|
|
351
|
-
publicKey: publicKey,
|
|
352
353
|
openInPage: authConfig.openOAuthInPage,
|
|
353
354
|
onSuccess: response => handleOAuthLogin(response.idToken, "Apple")
|
|
354
355
|
}), facebookEnabled && jsxRuntime.jsx(Facebook.default, {
|
|
355
356
|
layout: layout,
|
|
356
357
|
clientId: authConfig.facebookClientId ?? process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID,
|
|
357
|
-
publicKey: publicKey,
|
|
358
358
|
openInPage: authConfig.openOAuthInPage,
|
|
359
359
|
onSuccess: response => handleOAuthLogin(response.id_token, "Facebook")
|
|
360
360
|
})]
|