@gasboost/auth 0.5.0 → 0.7.0

package/README.md

@@ -258,6 +258,51 @@ User 検索
 Session 発行
 ```
 
+## Registration (without Session)
+
+`auth.registration` は、Session を発行せずに
+User と Account を登録するサーバー内部APIです。
+
+管理者によるユーザー登録など、
+登録対象ユーザーとしてサインインする必要がない場合に使用します。
+
+### Email / Password
+
+```ts
+const user = await auth.registration.email({
+  name: "Taro",
+  email: "taro@example.com",
+  password: temporaryPassword,
+});
+```
+
+### Apps Script
+
+```ts
+const user = await auth.registration.appsScript({
+  name: "Taro",
+});
+```
+
+Apps Script方式では
+`Session.getActiveUser().getEmail()` を使用するため、
+任意の他ユーザーを指定して登録することはできません。
+
+### Sign Upとの違い
+
+| API                              | User + Account | Session発行 |
+| -------------------------------- | -------------- | ----------- |
+| `auth.registration.email()`      | 作成           | なし        |
+| `auth.registration.appsScript()` | 作成           | なし        |
+| `auth.signUp.email()`            | 作成           | あり        |
+| `auth.signUp.appsScript()`       | 作成           | あり        |
+
+`isSignupEnabled: false` でも、
+認証方式自体が `enabled: true` ならRegistrationは利用できます。
+
+Registrationはメール送信やRole付与を行いません。
+呼び出し元で認証・認可を実施してください。
+
 ## Apps Script Sign Up
 
 Apps Script 認証では `Session.getActiveUser().getEmail()` を Identity として利用します。
@@ -294,7 +339,8 @@ Session 発行
 
 `@gasboost/auth` は、認証成功後に外部処理を実行するための lifecycle hook を提供します。
 
-現在は `afterSignIn` を利用できます。
+現在は `afterSignIn` を利用できます。Sign In と、Session を自動発行する Sign Up の
+email / Apps Script 両経路で、Session 保存後に同じ Hook を1回 await します。
 
 ```ts
 import { AppsScriptAuth, type EmailPasswordAuthOptions } from "@gasboost/auth";
