@databiosphere/findable-ui 51.1.0 → 52.0.0

package/lib/config/entities.d.ts

@@ -219,7 +219,11 @@ export interface ListViewConfig {
     rowPreviewView?: ComponentsConfig;
     rowSelectionView?: ComponentsConfig;
 }
-export interface OAuthProvider<P = any> {
+export declare enum OAUTH_FLOW {
+    AUTHORIZATION_CODE = "AUTHORIZATION_CODE",
+    IMPLICIT = "IMPLICIT"
+}
+interface OAuthProviderBase<P = any> {
     authorization: {
         params: {
             scope: string;
@@ -232,6 +236,14 @@ export interface OAuthProvider<P = any> {
     profile: (profile: P) => UserProfile;
     userinfo: string;
 }
+export interface ImplicitFlowProvider<P = any> extends OAuthProviderBase<P> {
+    flow: OAUTH_FLOW.IMPLICIT;
+}
+export interface AuthorizationCodeFlowProvider<P = any> extends OAuthProviderBase<P> {
+    authorize: string;
+    flow: OAUTH_FLOW.AUTHORIZATION_CODE;
+}
+export type OAuthProvider<P = any> = ImplicitFlowProvider<P> | AuthorizationCodeFlowProvider<P>;
 /**
  * Option Method.
  */

package/lib/config/entities.js

@@ -1,3 +1,8 @@
+export var OAUTH_FLOW;
+(function (OAUTH_FLOW) {
+    OAUTH_FLOW["AUTHORIZATION_CODE"] = "AUTHORIZATION_CODE";
+    OAUTH_FLOW["IMPLICIT"] = "IMPLICIT";
+})(OAUTH_FLOW || (OAUTH_FLOW = {}));
 /**
  * Sort direction.
  */

package/lib/google/service.d.ts

@@ -1,15 +1,17 @@
-import { OAuthProvider } from "../config/entities";
-import { SessionDispatch } from "./types";
+import { type OAuthProvider } from "../config/entities";
+import { type LoginDispatch } from "./services/common";
+import type { SessionDispatch } from "./types";
 /**
  * Google Sign-In service.
  */
 export declare const service: {
     /**
      * Login with Google OAuth.
+     * Dispatches to the configured flow based on `provider.flow`.
      * @param provider - OAuth provider configuration.
      * @param dispatch - Dispatch functions for auth state.
      */
-    login: (provider: OAuthProvider, dispatch: Pick<SessionDispatch, "authDispatch" | "authenticationDispatch" | "tokenDispatch">) => void;
+    login: (provider: OAuthProvider, dispatch: LoginDispatch) => void;
     /**
      * Logout and clear all auth state.
      * @param dispatch - Dispatch functions for auth state.

package/lib/google/service.js

@@ -1,54 +1,30 @@
-import { requestAuth, resetAuthState } from "../auth/dispatch/auth";
-import { requestAuthentication, resetAuthenticationState, updateAuthentication, } from "../auth/dispatch/authentication";
-import { resetCredentialsState } from "../auth/dispatch/credentials";
-import { resetTokenState, updateToken } from "../auth/dispatch/token";
-import { AUTHENTICATION_STATUS } from "../auth/types/authentication";
-import { fetchProfile, getAuthenticationRequestOptions } from "./utils/auth";
+import { OAUTH_FLOW } from "../config/entities";
+import { login as authorizationCodeFlowLogin } from "./services/authorizationCodeFlow";
+import { logout } from "./services/common";
+import { login as implicitFlowLogin } from "./services/implicitFlow";
 /**
  * Google Sign-In service.
  */
 export const service = {
     /**
      * Login with Google OAuth.
+     * Dispatches to the configured flow based on `provider.flow`.
      * @param provider - OAuth provider configuration.
      * @param dispatch - Dispatch functions for auth state.
      */
     login: (provider, dispatch) => {
-        const client = google.accounts.oauth2.initTokenClient({
-            callback: (response) => {
-                const { id, profile, userinfo } = provider;
-                const { access_token: token } = response;
-                dispatch.authDispatch?.(requestAuth());
-                dispatch.authenticationDispatch?.(requestAuthentication());
-                dispatch.tokenDispatch?.(updateToken({ providerId: id, token }));
-                fetchProfile(userinfo, getAuthenticationRequestOptions(token), {
-                    onError: () => {
-                        dispatch.authDispatch?.(resetAuthState());
-                        dispatch.authenticationDispatch?.(updateAuthentication({
-                            profile: undefined,
-                            status: AUTHENTICATION_STATUS.SETTLED,
-                        }));
-                        dispatch.tokenDispatch?.(resetTokenState());
-                    },
-                    onSuccess: (r) => dispatch.authenticationDispatch?.(updateAuthentication({
-                        profile: profile(r),
-                        status: AUTHENTICATION_STATUS.PENDING, // Authentication is pending until session controller is resolved.
-                    })),
-                });
-            },
-            client_id: provider.clientId,
-            scope: provider.authorization.params.scope,
-        });
-        client.requestAccessToken();
+        if (provider.flow === OAUTH_FLOW.AUTHORIZATION_CODE) {
+            authorizationCodeFlowLogin(provider, dispatch);
+        }
+        else {
+            implicitFlowLogin(provider, dispatch);
+        }
     },
     /**
      * Logout and clear all auth state.
      * @param dispatch - Dispatch functions for auth state.
      */
     logout: (dispatch) => {
-        dispatch.authDispatch?.(resetAuthState());
-        dispatch.authenticationDispatch?.(resetAuthenticationState());
-        dispatch.credentialsDispatch?.(resetCredentialsState());
-        dispatch.tokenDispatch?.(resetTokenState());
+        logout(dispatch);
     },
 };

package/lib/google/services/authorizationCodeFlow.d.ts

@@ -0,0 +1,10 @@
+import type { AuthorizationCodeFlowProvider } from "../../config/entities";
+import { type LoginDispatch } from "./common";
+/**
+ * Login using the OAuth 2.0 authorization code flow.
+ * Uses Google's initCodeClient to request an authorization code,
+ * then exchanges it for an access token via the configured authorize endpoint.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export declare function login(provider: AuthorizationCodeFlowProvider, dispatch: LoginDispatch): void;

package/lib/google/services/authorizationCodeFlow.js

@@ -0,0 +1,38 @@
+import { createOnAccessToken, createResetSession, } from "./common";
+/**
+ * Login using the OAuth 2.0 authorization code flow.
+ * Uses Google's initCodeClient to request an authorization code,
+ * then exchanges it for an access token via the configured authorize endpoint.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export function login(provider, dispatch) {
+    const { authorize } = provider;
+    const resetSession = createResetSession(dispatch);
+    const onAccessToken = createOnAccessToken(provider, dispatch, resetSession);
+    const client = google.accounts.oauth2.initCodeClient({
+        callback: (response) => {
+            fetch(authorize, {
+                body: JSON.stringify(response),
+                headers: { "Content-Type": "application/json" },
+                method: "POST",
+            })
+                .then((r) => {
+                if (!r.ok) {
+                    throw new Error(`authorize request failed (${r.status})`);
+                }
+                return r.json();
+            })
+                .then((tokens) => {
+                if (!tokens?.access_token) {
+                    throw new Error("authorize response missing access_token");
+                }
+                onAccessToken(tokens.access_token);
+            })
+                .catch(resetSession);
+        },
+        client_id: provider.clientId,
+        scope: provider.authorization.params.scope,
+    });
+    client.requestCode();
+}

package/lib/google/services/common.d.ts

@@ -0,0 +1,23 @@
+import type { OAuthProvider } from "../../config/entities";
+import type { SessionDispatch } from "../types";
+export type LoginDispatch = Pick<SessionDispatch, "authDispatch" | "authenticationDispatch" | "tokenDispatch">;
+/**
+ * Creates a function that resets the session state on auth failure.
+ * @param dispatch - Dispatch functions for auth state.
+ * @returns reset session function.
+ */
+export declare function createResetSession(dispatch: LoginDispatch): () => void;
+/**
+ * Creates a function that handles a successful access token.
+ * Dispatches auth state updates and fetches the user profile.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ * @param resetSession - Reset session function.
+ * @returns on access token function.
+ */
+export declare function createOnAccessToken(provider: OAuthProvider, dispatch: LoginDispatch, resetSession: () => void): (token: string) => void;
+/**
+ * Logout and clear all auth state.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export declare function logout(dispatch: SessionDispatch): void;

package/lib/google/services/common.js

@@ -0,0 +1,54 @@
+import { requestAuth, resetAuthState } from "../../auth/dispatch/auth";
+import { requestAuthentication, resetAuthenticationState, updateAuthentication, } from "../../auth/dispatch/authentication";
+import { resetCredentialsState } from "../../auth/dispatch/credentials";
+import { resetTokenState, updateToken } from "../../auth/dispatch/token";
+import { AUTHENTICATION_STATUS } from "../../auth/types/authentication";
+import { fetchProfile, getAuthenticationRequestOptions } from "../utils/auth";
+/**
+ * Creates a function that resets the session state on auth failure.
+ * @param dispatch - Dispatch functions for auth state.
+ * @returns reset session function.
+ */
+export function createResetSession(dispatch) {
+    return () => {
+        dispatch.authDispatch?.(resetAuthState());
+        dispatch.authenticationDispatch?.(updateAuthentication({
+            profile: undefined,
+            status: AUTHENTICATION_STATUS.SETTLED,
+        }));
+        dispatch.tokenDispatch?.(resetTokenState());
+    };
+}
+/**
+ * Creates a function that handles a successful access token.
+ * Dispatches auth state updates and fetches the user profile.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ * @param resetSession - Reset session function.
+ * @returns on access token function.
+ */
+export function createOnAccessToken(provider, dispatch, resetSession) {
+    const { id, profile, userinfo } = provider;
+    return (token) => {
+        dispatch.authDispatch?.(requestAuth());
+        dispatch.authenticationDispatch?.(requestAuthentication());
+        dispatch.tokenDispatch?.(updateToken({ providerId: id, token }));
+        fetchProfile(userinfo, getAuthenticationRequestOptions(token), {
+            onError: resetSession,
+            onSuccess: (r) => dispatch.authenticationDispatch?.(updateAuthentication({
+                profile: profile(r),
+                status: AUTHENTICATION_STATUS.PENDING,
+            })),
+        });
+    };
+}
+/**
+ * Logout and clear all auth state.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export function logout(dispatch) {
+    dispatch.authDispatch?.(resetAuthState());
+    dispatch.authenticationDispatch?.(resetAuthenticationState());
+    dispatch.credentialsDispatch?.(resetCredentialsState());
+    dispatch.tokenDispatch?.(resetTokenState());
+}

package/lib/google/services/implicitFlow.d.ts

@@ -0,0 +1,9 @@
+import type { ImplicitFlowProvider } from "../../config/entities";
+import { type LoginDispatch } from "./common";
+/**
+ * Login using the OAuth 2.0 implicit flow.
+ * Uses Google's initTokenClient to request an access token directly.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export declare function login(provider: ImplicitFlowProvider, dispatch: LoginDispatch): void;

package/lib/google/services/implicitFlow.js

@@ -0,0 +1,17 @@
+import { createOnAccessToken, createResetSession, } from "./common";
+/**
+ * Login using the OAuth 2.0 implicit flow.
+ * Uses Google's initTokenClient to request an access token directly.
+ * @param provider - OAuth provider configuration.
+ * @param dispatch - Dispatch functions for auth state.
+ */
+export function login(provider, dispatch) {
+    const resetSession = createResetSession(dispatch);
+    const onAccessToken = createOnAccessToken(provider, dispatch, resetSession);
+    const client = google.accounts.oauth2.initTokenClient({
+        callback: (response) => onAccessToken(response.access_token),
+        client_id: provider.clientId,
+        scope: provider.authorization.params.scope,
+    });
+    client.requestAccessToken();
+}

package/lib/google/types.d.ts

@@ -3,6 +3,17 @@ import { AuthAction, AuthContextProps } from "../auth/types/auth";
 import { AuthenticationAction, AuthenticationContextProps } from "../auth/types/authentication";
 import { CredentialsAction, CredentialsContextProps } from "../auth/types/credentials";
 import { TokenAction, TokenContextProps, TokenState } from "../auth/types/token";
+/**
+ * Authorization code response from Google OAuth.
+ */
+export interface CodeResponse {
+    code?: string;
+    error?: string;
+    error_description?: string;
+    error_uri?: string;
+    scope?: string;
+    state?: string;
+}
 /**
  * Google Sign-In authentication provider props.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@databiosphere/findable-ui",
-  "version": "51.1.0",
+  "version": "52.0.0",
   "description": "",
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
@@ -44,7 +44,6 @@
     "@types/jest": "^29.5.14",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@types/react-gtm-module": "^2.0.1",
     "@types/react-window": "^1.8.5",
     "@typescript-eslint/eslint-plugin": "^8.50.0",
     "eslint": "^8.57.1",
@@ -88,7 +87,6 @@
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-dropzone": "^14.3.8",
-    "react-gtm-module": "^2.0.11",
     "react-idle-timer": "^5.7.2",
     "react-window": "^1.8.11",
     "rehype-raw": "^7.0.0",