@multiplatform.one/keycloak 1.0.34 → 2.0.0
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/cjs/Authenticated.js +1 -1
- package/dist/cjs/Authenticated.js.map +1 -1
- package/dist/cjs/Authenticated.native.js +1 -1
- package/dist/cjs/Authenticated.native.js.map +1 -1
- package/dist/cjs/provider/AuthProvider/AuthProvider.js +8 -8
- package/dist/cjs/provider/AuthProvider/AuthProvider.js.map +1 -1
- package/dist/cjs/provider/KeycloakProvider.js +2 -1
- package/dist/cjs/provider/KeycloakProvider.js.map +1 -1
- package/dist/cjs/provider/KeycloakProvider.native.js +5 -3
- package/dist/cjs/provider/KeycloakProvider.native.js.map +2 -2
- package/dist/esm/Authenticated.js +1 -1
- package/dist/esm/Authenticated.js.map +1 -1
- package/dist/esm/Authenticated.mjs +1 -1
- package/dist/esm/Authenticated.native.js +1 -1
- package/dist/esm/Authenticated.native.js.map +1 -1
- package/dist/esm/provider/AuthProvider/AuthProvider.js +8 -8
- package/dist/esm/provider/AuthProvider/AuthProvider.js.map +1 -1
- package/dist/esm/provider/AuthProvider/AuthProvider.mjs +9 -9
- package/dist/esm/provider/KeycloakProvider.js +2 -1
- package/dist/esm/provider/KeycloakProvider.js.map +1 -1
- package/dist/esm/provider/KeycloakProvider.mjs +4 -2
- package/dist/esm/provider/KeycloakProvider.native.js +5 -3
- package/dist/esm/provider/KeycloakProvider.native.js.map +2 -2
- package/dist/jsx/Authenticated.js +1 -1
- package/dist/jsx/Authenticated.js.map +1 -1
- package/dist/jsx/Authenticated.mjs +1 -1
- package/dist/jsx/Authenticated.native.js +1 -1
- package/dist/jsx/Authenticated.native.js.map +1 -1
- package/dist/jsx/provider/AuthProvider/AuthProvider.js +8 -8
- package/dist/jsx/provider/AuthProvider/AuthProvider.js.map +1 -1
- package/dist/jsx/provider/AuthProvider/AuthProvider.mjs +9 -9
- package/dist/jsx/provider/KeycloakProvider.js +2 -1
- package/dist/jsx/provider/KeycloakProvider.js.map +1 -1
- package/dist/jsx/provider/KeycloakProvider.mjs +4 -2
- package/dist/jsx/provider/KeycloakProvider.native.js +5 -3
- package/dist/jsx/provider/KeycloakProvider.native.js.map +2 -2
- package/package.json +4 -4
- package/src/Authenticated.tsx +1 -1
- package/src/provider/AuthProvider/AuthProvider.tsx +11 -9
- package/src/provider/KeycloakProvider.tsx +2 -1
- package/types/provider/AuthProvider/AuthProvider.d.ts.map +1 -1
- package/types/provider/KeycloakProvider.d.ts +1 -1
- package/types/provider/KeycloakProvider.d.ts.map +1 -1
|
@@ -32,7 +32,7 @@ global.AsyncStorage = import_async_storage.default;
|
|
|
32
32
|
function Authenticated({ children, disabled, loggedOutComponent, loadingComponent }) {
|
|
33
33
|
const authConfig = (0, import_hooks.useAuthConfig)(), keycloak = (0, import_keycloak.useKeycloak)(), tokensFromQuery = (0, import_hooks.useTokensFromQuery)();
|
|
34
34
|
if ((0, import_react.useEffect)(() => {
|
|
35
|
-
!keycloak || import_multiplatform.MultiPlatform.isIframe || import_multiplatform.MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak
|
|
35
|
+
!keycloak || import_multiplatform.MultiPlatform.isIframe || import_multiplatform.MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak?.login({
|
|
36
36
|
redirectUri: authConfig.loginRedirectUri
|
|
37
37
|
});
|
|
38
38
|
}, [keycloak?.authenticated]), typeof disabled > "u" && (disabled = authConfig.disabled), disabled) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBA,2BAAyB,+DACzB,eAAmE,kBACnE,uBAA8B,8BAC9B,iBAAqB,oBACrB,eAAkD,oBAClD,kBAA4B,uBAyBL;AAvBvB,OAAO,eAAe,qBAAAA;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,iBAAa,4BAAc,GAC3B,eAAW,6BAAY,GACvB,sBAAkB,iCAAmB;AAY3C,UAVA,wBAAU,MAAM;AACd,IAAI,CAAC,YAAY,mCAAc,YAAY,mCAAc,YAAY,SAAS,iBAAiB,mBAG/F,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBA,2BAAyB,+DACzB,eAAmE,kBACnE,uBAA8B,8BAC9B,iBAAqB,oBACrB,eAAkD,oBAClD,kBAA4B,uBAyBL;AAvBvB,OAAO,eAAe,qBAAAA;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,iBAAa,4BAAc,GAC3B,eAAW,6BAAY,GACvB,sBAAkB,iCAAmB;AAY3C,UAVA,wBAAU,MAAM;AACd,IAAI,CAAC,YAAY,mCAAc,YAAY,mCAAc,YAAY,SAAS,iBAAiB,mBAG/F,UAAU,MAAM;AAAA,MACd,aAAa,WAAW;AAAA,IAC1B,CAAC;AAAA,EACH,GAAG,CAAC,UAAU,aAAa,CAAC,GAExB,OAAO,WAAa,QAAa,WAAW,WAAW,WACvD,SAAU,QAAO,2EAAG,UAAS;AACjC,MAAI,OAAO,WAAa,KAAa;AACnC,UAAM,mBAAmB;AACzB,WAAO,mBAAmB,4CAAC,oBAAiB,IAAK,4CAAC,uBAAM,qBAAW,QAAQ,YAAY,MAAK;AAAA,EAC9F;AACA,MAAI,aAAa,QAAQ,SAAS,cAAe,QAAO,2EAAG,UAAS;AACpE,QAAM,qBAAqB;AAC3B,SAAO,qBAAqB,4CAAC,sBAAmB,IAAK,4CAAC,uBAAM,qBAAW,QAAQ,sBAAsB,MAAK;AAC5G;AAEO,SAAS,kBAAoC,WAA6B;AAC/E,SAAO,CAAC,UACN,4CAAC,iBACC,sDAAC,aAAW,GAAG,OAAO,GACxB;AAEJ;",
|
|
5
5
|
"names": ["AsyncStorage"]
|
|
6
6
|
}
|
|
@@ -51,7 +51,7 @@ global.AsyncStorage = import_async_storage.default;
|
|
|
51
51
|
function Authenticated(param) {
|
|
52
52
|
var children = param.children, disabled = param.disabled, loggedOutComponent = param.loggedOutComponent, loadingComponent = param.loadingComponent, authConfig = (0, import_hooks.useAuthConfig)(), keycloak = (0, import_keycloak.useKeycloak)(), tokensFromQuery = (0, import_hooks.useTokensFromQuery)();
|
|
53
53
|
if ((0, import_react.useEffect)(function() {
|
|
54
|
-
!keycloak || import_multiplatform.MultiPlatform.isIframe || import_multiplatform.MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak.login({
|
|
54
|
+
!keycloak || import_multiplatform.MultiPlatform.isIframe || import_multiplatform.MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak == null || keycloak.login({
|
|
55
55
|
redirectUri: authConfig.loginRedirectUri
|
|
56
56
|
});
|
|
57
57
|
}, [
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;uDAuBA,uBAAyB,+DACzB,eAAmE,kBACnE,uBAA8B,8BAC9B,iBAAqB,oBACrB,eAAkD,oBAClD,kBAA4B;;;;;;;;;;;;;;;;;;;;AAE5BA,OAAOC,eAAeA,qBAAAA;AAQf,SAASC,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,iBAAaC,4BAAAA,GACbC,eAAWC,6BAAAA,GACXC,sBAAkBC,iCAAAA;AAYxB,UAVAC,wBAAU,WAAA;AACR,IAAI,CAACJ,YAAYK,mCAAcC,YAAYD,mCAAcE,YAAYP,SAASQ,iBAAiBN,mBAG/FF,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;uDAuBA,uBAAyB,+DACzB,eAAmE,kBACnE,uBAA8B,8BAC9B,iBAAqB,oBACrB,eAAkD,oBAClD,kBAA4B;;;;;;;;;;;;;;;;;;;;AAE5BA,OAAOC,eAAeA,qBAAAA;AAQf,SAASC,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,iBAAaC,4BAAAA,GACbC,eAAWC,6BAAAA,GACXC,sBAAkBC,iCAAAA;AAYxB,UAVAC,wBAAU,WAAA;AACR,IAAI,CAACJ,YAAYK,mCAAcC,YAAYD,mCAAcE,YAAYP,SAASQ,iBAAiBN,mBAG/FF,YAAAA,QAAAA,SAAUS,MAAM;MACdC,aAAaZ,WAAWa;IAC1B,CAAA;EACF,GAAG;IAACX,YAAAA,OAAAA,SAAAA,SAAUQ;GAAc,GAExB,OAAOb,WAAa,QAAaA,WAAWG,WAAWH,WACvDA,SAAU,QAAO,uCAAAiB,KAAA,mBAAAC,UAAA;;;AACrB,MAAI,OAAOb,WAAa,KAAa;AACnC,QAAMc,mBAAmBjB;AACzB,WAAOiB,mBAAmB,uCAAAF,KAACE,kBAAAA,CAAAA,CAAAA,IAAsB,uCAAAF,KAACG,qBAAAA;gBAAMjB,WAAWkB,QAAQ,YAAY;;EACzF;AACA,MAAIhB,aAAa,QAAQA,SAASQ,cAAe,QAAO,uCAAAI,KAAA,mBAAAC,UAAA;;;AACxD,MAAMI,qBAAqBrB;AAC3B,SAAOqB,qBAAqB,uCAAAL,KAACK,oBAAAA,CAAAA,CAAAA,IAAwB,uCAAAL,KAACG,qBAAAA;cAAMjB,WAAWkB,QAAQ,sBAAsB;;AACvG;AAEO,SAASE,kBAAoCC,WAA2B;AAC7E,SAAO,SAACC,OAAAA;WACN,uCAAAR,KAACnB,eAAAA;gBACC,uCAAAmB,KAACO,WAAAA,eAAAA,CAAAA,GAAcC,KAAAA,CAAAA;;;AAGrB;",
|
|
5
5
|
"names": ["global", "AsyncStorage", "Authenticated", "children", "disabled", "loggedOutComponent", "loadingComponent", "authConfig", "useAuthConfig", "keycloak", "useKeycloak", "tokensFromQuery", "useTokensFromQuery", "useEffect", "MultiPlatform", "isIframe", "isServer", "authenticated", "login", "redirectUri", "loginRedirectUri", "_jsx", "_Fragment", "LoadingComponent", "Text", "debug", "LoggedOutComponent", "withAuthenticated", "Component", "props"]
|
|
6
6
|
}
|
|
@@ -31,17 +31,17 @@ const logger = console;
|
|
|
31
31
|
function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloakConfig }) {
|
|
32
32
|
const { debug, messageHandlerKeys } = (0, import_hooks.useAuthConfig)(), { query } = import_multiplatform.MultiPlatform.isNext ? (0, import_router.useRouter)() : { query: {} }, authState = (0, import_state.useAuthState)(), [keycloak, setKeycloak] = (0, import_react.useState)(), initialRefreshToken = (0, import_react.useMemo)(
|
|
33
33
|
() => (0, import_token.validOrRefreshableToken)(
|
|
34
|
-
import_multiplatform.MultiPlatform.isIframe
|
|
34
|
+
import_multiplatform.MultiPlatform.isIframe && ("refreshToken" in query && (query.refreshToken?.toString() || !0) || import_state.persist && authState.refreshToken) || void 0
|
|
35
35
|
),
|
|
36
36
|
[]
|
|
37
37
|
), [tokens, setTokens] = (0, import_react.useState)({
|
|
38
38
|
refreshToken: initialRefreshToken,
|
|
39
39
|
token: (0, import_token.validOrRefreshableToken)(
|
|
40
|
-
import_multiplatform.MultiPlatform.isIframe
|
|
40
|
+
import_multiplatform.MultiPlatform.isIframe && ("token" in query && (query.token?.toString() || !0) || import_state.persist && authState.token) || void 0,
|
|
41
41
|
initialRefreshToken
|
|
42
42
|
),
|
|
43
43
|
idToken: (0, import_token.validOrRefreshableToken)(
|
|
44
|
-
import_multiplatform.MultiPlatform.isIframe
|
|
44
|
+
import_multiplatform.MultiPlatform.isIframe && ("idToken" in query && (query.idToken?.toString() || !0) || import_state.persist && authState.idToken) || void 0,
|
|
45
45
|
initialRefreshToken
|
|
46
46
|
)
|
|
47
47
|
});
|
|
@@ -117,14 +117,14 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
117
117
|
};
|
|
118
118
|
}, []);
|
|
119
119
|
const keycloakClient = (0, import_react.useMemo)(
|
|
120
|
-
() => import_multiplatform.MultiPlatform.isIframe && keycloakConfig ? new import_keycloak_js.default({
|
|
120
|
+
() => (!import_multiplatform.MultiPlatform.isNext || import_multiplatform.MultiPlatform.isElectron || import_multiplatform.MultiPlatform.isIframe) && keycloakConfig ? new import_keycloak_js.default({
|
|
121
121
|
url: keycloakConfig.url,
|
|
122
122
|
realm: keycloakConfig.realm,
|
|
123
123
|
clientId: keycloakConfig.publicClientId || keycloakConfig.clientId
|
|
124
124
|
}) : void 0,
|
|
125
125
|
[keycloakInitOptions, keycloakConfig, tokens.token, tokens.refreshToken, tokens.idToken]
|
|
126
126
|
), initOptions = (0, import_react.useMemo)(() => {
|
|
127
|
-
if (!import_multiplatform.MultiPlatform.isIframe) return;
|
|
127
|
+
if (import_multiplatform.MultiPlatform.isNext && !import_multiplatform.MultiPlatform.isElectron && !import_multiplatform.MultiPlatform.isIframe) return;
|
|
128
128
|
const initOptions2 = {
|
|
129
129
|
...defaultKeycloakInitOptions,
|
|
130
130
|
...keycloakInitOptions,
|
|
@@ -153,17 +153,17 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
153
153
|
try {
|
|
154
154
|
await keycloakClient.updateToken(5);
|
|
155
155
|
} catch {
|
|
156
|
-
setKeycloak(new import_keycloak.Keycloak(keycloakConfig));
|
|
156
|
+
setKeycloak(new import_keycloak.Keycloak(keycloakConfig, keycloakClient));
|
|
157
157
|
}
|
|
158
158
|
};
|
|
159
159
|
const authenticated = await keycloakClient.init(initOptions);
|
|
160
|
-
setKeycloak(new import_keycloak.Keycloak(keycloakConfig,
|
|
160
|
+
setKeycloak(new import_keycloak.Keycloak(keycloakConfig, keycloakClient));
|
|
161
161
|
})();
|
|
162
162
|
}, []);
|
|
163
163
|
function render() {
|
|
164
164
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_keycloak.KeycloakConfigContext.Provider, { value: keycloakConfig, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_context.KeycloakContext.Provider, { value: keycloak, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_AfterAuth.AfterAuth, { children }) }) });
|
|
165
165
|
}
|
|
166
|
-
return import_multiplatform.MultiPlatform.isElectron ?
|
|
166
|
+
return import_multiplatform.MultiPlatform.isNext && !import_multiplatform.MultiPlatform.isElectron ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.SessionProvider, { ...sessionProvider, children: render() }) : render();
|
|
167
167
|
}
|
|
168
168
|
const defaultKeycloakInitOptions = {
|
|
169
169
|
checkLoginIframe: !0,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/provider/AuthProvider/AuthProvider.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBA,yBAA2B,iCAC3B,eAAoD,kBAKpD,mBAA0B,yBAC1B,kBAAgD,2BAChD,iBAAgC,mCAChC,uBAA8B,8BAC9BA,gBAAgC,4BAChC,eAAsC,wBACtC,eAA8B,wBAC9B,gBAA0B,wBAC1B,eAAwC,wBAyO9B;AAjOV,MAAM,SAAS;AAQR,SAAS,aAAa,EAAE,UAAU,iBAAiB,qBAAqB,eAAe,GAAsB;AAClH,QAAM,EAAE,OAAO,mBAAmB,QAAI,4BAAc,GAC9C,EAAE,MAAM,IAAI,mCAAc,aAAS,yBAAU,IAAI,EAAE,OAAO,CAAC,EAAE,GAC7D,gBAAY,2BAAa,GACzB,CAAC,UAAU,WAAW,QAAI,uBAAmB,GAC7C,0BAAsB;AAAA,IAC1B,UACE;AAAA,MACE,mCAAc,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["import_react", "tokens", "KeycloakClient", "initOptions"]
|
|
6
6
|
}
|
|
@@ -22,13 +22,14 @@ function KeycloakProvider({
|
|
|
22
22
|
baseUrl,
|
|
23
23
|
children,
|
|
24
24
|
clientId,
|
|
25
|
+
loginRedirectUri,
|
|
25
26
|
debug,
|
|
26
27
|
disabled,
|
|
27
28
|
publicClientId,
|
|
28
29
|
realm,
|
|
29
30
|
session
|
|
30
31
|
}) {
|
|
31
|
-
const authConfig = (0, import_react.useMemo)(() => ({ debug, disabled }), [debug, disabled]);
|
|
32
|
+
const authConfig = (0, import_react.useMemo)(() => ({ debug, disabled, loginRedirectUri }), [debug, disabled, loginRedirectUri]);
|
|
32
33
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_authConfig.AuthConfigContext.Provider, { value: authConfig, children: disabled ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
33
34
|
import_AuthProvider.AuthProvider,
|
|
34
35
|
{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAqBA,mBAA+B,kBAI/B,oBAAkC,0BAClC,sBAA6B,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAqBA,mBAA+B,kBAI/B,oBAAkC,0BAClC,sBAA6B,2BAyBrB;AAfD,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA0B;AACxB,QAAM,iBAAa,sBAAQ,OAAO,EAAE,OAAO,UAAU,iBAAiB,IAAI,CAAC,OAAO,UAAU,gBAAgB,CAAC;AAC7G,SACE,4CAAC,oCAAkB,UAAlB,EAA2B,OAAO,YAChC,qBACC,2EAAG,UAAS,IAEZ;AAAA,IAAC;AAAA;AAAA,MACC,iBAAiB,EAAE,QAAQ;AAAA,MAC3B,gBAAgB;AAAA,QACd,UAAU,YAAY;AAAA,QACtB;AAAA,QACA,OAAO,SAAS;AAAA,QAChB,KAAK;AAAA,MACP;AAAA,MAEC;AAAA;AAAA,EACH,GAEJ;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -19,14 +19,16 @@ __export(KeycloakProvider_exports, {
|
|
|
19
19
|
module.exports = __toCommonJS(KeycloakProvider_exports);
|
|
20
20
|
var import_jsx_runtime = require("react/jsx-runtime"), import_react = require("react"), import_authConfig = require("../authConfig"), import_AuthProvider = require("./AuthProvider");
|
|
21
21
|
function KeycloakProvider(param) {
|
|
22
|
-
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = (0, import_react.useMemo)(function() {
|
|
22
|
+
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, loginRedirectUri = param.loginRedirectUri, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = (0, import_react.useMemo)(function() {
|
|
23
23
|
return {
|
|
24
24
|
debug,
|
|
25
|
-
disabled
|
|
25
|
+
disabled,
|
|
26
|
+
loginRedirectUri
|
|
26
27
|
};
|
|
27
28
|
}, [
|
|
28
29
|
debug,
|
|
29
|
-
disabled
|
|
30
|
+
disabled,
|
|
31
|
+
loginRedirectUri
|
|
30
32
|
]);
|
|
31
33
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_authConfig.AuthConfigContext.Provider, {
|
|
32
34
|
value: authConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;;;;;AAmBC,yBAAA,8BAED,eAA+B,kBAI/B,oBAAkC,0BAClC,sBAA6B;AAUtB,SAASA,iBAAiB,
|
|
5
|
-
"names": ["KeycloakProvider", "baseUrl", "children", "clientId", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "useMemo", "_jsx", "AuthConfigContext", "Provider", "value", "_Fragment", "AuthProvider", "sessionProvider", "keycloakConfig", "url"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;;;;;AAmBC,yBAAA,8BAED,eAA+B,kBAI/B,oBAAkC,0BAClC,sBAA6B;AAUtB,SAASA,iBAAiB,OAUT;MATtBC,UAD+B,MAC/BA,SACAC,WAF+B,MAE/BA,UACAC,WAH+B,MAG/BA,UACAC,mBAJ+B,MAI/BA,kBACAC,QAL+B,MAK/BA,OACAC,WAN+B,MAM/BA,UACAC,iBAP+B,MAO/BA,gBACAC,QAR+B,MAQ/BA,OACAC,UAT+B,MAS/BA,SAEMC,iBAAaC,sBAAQ,WAAA;WAAO;MAAEN;MAAOC;MAAUF;IAAiB;KAAI;IAACC;IAAOC;IAAUF;GAAiB;AAC7G,SACE,uCAAAQ,KAACC,oCAAkBC,UAAQ;IAACC,OAAOL;cAChCJ,WACC,uCAAAM,KAAA,mBAAAI,UAAA;;SAEA,uCAAAJ,KAACK,kCAAAA;MACCC,iBAAiB;QAAET;MAAQ;MAC3BU,gBAAgB;QACdhB,UAAUA,YAAY;QACtBI;QACAC,OAAOA,SAAS;QAChBY,KAAKnB;MACP;;;;AAOV;",
|
|
5
|
+
"names": ["KeycloakProvider", "baseUrl", "children", "clientId", "loginRedirectUri", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "useMemo", "_jsx", "AuthConfigContext", "Provider", "value", "_Fragment", "AuthProvider", "sessionProvider", "keycloakConfig", "url"]
|
|
6
6
|
}
|
|
@@ -10,7 +10,7 @@ global.AsyncStorage = AsyncStorage;
|
|
|
10
10
|
function Authenticated({ children, disabled, loggedOutComponent, loadingComponent }) {
|
|
11
11
|
const authConfig = useAuthConfig(), keycloak = useKeycloak(), tokensFromQuery = useTokensFromQuery();
|
|
12
12
|
if (useEffect(() => {
|
|
13
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak
|
|
13
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak?.login({
|
|
14
14
|
redirectUri: authConfig.loginRedirectUri
|
|
15
15
|
});
|
|
16
16
|
}, [keycloak?.authenticated]), typeof disabled > "u" && (disabled = authConfig.disabled), disabled) return /* @__PURE__ */ jsx(Fragment, { children });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";AAuBA,OAAO,kBAAkB;AACzB,SAAkD,iBAAiB;AACnE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AACrB,SAAS,eAAe,0BAA0B;AAClD,SAAS,mBAAmB;AAyBL;AAvBvB,OAAO,eAAe;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,aAAa,cAAc,GAC3B,WAAW,YAAY,GACvB,kBAAkB,mBAAmB;AAY3C,MAVA,UAAU,MAAM;AACd,IAAI,CAAC,YAAY,cAAc,YAAY,cAAc,YAAY,SAAS,iBAAiB,mBAG/F,
|
|
4
|
+
"mappings": ";AAuBA,OAAO,kBAAkB;AACzB,SAAkD,iBAAiB;AACnE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AACrB,SAAS,eAAe,0BAA0B;AAClD,SAAS,mBAAmB;AAyBL;AAvBvB,OAAO,eAAe;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,aAAa,cAAc,GAC3B,WAAW,YAAY,GACvB,kBAAkB,mBAAmB;AAY3C,MAVA,UAAU,MAAM;AACd,IAAI,CAAC,YAAY,cAAc,YAAY,cAAc,YAAY,SAAS,iBAAiB,mBAG/F,UAAU,MAAM;AAAA,MACd,aAAa,WAAW;AAAA,IAC1B,CAAC;AAAA,EACH,GAAG,CAAC,UAAU,aAAa,CAAC,GAExB,OAAO,WAAa,QAAa,WAAW,WAAW,WACvD,SAAU,QAAO,gCAAG,UAAS;AACjC,MAAI,OAAO,WAAa,KAAa;AACnC,UAAM,mBAAmB;AACzB,WAAO,mBAAmB,oBAAC,oBAAiB,IAAK,oBAAC,QAAM,qBAAW,QAAQ,YAAY,MAAK;AAAA,EAC9F;AACA,MAAI,aAAa,QAAQ,SAAS,cAAe,QAAO,gCAAG,UAAS;AACpE,QAAM,qBAAqB;AAC3B,SAAO,qBAAqB,oBAAC,sBAAmB,IAAK,oBAAC,QAAM,qBAAW,QAAQ,sBAAsB,MAAK;AAC5G;AAEO,SAAS,kBAAoC,WAA6B;AAC/E,SAAO,CAAC,UACN,oBAAC,iBACC,8BAAC,aAAW,GAAG,OAAO,GACxB;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,7 +18,7 @@ function Authenticated({
|
|
|
18
18
|
keycloak = useKeycloak(),
|
|
19
19
|
tokensFromQuery = useTokensFromQuery();
|
|
20
20
|
if (useEffect(() => {
|
|
21
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak
|
|
21
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak?.login({
|
|
22
22
|
redirectUri: authConfig.loginRedirectUri
|
|
23
23
|
});
|
|
24
24
|
}, [keycloak?.authenticated]), typeof disabled > "u" && (disabled = authConfig.disabled), disabled) return /* @__PURE__ */jsx(Fragment, {
|
|
@@ -29,7 +29,7 @@ global.AsyncStorage = AsyncStorage;
|
|
|
29
29
|
function Authenticated(param) {
|
|
30
30
|
var children = param.children, disabled = param.disabled, loggedOutComponent = param.loggedOutComponent, loadingComponent = param.loadingComponent, authConfig = useAuthConfig(), keycloak = useKeycloak(), tokensFromQuery = useTokensFromQuery();
|
|
31
31
|
if (useEffect(function() {
|
|
32
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak.login({
|
|
32
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak == null || keycloak.login({
|
|
33
33
|
redirectUri: authConfig.loginRedirectUri
|
|
34
34
|
});
|
|
35
35
|
}, [
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";;AAuBA,OAAOA,kBAAkB;AACzB,SAAkDC,iBAAiB;AACnE,SAASC,qBAAqB;AAC9B,SAASC,YAAY;AACrB,SAASC,eAAeC,0BAA0B;AAClD,SAASC,mBAAmB;;;;;;;;;;;;;;;;;;;;AAE5BC,OAAOP,eAAeA;AAQf,SAASQ,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,aAAaT,cAAAA,GACbU,WAAWR,YAAAA,GACXS,kBAAkBV,mBAAAA;AAYxB,MAVAJ,UAAU,WAAA;AACR,IAAI,CAACa,YAAYZ,cAAcc,YAAYd,cAAce,YAAYH,SAASI,iBAAiBH,mBAG/FD,
|
|
4
|
+
"mappings": ";;AAuBA,OAAOA,kBAAkB;AACzB,SAAkDC,iBAAiB;AACnE,SAASC,qBAAqB;AAC9B,SAASC,YAAY;AACrB,SAASC,eAAeC,0BAA0B;AAClD,SAASC,mBAAmB;;;;;;;;;;;;;;;;;;;;AAE5BC,OAAOP,eAAeA;AAQf,SAASQ,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,aAAaT,cAAAA,GACbU,WAAWR,YAAAA,GACXS,kBAAkBV,mBAAAA;AAYxB,MAVAJ,UAAU,WAAA;AACR,IAAI,CAACa,YAAYZ,cAAcc,YAAYd,cAAce,YAAYH,SAASI,iBAAiBH,mBAG/FD,YAAAA,QAAAA,SAAUK,MAAM;MACdC,aAAaP,WAAWQ;IAC1B,CAAA;EACF,GAAG;IAACP,YAAAA,OAAAA,SAAAA,SAAUI;GAAc,GAExB,OAAOR,WAAa,QAAaA,WAAWG,WAAWH,WACvDA,SAAU,QAAO,qBAAA,WAAA;;;AACrB,MAAI,OAAOI,WAAa,KAAa;AACnC,QAAMQ,mBAAmBV;AACzB,WAAOU,mBAAmB,qBAACA,kBAAAA,CAAAA,CAAAA,IAAsB,qBAACnB,MAAAA;gBAAMU,WAAWU,QAAQ,YAAY;;EACzF;AACA,MAAIT,aAAa,QAAQA,SAASI,cAAe,QAAO,qBAAA,WAAA;;;AACxD,MAAMM,qBAAqBb;AAC3B,SAAOa,qBAAqB,qBAACA,oBAAAA,CAAAA,CAAAA,IAAwB,qBAACrB,MAAAA;cAAMU,WAAWU,QAAQ,sBAAsB;;AACvG;AAEO,SAASE,kBAAoCC,WAA2B;AAC7E,SAAO,SAACC,OAAAA;WACN,qBAACnB,eAAAA;gBACC,qBAACkB,WAAAA,eAAAA,CAAAA,GAAcC,KAAAA,CAAAA;;;AAGrB;",
|
|
5
5
|
"names": ["AsyncStorage", "useEffect", "MultiPlatform", "Text", "useAuthConfig", "useTokensFromQuery", "useKeycloak", "global", "Authenticated", "children", "disabled", "loggedOutComponent", "loadingComponent", "authConfig", "keycloak", "tokensFromQuery", "isIframe", "isServer", "authenticated", "login", "redirectUri", "loginRedirectUri", "LoadingComponent", "debug", "LoggedOutComponent", "withAuthenticated", "Component", "props"]
|
|
6
6
|
}
|
|
@@ -15,17 +15,17 @@ const logger = console;
|
|
|
15
15
|
function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloakConfig }) {
|
|
16
16
|
const { debug, messageHandlerKeys } = useAuthConfig(), { query } = MultiPlatform.isNext ? useRouter() : { query: {} }, authState = useAuthState(), [keycloak, setKeycloak] = useState(), initialRefreshToken = useMemo(
|
|
17
17
|
() => validOrRefreshableToken(
|
|
18
|
-
MultiPlatform.isIframe
|
|
18
|
+
MultiPlatform.isIframe && ("refreshToken" in query && (query.refreshToken?.toString() || !0) || persist && authState.refreshToken) || void 0
|
|
19
19
|
),
|
|
20
20
|
[]
|
|
21
21
|
), [tokens, setTokens] = useState({
|
|
22
22
|
refreshToken: initialRefreshToken,
|
|
23
23
|
token: validOrRefreshableToken(
|
|
24
|
-
MultiPlatform.isIframe
|
|
24
|
+
MultiPlatform.isIframe && ("token" in query && (query.token?.toString() || !0) || persist && authState.token) || void 0,
|
|
25
25
|
initialRefreshToken
|
|
26
26
|
),
|
|
27
27
|
idToken: validOrRefreshableToken(
|
|
28
|
-
MultiPlatform.isIframe
|
|
28
|
+
MultiPlatform.isIframe && ("idToken" in query && (query.idToken?.toString() || !0) || persist && authState.idToken) || void 0,
|
|
29
29
|
initialRefreshToken
|
|
30
30
|
)
|
|
31
31
|
});
|
|
@@ -101,14 +101,14 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
101
101
|
};
|
|
102
102
|
}, []);
|
|
103
103
|
const keycloakClient = useMemo(
|
|
104
|
-
() => MultiPlatform.isIframe && keycloakConfig ? new KeycloakClient({
|
|
104
|
+
() => (!MultiPlatform.isNext || MultiPlatform.isElectron || MultiPlatform.isIframe) && keycloakConfig ? new KeycloakClient({
|
|
105
105
|
url: keycloakConfig.url,
|
|
106
106
|
realm: keycloakConfig.realm,
|
|
107
107
|
clientId: keycloakConfig.publicClientId || keycloakConfig.clientId
|
|
108
108
|
}) : void 0,
|
|
109
109
|
[keycloakInitOptions, keycloakConfig, tokens.token, tokens.refreshToken, tokens.idToken]
|
|
110
110
|
), initOptions = useMemo(() => {
|
|
111
|
-
if (!MultiPlatform.isIframe) return;
|
|
111
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron && !MultiPlatform.isIframe) return;
|
|
112
112
|
const initOptions2 = {
|
|
113
113
|
...defaultKeycloakInitOptions,
|
|
114
114
|
...keycloakInitOptions,
|
|
@@ -137,17 +137,17 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
137
137
|
try {
|
|
138
138
|
await keycloakClient.updateToken(5);
|
|
139
139
|
} catch {
|
|
140
|
-
setKeycloak(new Keycloak(keycloakConfig));
|
|
140
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
141
141
|
}
|
|
142
142
|
};
|
|
143
143
|
const authenticated = await keycloakClient.init(initOptions);
|
|
144
|
-
setKeycloak(new Keycloak(keycloakConfig,
|
|
144
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
145
145
|
})();
|
|
146
146
|
}, []);
|
|
147
147
|
function render() {
|
|
148
148
|
return /* @__PURE__ */ jsx(KeycloakConfigContext.Provider, { value: keycloakConfig, children: /* @__PURE__ */ jsx(KeycloakContext.Provider, { value: keycloak, children: /* @__PURE__ */ jsx(AfterAuth, { children }) }) });
|
|
149
149
|
}
|
|
150
|
-
return MultiPlatform.isElectron ?
|
|
150
|
+
return MultiPlatform.isNext && !MultiPlatform.isElectron ? /* @__PURE__ */ jsx(SessionProvider, { ...sessionProvider, children: render() }) : render();
|
|
151
151
|
}
|
|
152
152
|
const defaultKeycloakInitOptions = {
|
|
153
153
|
checkLoginIframe: !0,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/provider/AuthProvider/AuthProvider.tsx"],
|
|
4
|
-
"mappings": ";AAuBA,OAAO,oBAAoB;AAC3B,SAAgB,WAAW,SAAS,gBAAgB;AAKpD,SAAS,iBAAiB;AAC1B,SAAS,UAAU,6BAA6B;AAChD,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,uBAAuB;AAChC,SAAS,SAAS,oBAAoB;AACtC,SAAS,qBAAqB;AAC9B,SAAS,iBAAiB;AAC1B,SAAS,+BAA+B;AAyO9B;AAjOV,MAAM,SAAS;AAQR,SAAS,aAAa,EAAE,UAAU,iBAAiB,qBAAqB,eAAe,GAAsB;AAClH,QAAM,EAAE,OAAO,mBAAmB,IAAI,cAAc,GAC9C,EAAE,MAAM,IAAI,cAAc,SAAS,UAAU,IAAI,EAAE,OAAO,CAAC,EAAE,GAC7D,YAAY,aAAa,GACzB,CAAC,UAAU,WAAW,IAAI,SAAmB,GAC7C,sBAAsB;AAAA,IAC1B,MACE;AAAA,MACE,cAAc,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["tokens", "initOptions"]
|
|
6
6
|
}
|
|
@@ -30,11 +30,11 @@ function AuthProvider({
|
|
|
30
30
|
},
|
|
31
31
|
authState = useAuthState(),
|
|
32
32
|
[keycloak, setKeycloak] = useState(),
|
|
33
|
-
initialRefreshToken = useMemo(() => validOrRefreshableToken(MultiPlatform.isIframe
|
|
33
|
+
initialRefreshToken = useMemo(() => validOrRefreshableToken(MultiPlatform.isIframe && ("refreshToken" in query && (query.refreshToken?.toString() || !0) || persist && authState.refreshToken) || void 0), []),
|
|
34
34
|
[tokens, setTokens] = useState({
|
|
35
35
|
refreshToken: initialRefreshToken,
|
|
36
|
-
token: validOrRefreshableToken(MultiPlatform.isIframe
|
|
37
|
-
idToken: validOrRefreshableToken(MultiPlatform.isIframe
|
|
36
|
+
token: validOrRefreshableToken(MultiPlatform.isIframe && ("token" in query && (query.token?.toString() || !0) || persist && authState.token) || void 0, initialRefreshToken),
|
|
37
|
+
idToken: validOrRefreshableToken(MultiPlatform.isIframe && ("idToken" in query && (query.idToken?.toString() || !0) || persist && authState.idToken) || void 0, initialRefreshToken)
|
|
38
38
|
});
|
|
39
39
|
useEffect(() => {
|
|
40
40
|
tokens.token !== !0 && tokens.refreshToken !== !0 && tokens.idToken !== !0 || (debug && logger.debug("post message", JSON.stringify({
|
|
@@ -109,13 +109,13 @@ function AuthProvider({
|
|
|
109
109
|
window.removeEventListener("message", messageCallback);
|
|
110
110
|
};
|
|
111
111
|
}, []);
|
|
112
|
-
const keycloakClient = useMemo(() => MultiPlatform.isIframe && keycloakConfig ? new KeycloakClient({
|
|
112
|
+
const keycloakClient = useMemo(() => (!MultiPlatform.isNext || MultiPlatform.isElectron || MultiPlatform.isIframe) && keycloakConfig ? new KeycloakClient({
|
|
113
113
|
url: keycloakConfig.url,
|
|
114
114
|
realm: keycloakConfig.realm,
|
|
115
115
|
clientId: keycloakConfig.publicClientId || keycloakConfig.clientId
|
|
116
116
|
}) : void 0, [keycloakInitOptions, keycloakConfig, tokens.token, tokens.refreshToken, tokens.idToken]),
|
|
117
117
|
initOptions = useMemo(() => {
|
|
118
|
-
if (!MultiPlatform.isIframe) return;
|
|
118
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron && !MultiPlatform.isIframe) return;
|
|
119
119
|
const initOptions2 = {
|
|
120
120
|
...defaultKeycloakInitOptions,
|
|
121
121
|
...keycloakInitOptions,
|
|
@@ -135,11 +135,11 @@ function AuthProvider({
|
|
|
135
135
|
try {
|
|
136
136
|
await keycloakClient.updateToken(5);
|
|
137
137
|
} catch {
|
|
138
|
-
setKeycloak(new Keycloak(keycloakConfig));
|
|
138
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
139
139
|
}
|
|
140
140
|
};
|
|
141
141
|
const authenticated = await keycloakClient.init(initOptions);
|
|
142
|
-
setKeycloak(new Keycloak(keycloakConfig,
|
|
142
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
143
143
|
})();
|
|
144
144
|
}, []);
|
|
145
145
|
function render() {
|
|
@@ -153,10 +153,10 @@ function AuthProvider({
|
|
|
153
153
|
})
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
|
-
return MultiPlatform.isElectron ?
|
|
156
|
+
return MultiPlatform.isNext && !MultiPlatform.isElectron ? /* @__PURE__ */jsx(SessionProvider, {
|
|
157
157
|
...sessionProvider,
|
|
158
158
|
children: render()
|
|
159
|
-
});
|
|
159
|
+
}) : render();
|
|
160
160
|
}
|
|
161
161
|
const defaultKeycloakInitOptions = {
|
|
162
162
|
checkLoginIframe: !0,
|
|
@@ -6,13 +6,14 @@ function KeycloakProvider({
|
|
|
6
6
|
baseUrl,
|
|
7
7
|
children,
|
|
8
8
|
clientId,
|
|
9
|
+
loginRedirectUri,
|
|
9
10
|
debug,
|
|
10
11
|
disabled,
|
|
11
12
|
publicClientId,
|
|
12
13
|
realm,
|
|
13
14
|
session
|
|
14
15
|
}) {
|
|
15
|
-
const authConfig = useMemo(() => ({ debug, disabled }), [debug, disabled]);
|
|
16
|
+
const authConfig = useMemo(() => ({ debug, disabled, loginRedirectUri }), [debug, disabled, loginRedirectUri]);
|
|
16
17
|
return /* @__PURE__ */ jsx(AuthConfigContext.Provider, { value: authConfig, children: disabled ? /* @__PURE__ */ jsx(Fragment, { children }) : /* @__PURE__ */ jsx(
|
|
17
18
|
AuthProvider,
|
|
18
19
|
{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": "AAqBA,SAAgB,eAAe;AAI/B,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;
|
|
4
|
+
"mappings": "AAqBA,SAAgB,eAAe;AAI/B,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;AAyBrB;AAfD,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA0B;AACxB,QAAM,aAAa,QAAQ,OAAO,EAAE,OAAO,UAAU,iBAAiB,IAAI,CAAC,OAAO,UAAU,gBAAgB,CAAC;AAC7G,SACE,oBAAC,kBAAkB,UAAlB,EAA2B,OAAO,YAChC,qBACC,gCAAG,UAAS,IAEZ;AAAA,IAAC;AAAA;AAAA,MACC,iBAAiB,EAAE,QAAQ;AAAA,MAC3B,gBAAgB;AAAA,QACd,UAAU,YAAY;AAAA,QACtB;AAAA,QACA,OAAO,SAAS;AAAA,QAChB,KAAK;AAAA,MACP;AAAA,MAEC;AAAA;AAAA,EACH,GAEJ;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -6,6 +6,7 @@ function KeycloakProvider({
|
|
|
6
6
|
baseUrl,
|
|
7
7
|
children,
|
|
8
8
|
clientId,
|
|
9
|
+
loginRedirectUri,
|
|
9
10
|
debug,
|
|
10
11
|
disabled,
|
|
11
12
|
publicClientId,
|
|
@@ -14,8 +15,9 @@ function KeycloakProvider({
|
|
|
14
15
|
}) {
|
|
15
16
|
const authConfig = useMemo(() => ({
|
|
16
17
|
debug,
|
|
17
|
-
disabled
|
|
18
|
-
|
|
18
|
+
disabled,
|
|
19
|
+
loginRedirectUri
|
|
20
|
+
}), [debug, disabled, loginRedirectUri]);
|
|
19
21
|
return /* @__PURE__ */jsx(AuthConfigContext.Provider, {
|
|
20
22
|
value: authConfig,
|
|
21
23
|
children: disabled ? /* @__PURE__ */jsx(Fragment, {
|
|
@@ -3,14 +3,16 @@ import { useMemo } from "react";
|
|
|
3
3
|
import { AuthConfigContext } from "../authConfig";
|
|
4
4
|
import { AuthProvider } from "./AuthProvider";
|
|
5
5
|
function KeycloakProvider(param) {
|
|
6
|
-
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = useMemo(function() {
|
|
6
|
+
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, loginRedirectUri = param.loginRedirectUri, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = useMemo(function() {
|
|
7
7
|
return {
|
|
8
8
|
debug,
|
|
9
|
-
disabled
|
|
9
|
+
disabled,
|
|
10
|
+
loginRedirectUri
|
|
10
11
|
};
|
|
11
12
|
}, [
|
|
12
13
|
debug,
|
|
13
|
-
disabled
|
|
14
|
+
disabled,
|
|
15
|
+
loginRedirectUri
|
|
14
16
|
]);
|
|
15
17
|
return /* @__PURE__ */ _jsx(AuthConfigContext.Provider, {
|
|
16
18
|
value: authConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": "AAmBC,SAAA,OAAA,MAAA,YAAA,iBAAA;AAED,SAAgBA,eAAe;AAI/B,SAASC,yBAAyB;AAClC,SAASC,oBAAoB;AAUtB,SAASC,iBAAiB,
|
|
5
|
-
"names": ["useMemo", "AuthConfigContext", "AuthProvider", "KeycloakProvider", "baseUrl", "children", "clientId", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "Provider", "value", "sessionProvider", "keycloakConfig", "url"]
|
|
4
|
+
"mappings": "AAmBC,SAAA,OAAA,MAAA,YAAA,iBAAA;AAED,SAAgBA,eAAe;AAI/B,SAASC,yBAAyB;AAClC,SAASC,oBAAoB;AAUtB,SAASC,iBAAiB,OAUT;MATtBC,UAD+B,MAC/BA,SACAC,WAF+B,MAE/BA,UACAC,WAH+B,MAG/BA,UACAC,mBAJ+B,MAI/BA,kBACAC,QAL+B,MAK/BA,OACAC,WAN+B,MAM/BA,UACAC,iBAP+B,MAO/BA,gBACAC,QAR+B,MAQ/BA,OACAC,UAT+B,MAS/BA,SAEMC,aAAab,QAAQ,WAAA;WAAO;MAAEQ;MAAOC;MAAUF;IAAiB;KAAI;IAACC;IAAOC;IAAUF;GAAiB;AAC7G,SACE,qBAACN,kBAAkBa,UAAQ;IAACC,OAAOF;cAChCJ,WACC,qBAAA,WAAA;;SAEA,qBAACP,cAAAA;MACCc,iBAAiB;QAAEJ;MAAQ;MAC3BK,gBAAgB;QACdX,UAAUA,YAAY;QACtBI;QACAC,OAAOA,SAAS;QAChBO,KAAKd;MACP;;;;AAOV;",
|
|
5
|
+
"names": ["useMemo", "AuthConfigContext", "AuthProvider", "KeycloakProvider", "baseUrl", "children", "clientId", "loginRedirectUri", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "Provider", "value", "sessionProvider", "keycloakConfig", "url"]
|
|
6
6
|
}
|
|
@@ -10,7 +10,7 @@ global.AsyncStorage = AsyncStorage;
|
|
|
10
10
|
function Authenticated({ children, disabled, loggedOutComponent, loadingComponent }) {
|
|
11
11
|
const authConfig = useAuthConfig(), keycloak = useKeycloak(), tokensFromQuery = useTokensFromQuery();
|
|
12
12
|
if (useEffect(() => {
|
|
13
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak
|
|
13
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak?.login({
|
|
14
14
|
redirectUri: authConfig.loginRedirectUri
|
|
15
15
|
});
|
|
16
16
|
}, [keycloak?.authenticated]), typeof disabled > "u" && (disabled = authConfig.disabled), disabled) return /* @__PURE__ */ jsx(Fragment, { children });
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";AAuBA,OAAO,kBAAkB;AACzB,SAAkD,iBAAiB;AACnE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AACrB,SAAS,eAAe,0BAA0B;AAClD,SAAS,mBAAmB;AAyBL;AAvBvB,OAAO,eAAe;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,aAAa,cAAc,GAC3B,WAAW,YAAY,GACvB,kBAAkB,mBAAmB;AAY3C,MAVA,UAAU,MAAM;AACd,IAAI,CAAC,YAAY,cAAc,YAAY,cAAc,YAAY,SAAS,iBAAiB,mBAG/F,
|
|
4
|
+
"mappings": ";AAuBA,OAAO,kBAAkB;AACzB,SAAkD,iBAAiB;AACnE,SAAS,qBAAqB;AAC9B,SAAS,YAAY;AACrB,SAAS,eAAe,0BAA0B;AAClD,SAAS,mBAAmB;AAyBL;AAvBvB,OAAO,eAAe;AAQf,SAAS,cAAc,EAAE,UAAU,UAAU,oBAAoB,iBAAiB,GAAuB;AAC9G,QAAM,aAAa,cAAc,GAC3B,WAAW,YAAY,GACvB,kBAAkB,mBAAmB;AAY3C,MAVA,UAAU,MAAM;AACd,IAAI,CAAC,YAAY,cAAc,YAAY,cAAc,YAAY,SAAS,iBAAiB,mBAG/F,UAAU,MAAM;AAAA,MACd,aAAa,WAAW;AAAA,IAC1B,CAAC;AAAA,EACH,GAAG,CAAC,UAAU,aAAa,CAAC,GAExB,OAAO,WAAa,QAAa,WAAW,WAAW,WACvD,SAAU,QAAO,gCAAG,UAAS;AACjC,MAAI,OAAO,WAAa,KAAa;AACnC,UAAM,mBAAmB;AACzB,WAAO,mBAAmB,oBAAC,oBAAiB,IAAK,oBAAC,QAAM,qBAAW,QAAQ,YAAY,MAAK;AAAA,EAC9F;AACA,MAAI,aAAa,QAAQ,SAAS,cAAe,QAAO,gCAAG,UAAS;AACpE,QAAM,qBAAqB;AAC3B,SAAO,qBAAqB,oBAAC,sBAAmB,IAAK,oBAAC,QAAM,qBAAW,QAAQ,sBAAsB,MAAK;AAC5G;AAEO,SAAS,kBAAoC,WAA6B;AAC/E,SAAO,CAAC,UACN,oBAAC,iBACC,8BAAC,aAAW,GAAG,OAAO,GACxB;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,7 +18,7 @@ function Authenticated({
|
|
|
18
18
|
keycloak = useKeycloak(),
|
|
19
19
|
tokensFromQuery = useTokensFromQuery();
|
|
20
20
|
if (useEffect(() => {
|
|
21
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak
|
|
21
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak?.login({
|
|
22
22
|
redirectUri: authConfig.loginRedirectUri
|
|
23
23
|
});
|
|
24
24
|
}, [keycloak?.authenticated]), typeof disabled > "u" && (disabled = authConfig.disabled), disabled) return /* @__PURE__ */jsx(Fragment, {
|
|
@@ -29,7 +29,7 @@ global.AsyncStorage = AsyncStorage;
|
|
|
29
29
|
function Authenticated(param) {
|
|
30
30
|
var children = param.children, disabled = param.disabled, loggedOutComponent = param.loggedOutComponent, loadingComponent = param.loadingComponent, authConfig = useAuthConfig(), keycloak = useKeycloak(), tokensFromQuery = useTokensFromQuery();
|
|
31
31
|
if (useEffect(function() {
|
|
32
|
-
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak.login({
|
|
32
|
+
!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery || keycloak == null || keycloak.login({
|
|
33
33
|
redirectUri: authConfig.loginRedirectUri
|
|
34
34
|
});
|
|
35
35
|
}, [
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/Authenticated.tsx"],
|
|
4
|
-
"mappings": ";;AAuBA,OAAOA,kBAAkB;AACzB,SAAkDC,iBAAiB;AACnE,SAASC,qBAAqB;AAC9B,SAASC,YAAY;AACrB,SAASC,eAAeC,0BAA0B;AAClD,SAASC,mBAAmB;;;;;;;;;;;;;;;;;;;;AAE5BC,OAAOP,eAAeA;AAQf,SAASQ,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,aAAaT,cAAAA,GACbU,WAAWR,YAAAA,GACXS,kBAAkBV,mBAAAA;AAYxB,MAVAJ,UAAU,WAAA;AACR,IAAI,CAACa,YAAYZ,cAAcc,YAAYd,cAAce,YAAYH,SAASI,iBAAiBH,mBAG/FD,
|
|
4
|
+
"mappings": ";;AAuBA,OAAOA,kBAAkB;AACzB,SAAkDC,iBAAiB;AACnE,SAASC,qBAAqB;AAC9B,SAASC,YAAY;AACrB,SAASC,eAAeC,0BAA0B;AAClD,SAASC,mBAAmB;;;;;;;;;;;;;;;;;;;;AAE5BC,OAAOP,eAAeA;AAQf,SAASQ,cAAc,OAAgF;MAA9EC,WAAF,MAAEA,UAAUC,WAAZ,MAAYA,UAAUC,qBAAtB,MAAsBA,oBAAoBC,mBAA1C,MAA0CA,kBAChEC,aAAaT,cAAAA,GACbU,WAAWR,YAAAA,GACXS,kBAAkBV,mBAAAA;AAYxB,MAVAJ,UAAU,WAAA;AACR,IAAI,CAACa,YAAYZ,cAAcc,YAAYd,cAAce,YAAYH,SAASI,iBAAiBH,mBAG/FD,YAAAA,QAAAA,SAAUK,MAAM;MACdC,aAAaP,WAAWQ;IAC1B,CAAA;EACF,GAAG;IAACP,YAAAA,OAAAA,SAAAA,SAAUI;GAAc,GAExB,OAAOR,WAAa,QAAaA,WAAWG,WAAWH,WACvDA,SAAU,QAAO,qBAAA,WAAA;;;AACrB,MAAI,OAAOI,WAAa,KAAa;AACnC,QAAMQ,mBAAmBV;AACzB,WAAOU,mBAAmB,qBAACA,kBAAAA,CAAAA,CAAAA,IAAsB,qBAACnB,MAAAA;gBAAMU,WAAWU,QAAQ,YAAY;;EACzF;AACA,MAAIT,aAAa,QAAQA,SAASI,cAAe,QAAO,qBAAA,WAAA;;;AACxD,MAAMM,qBAAqBb;AAC3B,SAAOa,qBAAqB,qBAACA,oBAAAA,CAAAA,CAAAA,IAAwB,qBAACrB,MAAAA;cAAMU,WAAWU,QAAQ,sBAAsB;;AACvG;AAEO,SAASE,kBAAoCC,WAA2B;AAC7E,SAAO,SAACC,OAAAA;WACN,qBAACnB,eAAAA;gBACC,qBAACkB,WAAAA,eAAAA,CAAAA,GAAcC,KAAAA,CAAAA;;;AAGrB;",
|
|
5
5
|
"names": ["AsyncStorage", "useEffect", "MultiPlatform", "Text", "useAuthConfig", "useTokensFromQuery", "useKeycloak", "global", "Authenticated", "children", "disabled", "loggedOutComponent", "loadingComponent", "authConfig", "keycloak", "tokensFromQuery", "isIframe", "isServer", "authenticated", "login", "redirectUri", "loginRedirectUri", "LoadingComponent", "debug", "LoggedOutComponent", "withAuthenticated", "Component", "props"]
|
|
6
6
|
}
|
|
@@ -15,17 +15,17 @@ const logger = console;
|
|
|
15
15
|
function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloakConfig }) {
|
|
16
16
|
const { debug, messageHandlerKeys } = useAuthConfig(), { query } = MultiPlatform.isNext ? useRouter() : { query: {} }, authState = useAuthState(), [keycloak, setKeycloak] = useState(), initialRefreshToken = useMemo(
|
|
17
17
|
() => validOrRefreshableToken(
|
|
18
|
-
MultiPlatform.isIframe
|
|
18
|
+
MultiPlatform.isIframe && ("refreshToken" in query && (query.refreshToken?.toString() || !0) || persist && authState.refreshToken) || void 0
|
|
19
19
|
),
|
|
20
20
|
[]
|
|
21
21
|
), [tokens, setTokens] = useState({
|
|
22
22
|
refreshToken: initialRefreshToken,
|
|
23
23
|
token: validOrRefreshableToken(
|
|
24
|
-
MultiPlatform.isIframe
|
|
24
|
+
MultiPlatform.isIframe && ("token" in query && (query.token?.toString() || !0) || persist && authState.token) || void 0,
|
|
25
25
|
initialRefreshToken
|
|
26
26
|
),
|
|
27
27
|
idToken: validOrRefreshableToken(
|
|
28
|
-
MultiPlatform.isIframe
|
|
28
|
+
MultiPlatform.isIframe && ("idToken" in query && (query.idToken?.toString() || !0) || persist && authState.idToken) || void 0,
|
|
29
29
|
initialRefreshToken
|
|
30
30
|
)
|
|
31
31
|
});
|
|
@@ -101,14 +101,14 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
101
101
|
};
|
|
102
102
|
}, []);
|
|
103
103
|
const keycloakClient = useMemo(
|
|
104
|
-
() => MultiPlatform.isIframe && keycloakConfig ? new KeycloakClient({
|
|
104
|
+
() => (!MultiPlatform.isNext || MultiPlatform.isElectron || MultiPlatform.isIframe) && keycloakConfig ? new KeycloakClient({
|
|
105
105
|
url: keycloakConfig.url,
|
|
106
106
|
realm: keycloakConfig.realm,
|
|
107
107
|
clientId: keycloakConfig.publicClientId || keycloakConfig.clientId
|
|
108
108
|
}) : void 0,
|
|
109
109
|
[keycloakInitOptions, keycloakConfig, tokens.token, tokens.refreshToken, tokens.idToken]
|
|
110
110
|
), initOptions = useMemo(() => {
|
|
111
|
-
if (!MultiPlatform.isIframe) return;
|
|
111
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron && !MultiPlatform.isIframe) return;
|
|
112
112
|
const initOptions2 = {
|
|
113
113
|
...defaultKeycloakInitOptions,
|
|
114
114
|
...keycloakInitOptions,
|
|
@@ -137,17 +137,17 @@ function AuthProvider({ children, sessionProvider, keycloakInitOptions, keycloak
|
|
|
137
137
|
try {
|
|
138
138
|
await keycloakClient.updateToken(5);
|
|
139
139
|
} catch {
|
|
140
|
-
setKeycloak(new Keycloak(keycloakConfig));
|
|
140
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
141
141
|
}
|
|
142
142
|
};
|
|
143
143
|
const authenticated = await keycloakClient.init(initOptions);
|
|
144
|
-
setKeycloak(new Keycloak(keycloakConfig,
|
|
144
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
145
145
|
})();
|
|
146
146
|
}, []);
|
|
147
147
|
function render() {
|
|
148
148
|
return /* @__PURE__ */ jsx(KeycloakConfigContext.Provider, { value: keycloakConfig, children: /* @__PURE__ */ jsx(KeycloakContext.Provider, { value: keycloak, children: /* @__PURE__ */ jsx(AfterAuth, { children }) }) });
|
|
149
149
|
}
|
|
150
|
-
return MultiPlatform.isElectron ?
|
|
150
|
+
return MultiPlatform.isNext && !MultiPlatform.isElectron ? /* @__PURE__ */ jsx(SessionProvider, { ...sessionProvider, children: render() }) : render();
|
|
151
151
|
}
|
|
152
152
|
const defaultKeycloakInitOptions = {
|
|
153
153
|
checkLoginIframe: !0,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/provider/AuthProvider/AuthProvider.tsx"],
|
|
4
|
-
"mappings": ";AAuBA,OAAO,oBAAoB;AAC3B,SAAgB,WAAW,SAAS,gBAAgB;AAKpD,SAAS,iBAAiB;AAC1B,SAAS,UAAU,6BAA6B;AAChD,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAC9B,SAAS,uBAAuB;AAChC,SAAS,SAAS,oBAAoB;AACtC,SAAS,qBAAqB;AAC9B,SAAS,iBAAiB;AAC1B,SAAS,+BAA+B;AAyO9B;AAjOV,MAAM,SAAS;AAQR,SAAS,aAAa,EAAE,UAAU,iBAAiB,qBAAqB,eAAe,GAAsB;AAClH,QAAM,EAAE,OAAO,mBAAmB,IAAI,cAAc,GAC9C,EAAE,MAAM,IAAI,cAAc,SAAS,UAAU,IAAI,EAAE,OAAO,CAAC,EAAE,GAC7D,YAAY,aAAa,GACzB,CAAC,UAAU,WAAW,IAAI,SAAmB,GAC7C,sBAAsB;AAAA,IAC1B,MACE;AAAA,MACE,cAAc,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["tokens", "initOptions"]
|
|
6
6
|
}
|
|
@@ -30,11 +30,11 @@ function AuthProvider({
|
|
|
30
30
|
},
|
|
31
31
|
authState = useAuthState(),
|
|
32
32
|
[keycloak, setKeycloak] = useState(),
|
|
33
|
-
initialRefreshToken = useMemo(() => validOrRefreshableToken(MultiPlatform.isIframe
|
|
33
|
+
initialRefreshToken = useMemo(() => validOrRefreshableToken(MultiPlatform.isIframe && ("refreshToken" in query && (query.refreshToken?.toString() || !0) || persist && authState.refreshToken) || void 0), []),
|
|
34
34
|
[tokens, setTokens] = useState({
|
|
35
35
|
refreshToken: initialRefreshToken,
|
|
36
|
-
token: validOrRefreshableToken(MultiPlatform.isIframe
|
|
37
|
-
idToken: validOrRefreshableToken(MultiPlatform.isIframe
|
|
36
|
+
token: validOrRefreshableToken(MultiPlatform.isIframe && ("token" in query && (query.token?.toString() || !0) || persist && authState.token) || void 0, initialRefreshToken),
|
|
37
|
+
idToken: validOrRefreshableToken(MultiPlatform.isIframe && ("idToken" in query && (query.idToken?.toString() || !0) || persist && authState.idToken) || void 0, initialRefreshToken)
|
|
38
38
|
});
|
|
39
39
|
useEffect(() => {
|
|
40
40
|
tokens.token !== !0 && tokens.refreshToken !== !0 && tokens.idToken !== !0 || (debug && logger.debug("post message", JSON.stringify({
|
|
@@ -109,13 +109,13 @@ function AuthProvider({
|
|
|
109
109
|
window.removeEventListener("message", messageCallback);
|
|
110
110
|
};
|
|
111
111
|
}, []);
|
|
112
|
-
const keycloakClient = useMemo(() => MultiPlatform.isIframe && keycloakConfig ? new KeycloakClient({
|
|
112
|
+
const keycloakClient = useMemo(() => (!MultiPlatform.isNext || MultiPlatform.isElectron || MultiPlatform.isIframe) && keycloakConfig ? new KeycloakClient({
|
|
113
113
|
url: keycloakConfig.url,
|
|
114
114
|
realm: keycloakConfig.realm,
|
|
115
115
|
clientId: keycloakConfig.publicClientId || keycloakConfig.clientId
|
|
116
116
|
}) : void 0, [keycloakInitOptions, keycloakConfig, tokens.token, tokens.refreshToken, tokens.idToken]),
|
|
117
117
|
initOptions = useMemo(() => {
|
|
118
|
-
if (!MultiPlatform.isIframe) return;
|
|
118
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron && !MultiPlatform.isIframe) return;
|
|
119
119
|
const initOptions2 = {
|
|
120
120
|
...defaultKeycloakInitOptions,
|
|
121
121
|
...keycloakInitOptions,
|
|
@@ -135,11 +135,11 @@ function AuthProvider({
|
|
|
135
135
|
try {
|
|
136
136
|
await keycloakClient.updateToken(5);
|
|
137
137
|
} catch {
|
|
138
|
-
setKeycloak(new Keycloak(keycloakConfig));
|
|
138
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
139
139
|
}
|
|
140
140
|
};
|
|
141
141
|
const authenticated = await keycloakClient.init(initOptions);
|
|
142
|
-
setKeycloak(new Keycloak(keycloakConfig,
|
|
142
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
143
143
|
})();
|
|
144
144
|
}, []);
|
|
145
145
|
function render() {
|
|
@@ -153,10 +153,10 @@ function AuthProvider({
|
|
|
153
153
|
})
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
|
-
return MultiPlatform.isElectron ?
|
|
156
|
+
return MultiPlatform.isNext && !MultiPlatform.isElectron ? /* @__PURE__ */jsx(SessionProvider, {
|
|
157
157
|
...sessionProvider,
|
|
158
158
|
children: render()
|
|
159
|
-
});
|
|
159
|
+
}) : render();
|
|
160
160
|
}
|
|
161
161
|
const defaultKeycloakInitOptions = {
|
|
162
162
|
checkLoginIframe: !0,
|
|
@@ -6,13 +6,14 @@ function KeycloakProvider({
|
|
|
6
6
|
baseUrl,
|
|
7
7
|
children,
|
|
8
8
|
clientId,
|
|
9
|
+
loginRedirectUri,
|
|
9
10
|
debug,
|
|
10
11
|
disabled,
|
|
11
12
|
publicClientId,
|
|
12
13
|
realm,
|
|
13
14
|
session
|
|
14
15
|
}) {
|
|
15
|
-
const authConfig = useMemo(() => ({ debug, disabled }), [debug, disabled]);
|
|
16
|
+
const authConfig = useMemo(() => ({ debug, disabled, loginRedirectUri }), [debug, disabled, loginRedirectUri]);
|
|
16
17
|
return /* @__PURE__ */ jsx(AuthConfigContext.Provider, { value: authConfig, children: disabled ? /* @__PURE__ */ jsx(Fragment, { children }) : /* @__PURE__ */ jsx(
|
|
17
18
|
AuthProvider,
|
|
18
19
|
{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": "AAqBA,SAAgB,eAAe;AAI/B,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;
|
|
4
|
+
"mappings": "AAqBA,SAAgB,eAAe;AAI/B,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;AAyBrB;AAfD,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA0B;AACxB,QAAM,aAAa,QAAQ,OAAO,EAAE,OAAO,UAAU,iBAAiB,IAAI,CAAC,OAAO,UAAU,gBAAgB,CAAC;AAC7G,SACE,oBAAC,kBAAkB,UAAlB,EAA2B,OAAO,YAChC,qBACC,gCAAG,UAAS,IAEZ;AAAA,IAAC;AAAA;AAAA,MACC,iBAAiB,EAAE,QAAQ;AAAA,MAC3B,gBAAgB;AAAA,QACd,UAAU,YAAY;AAAA,QACtB;AAAA,QACA,OAAO,SAAS;AAAA,QAChB,KAAK;AAAA,MACP;AAAA,MAEC;AAAA;AAAA,EACH,GAEJ;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -6,6 +6,7 @@ function KeycloakProvider({
|
|
|
6
6
|
baseUrl,
|
|
7
7
|
children,
|
|
8
8
|
clientId,
|
|
9
|
+
loginRedirectUri,
|
|
9
10
|
debug,
|
|
10
11
|
disabled,
|
|
11
12
|
publicClientId,
|
|
@@ -14,8 +15,9 @@ function KeycloakProvider({
|
|
|
14
15
|
}) {
|
|
15
16
|
const authConfig = useMemo(() => ({
|
|
16
17
|
debug,
|
|
17
|
-
disabled
|
|
18
|
-
|
|
18
|
+
disabled,
|
|
19
|
+
loginRedirectUri
|
|
20
|
+
}), [debug, disabled, loginRedirectUri]);
|
|
19
21
|
return /* @__PURE__ */jsx(AuthConfigContext.Provider, {
|
|
20
22
|
value: authConfig,
|
|
21
23
|
children: disabled ? /* @__PURE__ */jsx(Fragment, {
|
|
@@ -3,14 +3,16 @@ import { useMemo } from "react";
|
|
|
3
3
|
import { AuthConfigContext } from "../authConfig";
|
|
4
4
|
import { AuthProvider } from "./AuthProvider";
|
|
5
5
|
function KeycloakProvider(param) {
|
|
6
|
-
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = useMemo(function() {
|
|
6
|
+
var baseUrl = param.baseUrl, children = param.children, clientId = param.clientId, loginRedirectUri = param.loginRedirectUri, debug = param.debug, disabled = param.disabled, publicClientId = param.publicClientId, realm = param.realm, session = param.session, authConfig = useMemo(function() {
|
|
7
7
|
return {
|
|
8
8
|
debug,
|
|
9
|
-
disabled
|
|
9
|
+
disabled,
|
|
10
|
+
loginRedirectUri
|
|
10
11
|
};
|
|
11
12
|
}, [
|
|
12
13
|
debug,
|
|
13
|
-
disabled
|
|
14
|
+
disabled,
|
|
15
|
+
loginRedirectUri
|
|
14
16
|
]);
|
|
15
17
|
return /* @__PURE__ */ _jsx(AuthConfigContext.Provider, {
|
|
16
18
|
value: authConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/provider/home/dharmendraboddeda/Projects/bitspur/multiplatform.one/multiplatform.one/packages/keycloak/src/provider/KeycloakProvider.tsx"],
|
|
4
|
-
"mappings": "AAmBC,SAAA,OAAA,MAAA,YAAA,iBAAA;AAED,SAAgBA,eAAe;AAI/B,SAASC,yBAAyB;AAClC,SAASC,oBAAoB;AAUtB,SAASC,iBAAiB,
|
|
5
|
-
"names": ["useMemo", "AuthConfigContext", "AuthProvider", "KeycloakProvider", "baseUrl", "children", "clientId", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "Provider", "value", "sessionProvider", "keycloakConfig", "url"]
|
|
4
|
+
"mappings": "AAmBC,SAAA,OAAA,MAAA,YAAA,iBAAA;AAED,SAAgBA,eAAe;AAI/B,SAASC,yBAAyB;AAClC,SAASC,oBAAoB;AAUtB,SAASC,iBAAiB,OAUT;MATtBC,UAD+B,MAC/BA,SACAC,WAF+B,MAE/BA,UACAC,WAH+B,MAG/BA,UACAC,mBAJ+B,MAI/BA,kBACAC,QAL+B,MAK/BA,OACAC,WAN+B,MAM/BA,UACAC,iBAP+B,MAO/BA,gBACAC,QAR+B,MAQ/BA,OACAC,UAT+B,MAS/BA,SAEMC,aAAab,QAAQ,WAAA;WAAO;MAAEQ;MAAOC;MAAUF;IAAiB;KAAI;IAACC;IAAOC;IAAUF;GAAiB;AAC7G,SACE,qBAACN,kBAAkBa,UAAQ;IAACC,OAAOF;cAChCJ,WACC,qBAAA,WAAA;;SAEA,qBAACP,cAAAA;MACCc,iBAAiB;QAAEJ;MAAQ;MAC3BK,gBAAgB;QACdX,UAAUA,YAAY;QACtBI;QACAC,OAAOA,SAAS;QAChBO,KAAKd;MACP;;;;AAOV;",
|
|
5
|
+
"names": ["useMemo", "AuthConfigContext", "AuthProvider", "KeycloakProvider", "baseUrl", "children", "clientId", "loginRedirectUri", "debug", "disabled", "publicClientId", "realm", "session", "authConfig", "Provider", "value", "sessionProvider", "keycloakConfig", "url"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@multiplatform.one/keycloak",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "keycloak client for multiplatform.one ecosystem",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
},
|
|
45
45
|
"peerDependencies": {
|
|
46
46
|
"@react-native-async-storage/async-storage": "1.21.0",
|
|
47
|
-
"multiplatform.one": "
|
|
47
|
+
"multiplatform.one": "2.0.0",
|
|
48
48
|
"next": "^13.0.5",
|
|
49
49
|
"react": "18.2.0",
|
|
50
50
|
"react-native": "0.74.2"
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@types/react": "^18.3.1",
|
|
60
60
|
"@types/react-native": "^0.73.0",
|
|
61
61
|
"@vitejs/plugin-react": "^4.3.1",
|
|
62
|
-
"multiplatform.one": "
|
|
62
|
+
"multiplatform.one": "2.0.0",
|
|
63
63
|
"next": "^14.2.3",
|
|
64
64
|
"react": "18.2.0",
|
|
65
65
|
"react-native": "0.74.2",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"lib"
|
|
75
75
|
],
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"@multiplatform.one/zustand": "
|
|
77
|
+
"@multiplatform.one/zustand": "2.0.0",
|
|
78
78
|
"expo-auth-session": "^5.5.2",
|
|
79
79
|
"expo-crypto": "^13.0.2",
|
|
80
80
|
"jwt-decode": "^4.0.0",
|
package/src/Authenticated.tsx
CHANGED
|
@@ -45,7 +45,7 @@ export function Authenticated({ children, disabled, loggedOutComponent, loadingC
|
|
|
45
45
|
if (!keycloak || MultiPlatform.isIframe || MultiPlatform.isServer || keycloak.authenticated || tokensFromQuery) {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
|
-
keycloak
|
|
48
|
+
keycloak?.login({
|
|
49
49
|
redirectUri: authConfig.loginRedirectUri,
|
|
50
50
|
});
|
|
51
51
|
}, [keycloak?.authenticated]);
|
|
@@ -62,7 +62,7 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
62
62
|
MultiPlatform.isIframe
|
|
63
63
|
? ('refreshToken' in query && (query.refreshToken?.toString() || true)) ||
|
|
64
64
|
(persist && authState.refreshToken) ||
|
|
65
|
-
|
|
65
|
+
undefined
|
|
66
66
|
: undefined,
|
|
67
67
|
),
|
|
68
68
|
[],
|
|
@@ -71,13 +71,13 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
71
71
|
refreshToken: initialRefreshToken,
|
|
72
72
|
token: validOrRefreshableToken(
|
|
73
73
|
MultiPlatform.isIframe
|
|
74
|
-
? ('token' in query && (query.token?.toString() || true)) || (persist && authState.token) ||
|
|
74
|
+
? ('token' in query && (query.token?.toString() || true)) || (persist && authState.token) || undefined
|
|
75
75
|
: undefined,
|
|
76
76
|
initialRefreshToken,
|
|
77
77
|
),
|
|
78
78
|
idToken: validOrRefreshableToken(
|
|
79
79
|
MultiPlatform.isIframe
|
|
80
|
-
? ('idToken' in query && (query.idToken?.toString() || true)) || (persist && authState.idToken) ||
|
|
80
|
+
? ('idToken' in query && (query.idToken?.toString() || true)) || (persist && authState.idToken) || undefined
|
|
81
81
|
: undefined,
|
|
82
82
|
initialRefreshToken,
|
|
83
83
|
),
|
|
@@ -194,7 +194,7 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
194
194
|
|
|
195
195
|
const keycloakClient = useMemo(
|
|
196
196
|
() =>
|
|
197
|
-
MultiPlatform.isIframe && keycloakConfig
|
|
197
|
+
(!MultiPlatform.isNext || MultiPlatform.isElectron || MultiPlatform.isIframe) && keycloakConfig
|
|
198
198
|
? new KeycloakClient({
|
|
199
199
|
url: keycloakConfig.url,
|
|
200
200
|
realm: keycloakConfig.realm,
|
|
@@ -205,7 +205,7 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
205
205
|
);
|
|
206
206
|
|
|
207
207
|
const initOptions = useMemo(() => {
|
|
208
|
-
if (!MultiPlatform.isIframe) return;
|
|
208
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron && !MultiPlatform.isIframe) return;
|
|
209
209
|
const initOptions: KeycloakInitOptions = {
|
|
210
210
|
...defaultKeycloakInitOptions,
|
|
211
211
|
...keycloakInitOptions,
|
|
@@ -255,11 +255,11 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
255
255
|
try {
|
|
256
256
|
await keycloakClient.updateToken(5);
|
|
257
257
|
} catch (err) {
|
|
258
|
-
setKeycloak(new Keycloak(keycloakConfig));
|
|
258
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
259
259
|
}
|
|
260
260
|
};
|
|
261
261
|
const authenticated = await keycloakClient.init(initOptions);
|
|
262
|
-
setKeycloak(new Keycloak(keycloakConfig,
|
|
262
|
+
setKeycloak(new Keycloak(keycloakConfig, keycloakClient));
|
|
263
263
|
})();
|
|
264
264
|
}
|
|
265
265
|
}, []);
|
|
@@ -274,8 +274,10 @@ export function AuthProvider({ children, sessionProvider, keycloakInitOptions, k
|
|
|
274
274
|
);
|
|
275
275
|
}
|
|
276
276
|
|
|
277
|
-
if (MultiPlatform.isElectron)
|
|
278
|
-
|
|
277
|
+
if (MultiPlatform.isNext && !MultiPlatform.isElectron) {
|
|
278
|
+
return <SessionProvider {...sessionProvider}>{render()}</SessionProvider>;
|
|
279
|
+
}
|
|
280
|
+
return render();
|
|
279
281
|
}
|
|
280
282
|
|
|
281
283
|
const defaultKeycloakInitOptions: KeycloakInitOptions = {
|
|
@@ -38,13 +38,14 @@ export function KeycloakProvider({
|
|
|
38
38
|
baseUrl,
|
|
39
39
|
children,
|
|
40
40
|
clientId,
|
|
41
|
+
loginRedirectUri,
|
|
41
42
|
debug,
|
|
42
43
|
disabled,
|
|
43
44
|
publicClientId,
|
|
44
45
|
realm,
|
|
45
46
|
session,
|
|
46
47
|
}: KeycloakProviderProps) {
|
|
47
|
-
const authConfig = useMemo(() => ({ debug, disabled }), [debug, disabled]);
|
|
48
|
+
const authConfig = useMemo(() => ({ debug, disabled, loginRedirectUri }), [debug, disabled, loginRedirectUri]);
|
|
48
49
|
return (
|
|
49
50
|
<AuthConfigContext.Provider value={authConfig}>
|
|
50
51
|
{disabled ? (
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthProvider.d.ts","sourceRoot":"","sources":["../../../src/provider/AuthProvider/AuthProvider.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAW5D,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,cAAc,EAAE,cAAc,CAAC;IAC/B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,eAAe,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;CAC1D;AAID,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,OAAO;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CACpB;AAED,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"AuthProvider.d.ts","sourceRoot":"","sources":["../../../src/provider/AuthProvider/AuthProvider.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAW5D,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,cAAc,EAAE,cAAc,CAAC;IAC/B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,eAAe,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;CAC1D;AAID,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,OAAO;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CACpB;AAED,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,iBAAiB,qBAmOjH;AAUD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
|
|
@@ -9,5 +9,5 @@ export interface KeycloakProviderProps extends PropsWithChildren, AuthConfig {
|
|
|
9
9
|
realm?: string;
|
|
10
10
|
session?: Session;
|
|
11
11
|
}
|
|
12
|
-
export declare function KeycloakProvider({ baseUrl, children, clientId, debug, disabled, publicClientId, realm, session, }: KeycloakProviderProps): React.JSX.Element;
|
|
12
|
+
export declare function KeycloakProvider({ baseUrl, children, clientId, loginRedirectUri, debug, disabled, publicClientId, realm, session, }: KeycloakProviderProps): React.JSX.Element;
|
|
13
13
|
//# sourceMappingURL=KeycloakProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeycloakProvider.d.ts","sourceRoot":"","sources":["../../src/provider/KeycloakProvider.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB,EAAE,UAAU;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,cAAc,EACd,KAAK,EACL,OAAO,GACR,EAAE,qBAAqB,qBAqBvB"}
|
|
1
|
+
{"version":3,"file":"KeycloakProvider.d.ts","sourceRoot":"","sources":["../../src/provider/KeycloakProvider.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB,EAAE,UAAU;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,QAAQ,EACR,cAAc,EACd,KAAK,EACL,OAAO,GACR,EAAE,qBAAqB,qBAqBvB"}
|