@kubun/provider-google 0.16.0 → 0.17.1

package/lib/api.d.ts

@@ -0,0 +1,32 @@
+export type GoogleErrorBody = {
+    message: string;
+    status?: string;
+};
+export type GoogleAPIFailure = {
+    httpStatus: number;
+    message: string;
+    googleStatus?: string;
+};
+export type GoogleAPIClientConfig = {
+    api: string;
+    accessToken: string;
+    fetch?: typeof globalThis.fetch;
+    toError: (failure: GoogleAPIFailure) => Error;
+};
+export type GoogleAPIGetOptions = {
+    signal?: AbortSignal;
+};
+export type GoogleAPISendOptions = {
+    method: string;
+    body?: unknown;
+    headers?: Record<string, string>;
+    signal?: AbortSignal;
+};
+export type GoogleAPIClient = {
+    get<T>(url: string, options?: GoogleAPIGetOptions): Promise<T>;
+    send<T>(url: string, options: GoogleAPISendOptions): Promise<T>;
+    request(url: string, options?: GoogleAPISendOptions): Promise<Response>;
+    fail(response: Response): Promise<never>;
+};
+export declare function parseGoogleErrorBody(response: Response): Promise<GoogleErrorBody>;
+export declare function createGoogleAPIClient(config: GoogleAPIClientConfig): GoogleAPIClient;

package/lib/api.js

@@ -0,0 +1,61 @@
+export async function parseGoogleErrorBody(response) {
+    try {
+        const body = await response.json();
+        return {
+            message: body.error?.message ?? `${response.status} ${response.statusText}`,
+            status: body.error?.status
+        };
+    } catch  {
+        return {
+            message: `${response.status} ${response.statusText}`
+        };
+    }
+}
+export function createGoogleAPIClient(config) {
+    const fetchFn = config.fetch ?? globalThis.fetch;
+    async function request(url, options) {
+        return fetchFn(url, {
+            ...options?.method != null ? {
+                method: options.method
+            } : {},
+            headers: {
+                Authorization: `Bearer ${config.accessToken}`,
+                ...options?.body !== undefined ? {
+                    'Content-Type': 'application/json'
+                } : {},
+                ...options?.headers
+            },
+            ...options?.body !== undefined ? {
+                body: JSON.stringify(options.body)
+            } : {},
+            signal: options?.signal
+        });
+    }
+    async function fail(response) {
+        const detail = await parseGoogleErrorBody(response);
+        throw config.toError({
+            httpStatus: response.status,
+            message: `${config.api} error: ${detail.message}`,
+            googleStatus: detail.status
+        });
+    }
+    async function get(url, options) {
+        const response = await request(url, {
+            method: 'GET',
+            signal: options?.signal
+        });
+        if (!response.ok) return fail(response);
+        return await response.json();
+    }
+    async function send(url, options) {
+        const response = await request(url, options);
+        if (!response.ok) return fail(response);
+        return await response.json();
+    }
+    return {
+        get,
+        send,
+        request,
+        fail
+    };
+}

package/lib/index.d.ts

@@ -1,7 +1,15 @@
-import type { OAuthProviderDefinition } from '@kubun/credential-types';
+import type { OAuthProviderDefinition } from '@kokuin/oauth';
+export { createGoogleAPIClient, type GoogleAPIClient, type GoogleAPIClientConfig, type GoogleAPIFailure, type GoogleAPIGetOptions, type GoogleAPISendOptions, type GoogleErrorBody, parseGoogleErrorBody, } from './api.js';
+export declare const googleAuthorizationParams: Record<string, string>;
 type CreateGoogleProviderParams = {
+    mode: 'confidential';
     clientID: string;
     clientSecret: string;
+} | {
+    mode: 'native';
+    clientID: string;
+    clientSecret?: string;
+};
+export declare function createGoogleProvider(params: CreateGoogleProviderParams): OAuthProviderDefinition & {
+    authorizationParams?: Record<string, string>;
 };
-export declare function createGoogleProvider(params: CreateGoogleProviderParams): OAuthProviderDefinition;
-export {};

package/lib/index.js

@@ -1,11 +1,19 @@
+export { createGoogleAPIClient, parseGoogleErrorBody } from './api.js';
+export const googleAuthorizationParams = {
+    // Offline access requests a refresh token (issuance stays provider-dependent);
+    // consent keeps that guarantee for repeat authorizations. select_account forces
+    // the account chooser, avoiding the multi-account authuser dead-end.
+    access_type: 'offline',
+    prompt: 'select_account consent'
+};
 export function createGoogleProvider(params) {
     if (!params.clientID) {
         throw new Error('Google provider requires a non-empty clientID');
     }
-    if (!params.clientSecret) {
-        throw new Error('Google provider requires a non-empty clientSecret');
+    if (params.mode === 'confidential' && !params.clientSecret) {
+        throw new Error('A confidential Google provider requires a non-empty clientSecret');
     }
-    return {
+    const base = {
         name: 'google',
         authorizationEndpoint: 'https://accounts.google.com/o/oauth2/v2/auth',
         tokenEndpoint: 'https://oauth2.googleapis.com/token',
@@ -14,7 +22,19 @@ export function createGoogleProvider(params) {
             'profile',
             'email'
         ],
+        authorizationParams: googleAuthorizationParams
+    };
+    return params.mode === 'confidential' ? {
+        ...base,
+        mode: 'confidential',
         clientID: params.clientID,
         clientSecret: params.clientSecret
+    } : {
+        ...base,
+        mode: 'native',
+        clientID: params.clientID,
+        ...params.clientSecret ? {
+            clientSecret: params.clientSecret
+        } : {}
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/provider-google",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,7 +15,7 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@kubun/credential-types": "^0.16.0"
+    "@kokuin/oauth": "^0.1.1"
   },
   "publishConfig": {
     "access": "public"
@@ -23,8 +23,8 @@
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "build:clean": "del lib",
-    "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
-    "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
+    "build:js": "del 'lib/**/*.js' && swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
+    "build:types": "del 'lib/**/*.d.ts' 'lib/**/*.d.ts.map' && tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "test": "pnpm run test:types && pnpm run test:unit",
     "test:types": "tsc --noEmit -p tsconfig.test.json",