@multiplatform.one/keycloak 0.3.5 → 0.3.7
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/dist/esm/hooks/useKeycloak/useKeycloak.mjs +3 -0
- package/dist/esm/hooks/useKeycloak/useKeycloak.mjs.map +2 -2
- package/dist/esm/provider/keycloakProvider.mjs +12 -12
- package/dist/esm/provider/keycloakProvider.mjs.map +2 -2
- package/dist/jsx/hooks/useKeycloak/useKeycloak.mjs +3 -0
- package/dist/jsx/hooks/useKeycloak/useKeycloak.mjs.map +2 -2
- package/dist/jsx/provider/keycloakProvider.mjs +26 -17
- package/dist/jsx/provider/keycloakProvider.mjs.map +2 -2
- package/dist/lib/hooks/useKeycloak/useKeycloak.d.ts +1 -1
- package/dist/lib/hooks/useKeycloak/useKeycloak.js +3 -0
- package/dist/lib/hooks/useKeycloak/useKeycloak.js.map +2 -2
- package/dist/lib/provider/keycloakProvider.js +26 -17
- package/dist/lib/provider/keycloakProvider.js.map +2 -2
- package/dist/lib/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/hooks/useKeycloak/useKeycloak.ts +4 -1
- package/src/provider/keycloakProvider.tsx +26 -18
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* File Created: 08-11-2022 06:04:59
|
|
5
5
|
* Author: Clay Risser
|
|
6
6
|
* -----
|
|
7
|
-
* Last Modified:
|
|
7
|
+
* Last Modified: 15-05-2023 16:25:48
|
|
8
8
|
* Modified By: Clay Risser
|
|
9
9
|
* -----
|
|
10
10
|
* Risser Labs LLC (c) Copyright 2021 - 2022
|
|
@@ -31,6 +31,7 @@ import { useKeycloak as useSsrKeycloak } from '@bitspur/react-keycloak-ssr';
|
|
|
31
31
|
export function useKeycloak() {
|
|
32
32
|
const authConfig = useAuthConfig();
|
|
33
33
|
if (MultiPlatform.isStorybook) return { authenticated: true } as IKeycloak;
|
|
34
|
+
console.log('SSR', authConfig.ssr);
|
|
34
35
|
if (MultiPlatform.isNext && authConfig.ssr) {
|
|
35
36
|
const { keycloak, initialized } = useSsrKeycloak();
|
|
36
37
|
return {
|
|
@@ -39,6 +40,8 @@ export function useKeycloak() {
|
|
|
39
40
|
} as IKeycloak;
|
|
40
41
|
}
|
|
41
42
|
const { keycloak, initialized } = useReactKeycloak();
|
|
43
|
+
console.log('a1', keycloak.authenticated);
|
|
44
|
+
console.log('a2', initialized ? keycloak.authenticated : undefined);
|
|
42
45
|
return {
|
|
43
46
|
...keycloak,
|
|
44
47
|
authenticated: initialized ? keycloak.authenticated : undefined,
|
|
@@ -85,7 +85,7 @@ export function KeycloakProvider({
|
|
|
85
85
|
|
|
86
86
|
useEffect(() => {
|
|
87
87
|
if (token !== true && refreshToken !== true && idToken !== true) return;
|
|
88
|
-
if (debug) logger.debug('post message', { type: 'LOADED' });
|
|
88
|
+
if (debug) logger.debug('post message', JSON.stringify({ type: 'LOADED' }));
|
|
89
89
|
(messageHandlerKeys || []).forEach((key: string) => {
|
|
90
90
|
window?.webkit?.messageHandlers?.[key]?.postMessage(JSON.stringify({ type: 'LOADED' }));
|
|
91
91
|
});
|
|
@@ -109,12 +109,16 @@ export function KeycloakProvider({
|
|
|
109
109
|
if (debug) logger.debug('setting refresh token', message.payload);
|
|
110
110
|
setRefreshToken(validToken(message.payload));
|
|
111
111
|
}
|
|
112
|
+
window.removeEventListener('message', messageCallback);
|
|
112
113
|
};
|
|
113
114
|
if (debug) {
|
|
114
|
-
logger.debug(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
115
|
+
logger.debug(
|
|
116
|
+
'listening for message',
|
|
117
|
+
JSON.stringify({
|
|
118
|
+
type: 'REFRESH_TOKEN',
|
|
119
|
+
payload: '<some_refresh_token>',
|
|
120
|
+
}),
|
|
121
|
+
);
|
|
118
122
|
}
|
|
119
123
|
window.addEventListener('message', messageCallback);
|
|
120
124
|
return () => {
|
|
@@ -138,12 +142,16 @@ export function KeycloakProvider({
|
|
|
138
142
|
if (debug) logger.debug('setting token', message.payload);
|
|
139
143
|
setToken(validToken(message.payload, refreshToken));
|
|
140
144
|
}
|
|
145
|
+
window.removeEventListener('message', messageCallback);
|
|
141
146
|
};
|
|
142
147
|
if (debug) {
|
|
143
|
-
logger.debug(
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
148
|
+
logger.debug(
|
|
149
|
+
'listening for message',
|
|
150
|
+
JSON.stringify({
|
|
151
|
+
type: 'TOKEN',
|
|
152
|
+
payload: '<some_token>',
|
|
153
|
+
}),
|
|
154
|
+
);
|
|
147
155
|
}
|
|
148
156
|
window.addEventListener('message', messageCallback);
|
|
149
157
|
return () => {
|
|
@@ -167,12 +175,16 @@ export function KeycloakProvider({
|
|
|
167
175
|
if (debug) logger.debug('setting id token', message.payload);
|
|
168
176
|
setIdToken(validToken(message.payload, refreshToken));
|
|
169
177
|
}
|
|
178
|
+
window.removeEventListener('message', messageCallback);
|
|
170
179
|
};
|
|
171
180
|
if (debug) {
|
|
172
|
-
logger.debug(
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
181
|
+
logger.debug(
|
|
182
|
+
'listening for message',
|
|
183
|
+
JSON.stringify({
|
|
184
|
+
type: 'ID_TOKEN',
|
|
185
|
+
payload: '<some_id_token>',
|
|
186
|
+
}),
|
|
187
|
+
);
|
|
176
188
|
}
|
|
177
189
|
window.addEventListener('message', messageCallback);
|
|
178
190
|
return () => {
|
|
@@ -213,16 +225,13 @@ export function KeycloakProvider({
|
|
|
213
225
|
if (refreshToken && typeof refreshToken === 'string') initOptions.refreshToken = refreshToken;
|
|
214
226
|
if (isPassedInToken) {
|
|
215
227
|
initOptions.checkLoginIframe = false;
|
|
228
|
+
initOptions.flow = 'implicit';
|
|
216
229
|
initOptions.onLoad = undefined;
|
|
217
230
|
}
|
|
218
231
|
}
|
|
219
232
|
return initOptions;
|
|
220
233
|
}, [keycloakInitOptions, token, refreshToken, idToken]);
|
|
221
234
|
|
|
222
|
-
console.log('token', token);
|
|
223
|
-
console.log('idToken', idToken);
|
|
224
|
-
console.log('refreshToken', refreshToken);
|
|
225
|
-
|
|
226
235
|
if (token === true || idToken === true || refreshToken === true) return <LoadingComponent />;
|
|
227
236
|
if (!isPassedInToken && cookies && ssr) {
|
|
228
237
|
return (
|
|
@@ -245,7 +254,6 @@ export function KeycloakProvider({
|
|
|
245
254
|
</SSRKeycloakProvider>
|
|
246
255
|
);
|
|
247
256
|
}
|
|
248
|
-
console.log('keycloak', keycloak);
|
|
249
257
|
if (!keycloak) return <>{children}</>;
|
|
250
258
|
return (
|
|
251
259
|
<ReactKeycloakProvider
|