@gasboost/auth 0.2.0 → 0.3.0

package/README.md

@@ -526,60 +526,6 @@ const pepper =
   PropertiesService.getScriptProperties().getProperty("AUTH_PEPPER");
 ```
 
-## `@gasboost/app` との連携
-
-`AppsScriptAuth` は、RPC 登録用の handler collection を `auth.handlers` として公開します。
-
-`@gasboost/app` の `.calls()` にそのまま渡すことで、認証用 RPC を一括登録できます。
-
-```ts
-import { AppsScript } from "@gasboost/app";
-import { AppsScriptAuth } from "@gasboost/auth";
-
-const auth = new AppsScriptAuth({
-  repository,
-  runtime,
-  session: {
-    storageType: "cache",
-  },
-  emailPassword: {
-    enabled: true,
-    pepper: "your-secret-pepper",
-  },
-  appsScript: {
-    enabled: true,
-  },
-});
-
-const app = new AppsScript().calls(auth.handlers);
-
-export default app;
-```
-
-以下の RPC が登録されます。
-
-- `signInEmail`
-- `signInAppsScript`
-- `signUpEmail`
-- `signUpAppsScript`
-- `getSession`
-- `signOut`
-
-`InferAppsScript` を利用するクライアントでは、これらの RPC がそのまま型推論されます。
-
-```ts
-client.signInEmail({
-  email: "user@example.com",
-  password: "password",
-});
-
-client.getSession("session-id");
-
-client.signOut("session-id");
-```
-
-RPC endpoint 名は `@gasboost/auth` 側で管理されるため、利用側で個別に `.call()` を記述したり、endpoint 名を重複定義したりする必要はありません。
-
 ## Testing
 
 GAS API を利用するテストでは `gasboost/fake` を使用できます。

package/dist/AppsScriptAuth.d.ts

@@ -26,28 +26,15 @@ type AppsScriptAuthConfig<TEmailPassword extends EmailPasswordAuthOptions | unde
     appsScript?: AppsScriptAuthenticationOptions;
     hooks?: AuthHooks<THookResult>;
 };
-type BaseHandlers<THookResult> = {
-    signInEmail: AppsScriptAuthSignIn<THookResult>["email"];
-    signInAppsScript: AppsScriptAuthSignIn<THookResult>["appsScript"];
-    signUpEmail: AppsScriptAuthSignUp["email"];
-    signUpAppsScript: AppsScriptAuthSignUp["appsScript"];
-    getSession: AppsScriptAuthSession["get"];
-    signOut: AppsScriptAuthSignOut["execute"];
-};
-type PasswordHandlers = {
-    forgotPassword: AppsScriptAuthPassword["forgot"];
-    resetPassword: AppsScriptAuthPassword["reset"];
-};
-type AppsScriptAuthHandlers<TEmailPassword, THookResult> = TEmailPassword extends {
+type AppsScriptAuthPasswordApi<TEmailPassword> = TEmailPassword extends {
     passwordReset: unknown;
-} ? BaseHandlers<THookResult> & PasswordHandlers : BaseHandlers<THookResult>;
+} ? AppsScriptAuthPassword : undefined;
 export declare class AppsScriptAuth<TEmailPassword extends EmailPasswordAuthOptions | undefined = undefined, THookResult = undefined> {
     readonly signIn: AppsScriptAuthSignIn<THookResult>;
     readonly signUp: AppsScriptAuthSignUp;
     readonly session: AppsScriptAuthSession;
     readonly signOut: AppsScriptAuthSignOut;
-    readonly password: AppsScriptAuthPassword | undefined;
+    readonly password: AppsScriptAuthPasswordApi<TEmailPassword>;
     constructor({ repository, session, runtime, emailPassword, appsScript, hooks, }: AppsScriptAuthConfig<TEmailPassword, THookResult>);
-    get handlers(): AppsScriptAuthHandlers<TEmailPassword, THookResult>;
 }
 export {};

package/dist/AppsScriptAuth.js

@@ -51,32 +51,12 @@ export class AppsScriptAuth {
             sessionStorage,
         });
         this.signOut = new AppsScriptAuthSignOut(sessionStorage);
-        if (emailPasswordConfig?.passwordReset) {
-            this.password = new AppsScriptAuthPassword({
+        this.password = (emailPasswordConfig?.passwordReset
+            ? new AppsScriptAuthPassword({
                 repository,
                 utilities: runtime.utilities,
                 emailPassword: emailPasswordConfig,
-            });
-        }
-        else {
-            this.password = undefined;
-        }
-    }
-    get handlers() {
-        const handlers = {
-            signInEmail: this.signIn.email,
-            signInAppsScript: this.signIn.appsScript,
-            signUpEmail: this.signUp.email,
-            signUpAppsScript: this.signUp.appsScript,
-            getSession: this.session.get.bind(this.session),
-            signOut: this.signOut.execute.bind(this.signOut),
-            ...(this.password
-                ? {
-                    forgotPassword: this.password.forgot.bind(this.password),
-                    resetPassword: this.password.reset.bind(this.password),
-                }
-                : {}),
-        };
-        return handlers;
+            })
+            : undefined);
     }
 }

package/dist/schema/AuthSchema.d.ts

@@ -58,7 +58,45 @@ export type AuthSchema = {
         };
     };
 };
-export declare class AuthSchemaConfig {
-    readonly schema: AuthSchema;
-    constructor(options?: AuthSchemaOptions);
+type Section<O, K extends PropertyKey> = K extends keyof O ? O[K] : undefined;
+type Fields<T> = [T] extends [null | undefined] ? undefined : "fields" extends keyof NonNullable<T> ? NonNullable<T>["fields"] : undefined;
+type PropertyOrDefault<T, K extends PropertyKey, Default extends string> = [
+    T
+] extends [null | undefined] ? Default : K extends keyof NonNullable<T> ? Exclude<NonNullable<T>[K], undefined> extends infer Value ? [Value] extends [never] ? Default : Value extends string ? Value : Default : Default : Default;
+type ResolveAuthSchema<O extends AuthSchemaOptions> = {
+    dbId: O["dbId"];
+    user: {
+        modelName: PropertyOrDefault<Section<O, "user">, "modelName", "user">;
+        fields: {
+            id: PropertyOrDefault<Fields<Section<O, "user">>, "id", "id">;
+            name: PropertyOrDefault<Fields<Section<O, "user">>, "name", "name">;
+        };
+    };
+    account: {
+        modelName: PropertyOrDefault<Section<O, "account">, "modelName", "account">;
+        fields: {
+            id: PropertyOrDefault<Fields<Section<O, "account">>, "id", "id">;
+            userId: PropertyOrDefault<Fields<Section<O, "account">>, "userId", "userId">;
+            provider: PropertyOrDefault<Fields<Section<O, "account">>, "provider", "provider">;
+            providerAccountId: PropertyOrDefault<Fields<Section<O, "account">>, "providerAccountId", "providerAccountId">;
+            passwordHash: PropertyOrDefault<Fields<Section<O, "account">>, "passwordHash", "passwordHash">;
+        };
+    };
+    passwordReset: {
+        modelName: PropertyOrDefault<Section<O, "passwordReset">, "modelName", "passwordReset">;
+        fields: {
+            id: PropertyOrDefault<Fields<Section<O, "passwordReset">>, "id", "id">;
+            accountId: PropertyOrDefault<Fields<Section<O, "passwordReset">>, "accountId", "accountId">;
+            tokenHash: PropertyOrDefault<Fields<Section<O, "passwordReset">>, "tokenHash", "tokenHash">;
+            expiresAt: PropertyOrDefault<Fields<Section<O, "passwordReset">>, "expiresAt", "expiresAt">;
+            enabled: PropertyOrDefault<Fields<Section<O, "passwordReset">>, "enabled", "enabled">;
+        };
+    };
+};
+export declare class AuthSchemaConfig<const O extends AuthSchemaOptions = {
+    dbId: "";
+}> {
+    readonly schema: ResolveAuthSchema<O>;
+    constructor(options?: O);
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasboost/auth",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Modern authentication for Google Apps Script with email/password, Apps Script authentication, sessions, and password reset.",
   "keywords": [
     "google-apps-script",
@@ -39,7 +39,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@gasboost/app": "^1.3.0",
     "@gasboost/fake-core": "^0.1.2",
     "@gasboost/fake-node": "^0.1.2",
     "@types/google-apps-script": "^2.0.13"