@@ -339,7 +385,7 @@ hooks: {
 },
 ```
 
-hook の戻り値は Sign In result の `hooks` から取得できます。
+hook の戻り値は Sign In / Sign Up result の `hooks` から取得できます。
 
 ```ts
 const result = await auth.signIn.email({
@@ -364,7 +410,7 @@ const auth = new AppsScriptAuth<EmailPasswordAuthOptions, HookResult>({
 });
 ```
 
-hook を設定しない場合、従来どおり Sign In result は `user` と `session` のみを返します。
+hook を設定しない場合、従来どおり Sign In / Sign Up result は `user` と `session` のみを返します。
 
 ```ts
 const auth = new AppsScriptAuth({
@@ -403,7 +449,7 @@ hooks: {
 
 ### Hook Failure
 
-`afterSignIn` は Sign In 処理の一部として扱われます。
+`afterSignIn` は Sign In / Sign Up 処理の一部として扱われます。
 
 処理順序は以下です。
 
@@ -421,9 +467,11 @@ afterSignIn
 Sign In result
 ```
 
-`afterSignIn` で例外が発生した場合、Sign In 全体が失敗します。
+`afterSignIn` で例外が発生した場合、Sign In / Sign Up 全体が失敗します。
 
 その際、すでに保存された Session は SessionStorage から削除されます。
+削除が失敗しても元の Hook エラーを返します。Sign Up で作成済みの User / Account は削除しません。
+登録は完了しているため、再認証には Sign In を使い、Sign Up を自動再試行しないでください。
 
 ```text
 afterSignIn error

package/dist/AppsScriptAuth.d.ts

@@ -1,4 +1,5 @@
 import { AppsScriptAuthPassword } from "./api/AppsScriptAuthPassword";
+import { AppsScriptAuthRegistration } from "./api/AppsScriptAuthRegistration";
 import { AppsScriptAuthSession } from "./api/AppsScriptAuthSession";
 import { AppsScriptAuthSignIn } from "./api/AppsScriptAuthSignIn";
 import { AppsScriptAuthSignOut } from "./api/AppsScriptAuthSignOut";
@@ -31,10 +32,11 @@ type AppsScriptAuthPasswordApi<TEmailPassword> = TEmailPassword extends {
 } ? AppsScriptAuthPassword : undefined;
 export declare class AppsScriptAuth<TEmailPassword extends EmailPasswordAuthOptions | undefined = undefined, THookResult = undefined> {
     readonly signIn: AppsScriptAuthSignIn<THookResult>;
-    readonly signUp: AppsScriptAuthSignUp;
+    readonly signUp: AppsScriptAuthSignUp<THookResult>;
     readonly session: AppsScriptAuthSession;
     readonly signOut: AppsScriptAuthSignOut;
     readonly password: AppsScriptAuthPasswordApi<TEmailPassword>;
+    readonly registration: AppsScriptAuthRegistration;
     constructor({ repository, session, runtime, emailPassword, appsScript, hooks, }: AppsScriptAuthConfig<TEmailPassword, THookResult>);
 }
 export {};

package/dist/AppsScriptAuth.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppsScriptAuth = void 0;
 const AppsScriptAuthPassword_1 = require("./api/AppsScriptAuthPassword");
+const AppsScriptAuthRegistration_1 = require("./api/AppsScriptAuthRegistration");
 const AppsScriptAuthSession_1 = require("./api/AppsScriptAuthSession");
 const AppsScriptAuthSignIn_1 = require("./api/AppsScriptAuthSignIn");
 const AppsScriptAuthSignOut_1 = require("./api/AppsScriptAuthSignOut");
@@ -15,6 +16,7 @@ class AppsScriptAuth {
     session;
     signOut;
     password;
+    registration;
     constructor({ repository, session, runtime, emailPassword, appsScript, hooks, }) {
         const sessionStorage = (0, sessionStorageFactory_1.sessionStorageFactory)(session.storageType, {
             cacheService: runtime.cacheService,
@@ -42,6 +44,7 @@ class AppsScriptAuth {
                 : {}),
         });
         this.signUp = new AppsScriptAuthSignUp_1.AppsScriptAuthSignUp({
+            afterSignIn: hooks?.afterSignIn,
             sessionStorage,
             expiresIn,
             repository,
@@ -61,6 +64,13 @@ class AppsScriptAuth {
                 emailPassword: emailPasswordConfig,
             })
             : undefined);
+        this.registration = new AppsScriptAuthRegistration_1.AppsScriptAuthRegistration({
+            emailPassword: emailPasswordConfig,
+            appsScript: appsScriptConfig,
+            repository,
+            utilities: runtime.utilities,
+            session: runtime.session,
+        });
     }
 }
 exports.AppsScriptAuth = AppsScriptAuth;

package/dist/api/AppsScriptAuthRegistration.d.ts

@@ -0,0 +1,19 @@
+import type { AppsScriptAuthenticationConfig } from "../authentication/AppsScriptAuthentication";
+import type { EmailPasswordAuthConfig } from "../authentication/EmailPasswordAuthentication";
+import type { User } from "../domain/User";
+import { type AppsScriptRegistrationInput } from "../registration/AppsScriptRegistration";
+import { type EmailPasswordRegistrationInput } from "../registration/EmailPasswordRegistration";
+import type { AppsScriptAuthRepository } from "../storage/AppsScriptAuthRepository";
+export declare class AppsScriptAuthRegistration {
+    private readonly emailPasswordRegistration?;
+    private readonly appsScriptRegistration?;
+    constructor({ emailPassword, appsScript, repository, utilities, session, }: {
+        emailPassword?: EmailPasswordAuthConfig;
+        appsScript?: AppsScriptAuthenticationConfig;
+        repository: AppsScriptAuthRepository;
+        utilities: GoogleAppsScript.Utilities.Utilities;
+        session: GoogleAppsScript.Base.Session;
+    });
+    email(input: EmailPasswordRegistrationInput): Promise<User>;
+    appsScript(input: AppsScriptRegistrationInput): Promise<User>;
+}

package/dist/api/AppsScriptAuthRegistration.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppsScriptAuthRegistration = void 0;
+const AppsScriptRegistration_1 = require("../registration/AppsScriptRegistration");
+const EmailPasswordRegistration_1 = require("../registration/EmailPasswordRegistration");
+class AppsScriptAuthRegistration {
+    emailPasswordRegistration;
+    appsScriptRegistration;
+    constructor({ emailPassword, appsScript, repository, utilities, session, }) {
+        if (emailPassword?.enabled) {
+            this.emailPasswordRegistration = new EmailPasswordRegistration_1.EmailPasswordRegistration(repository, utilities, emailPassword);
+        }
+        if (appsScript?.enabled) {
+            this.appsScriptRegistration = new AppsScriptRegistration_1.AppsScriptRegistration(utilities, session, repository);
+        }
+    }
+    async email(input) {
+        if (!this.emailPasswordRegistration) {
+            throw new Error("Email and password authentication is disabled");
+        }
+        return this.emailPasswordRegistration.register(input);
+    }
+    async appsScript(input) {
+        if (!this.appsScriptRegistration) {
+            throw new Error("Apps Script authentication is disabled");
+        }
+        return this.appsScriptRegistration.register(input);
+    }
+}
+exports.AppsScriptAuthRegistration = AppsScriptAuthRegistration;

package/dist/api/AppsScriptAuthSignUp.d.ts

@@ -1,16 +1,18 @@
 import type { AppsScriptAuthenticationConfig } from "../authentication/AppsScriptAuthentication";
 import type { EmailPasswordAuthConfig } from "../authentication/EmailPasswordAuthentication";
+import type { AfterSignInHook } from "../hooks/AuthHooks";
 import { type AppsScriptRegistrationInput } from "../registration/AppsScriptRegistration";
 import { type EmailPasswordRegistrationInput } from "../registration/EmailPasswordRegistration";
 import type { AppsScriptAuthRepository } from "../storage/AppsScriptAuthRepository";
 import type { AppsScriptSessionStorage } from "../storage/AppsScriptSessionStorage";
 import { SignUp } from "./SignUp";
-export declare class AppsScriptAuthSignUp {
-    email: SignUp<EmailPasswordRegistrationInput>["execute"];
-    appsScript: SignUp<AppsScriptRegistrationInput>["execute"];
-    constructor({ sessionStorage, expiresIn, repository, emailPassword, appsScript, utilities, session, }: {
+export declare class AppsScriptAuthSignUp<THookResult = undefined> {
+    email: SignUp<EmailPasswordRegistrationInput, THookResult>["execute"];
+    appsScript: SignUp<AppsScriptRegistrationInput, THookResult>["execute"];
+    constructor({ sessionStorage, expiresIn, afterSignIn, repository, emailPassword, appsScript, utilities, session, }: {
         sessionStorage: AppsScriptSessionStorage;
         expiresIn: number;
+        afterSignIn?: AfterSignInHook<THookResult>;
         repository: AppsScriptAuthRepository;
         emailPassword?: EmailPasswordAuthConfig;
         appsScript?: AppsScriptAuthenticationConfig;

package/dist/api/AppsScriptAuthSignUp.js

@@ -7,7 +7,7 @@ const SignUp_1 = require("./SignUp");
 class AppsScriptAuthSignUp {
     email;
     appsScript;
-    constructor({ sessionStorage, expiresIn, repository, emailPassword, appsScript, utilities, session, }) {
+    constructor({ sessionStorage, expiresIn, afterSignIn, repository, emailPassword, appsScript, utilities, session, }) {
         this.email = async (input) => {
             if (!emailPassword) {
                 throw new Error("Email and password authentication is disabled");
@@ -15,6 +15,7 @@ class AppsScriptAuthSignUp {
             emailPassword.ensureSignUpEnabled();
             const emailSignUp = new SignUp_1.SignUp({
                 sessionStorage,
+                afterSignIn,
                 expiresIn,
                 registration: new EmailPasswordRegistration_1.EmailPasswordRegistration(repository, utilities, emailPassword),
                 utilities,
@@ -28,6 +29,7 @@ class AppsScriptAuthSignUp {
             appsScript.ensureSignUpEnabled();
             const appsScriptSignUp = new SignUp_1.SignUp({
                 sessionStorage,
+                afterSignIn,
                 expiresIn,
                 registration: new AppsScriptRegistration_1.AppsScriptRegistration(utilities, session, repository),
                 utilities,

package/dist/api/SignUp.d.ts

@@ -1,20 +1,20 @@
-import { Session } from "../domain/Session";
-import { User } from "../domain/User";
+import type { AfterSignInHook } from "../hooks/AuthHooks";
 import type { Registration } from "../registration/Registration";
 import type { AppsScriptSessionStorage } from "../storage/AppsScriptSessionStorage";
-export declare class SignUp<T> {
+import type { SignInResult } from "./SignIn";
+export type SignUpResult<THookResult = undefined> = SignInResult<THookResult>;
+export declare class SignUp<T, THookResult = undefined> {
+    private readonly afterSignIn;
     private readonly sessionStorage;
     private readonly registration;
     private readonly utilities;
     private readonly expiresIn;
-    constructor({ sessionStorage, registration, utilities, expiresIn, }: {
+    constructor({ sessionStorage, registration, utilities, expiresIn, afterSignIn, }: {
         sessionStorage: AppsScriptSessionStorage;
         registration: Registration<T>;
         utilities: GoogleAppsScript.Utilities.Utilities;
         expiresIn: number;
+        afterSignIn?: AfterSignInHook<THookResult>;
     });
-    execute(input: T): Promise<{
-        user: User;
-        session: Session;
-    }>;
+    execute(input: T): Promise<SignUpResult<THookResult>>;
 }

package/dist/api/SignUp.js

@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignUp = void 0;
 const Session_1 = require("../domain/Session");
 class SignUp {
+    afterSignIn;
     sessionStorage;
     registration;
     utilities;
     expiresIn;
-    constructor({ sessionStorage, registration, utilities, expiresIn, }) {
+    constructor({ sessionStorage, registration, utilities, expiresIn, afterSignIn, }) {
         this.sessionStorage = sessionStorage;
         this.registration = registration;
         this.utilities = utilities;
         this.expiresIn = expiresIn;
+        this.afterSignIn = afterSignIn;
     }
     async execute(input) {
         const user = await this.registration.register(input);
@@ -23,7 +25,22 @@ class SignUp {
             expiresAt: new Date(now.getTime() + this.expiresIn),
         });
         await this.sessionStorage.save(session);
-        return { user, session };
+        if (!this.afterSignIn) {
+            return { user, session };
+        }
+        try {
+            const hooks = await this.afterSignIn({ user, session });
+            return { user, session, hooks };
+        }
+        catch (error) {
+            try {
+                await this.sessionStorage.delete(session.id);
+            }
+            catch {
+                // Preserve the original hook error. Registration remains intact.
+            }
+            throw error;
+        }
     }
 }
 exports.SignUp = SignUp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasboost/auth",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Modern authentication for Google Apps Script with email/password, Apps Script authentication, sessions, and password reset.",
   "keywords": [
     "google-apps-script",