@multiplatform.one/keycloak 0.3.32 → 0.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/keycloak",
-  "version": "0.3.32",
+  "version": "0.3.33",
   "description": "keycloak client for multiplatform.one ecosystem",
   "main": "dist/lib",
   "module": "dist/esm",

package/src/hooks/useKeycloak/index.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 14:10:44
  * Author: Clay Risser
  * -----
- * Last Modified: 31-05-2023 12:41:37
+ * Last Modified: 01-06-2023 13:55:42
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -37,9 +37,8 @@ export interface IKeycloak {
   tokenParsed?: ITokenParsed;
   email?: string;
   username?: string;
-  userId?: string;
-  login: () => Promise<unknown> | unknown;
-  logout: () => Promise<unknown> | unknown;
+  login: () => Promise<unknown>;
+  logout: () => Promise<unknown>;
 }
 
 export interface ITokenParsed extends KeycloakTokenParsed {

package/src/hooks/useKeycloak/useKeycloak.native.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 14:10:25
  * Author: Clay Risser
  * -----
- * Last Modified: 24-04-2023 17:50:55
+ * Last Modified: 01-06-2023 14:04:46
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -50,13 +50,13 @@ export class ExpoKeycloak implements IKeycloak {
 
   resourceAccess?: KeycloakResourceAccess;
 
-  login: () => Promise<unknown> | unknown;
+  login: () => Promise<unknown>;
 
   constructor(
     ready: boolean,
     isLoggedIn: boolean | undefined,
     login: (options?: AuthRequestPromptOptions) => Promise<AuthSessionResult | undefined>,
-    public logout: () => unknown,
+    public logout: () => Promise<unknown>,
     public token?: string,
     public refreshToken?: string,
   ) {

package/src/hooks/useKeycloak/useKeycloak.ts

@@ -4,7 +4,7 @@
  * File Created: 08-11-2022 06:04:59
  * Author: Clay Risser
  * -----
- * Last Modified: 31-05-2023 12:49:27
+ * Last Modified: 01-06-2023 14:02:40
  * Modified By: Clay Risser
  * -----
  * Risser Labs LLC (c) Copyright 2021 - 2022
@@ -31,24 +31,79 @@ import { useKeycloak as useSsrKeycloak } from '@bitspur/react-keycloak-ssr';
 export function useKeycloak() {
   const authConfig = useAuthConfig();
   if (MultiPlatform.isStorybook) {
-    return { authenticated: true, username: 'storybook', email: 'storybook@example.com', userId: '0' } as IKeycloak;
+    return new Keycloak(
+      {
+        email: 'storybook@example.com',
+        login: async () => undefined,
+        logout: async () => undefined,
+        subject: '0',
+        username: 'storybook',
+      },
+      true,
+    );
   }
   if (MultiPlatform.isNext && authConfig.ssr) {
     const { keycloak, initialized } = useSsrKeycloak();
-    return {
-      ...keycloak,
-      authenticated: initialized ? keycloak?.authenticated : undefined,
-      email: keycloak?.tokenParsed?.email,
-      userId: keycloak?.tokenParsed?.sub,
-      username: keycloak?.tokenParsed?.preferred_username,
-    } as IKeycloak;
+    return new Keycloak(keycloak, initialized);
   }
   const { keycloak, initialized } = useReactKeycloak();
-  return {
-    ...keycloak,
-    authenticated: initialized ? keycloak?.authenticated : undefined,
-    email: keycloak?.tokenParsed?.email,
-    userId: keycloak?.tokenParsed?.sub,
-    username: keycloak?.tokenParsed?.preferred_username,
-  } as IKeycloak;
+  return new Keycloak(keycloak, initialized);
+}
+
+export class Keycloak implements IKeycloak {
+  authenticated?: boolean;
+
+  constructor(private readonly keycloak: IKeycloak | undefined, initialized: boolean) {
+    this.authenticated = initialized ? keycloak?.authenticated : undefined;
+  }
+
+  get idToken() {
+    return this.keycloak?.idToken;
+  }
+
+  get realmAccess() {
+    return this.keycloak?.realmAccess;
+  }
+
+  get refreshToken() {
+    return this.keycloak?.refreshToken;
+  }
+
+  get refreshTokenParsed() {
+    return this.keycloak?.refreshTokenParsed;
+  }
+
+  get resourceAccess() {
+    return this.keycloak?.resourceAccess;
+  }
+
+  get subject() {
+    return this.keycloak?.subject;
+  }
+
+  get token() {
+    return this.keycloak?.token;
+  }
+
+  get tokenParsed() {
+    return this.keycloak?.tokenParsed;
+  }
+
+  get email() {
+    return this.keycloak?.tokenParsed?.email;
+  }
+
+  get username() {
+    return this.keycloak?.tokenParsed?.preferred_username;
+  }
+
+  async login() {
+    if (!this.keycloak) return;
+    return this.keycloak.login();
+  }
+
+  async logout() {
+    if (!this.keycloak) return;
+    return this.keycloak.logout();
+  }
 }