@oglofus/auth 1.1.1 → 1.1.2

package/dist/core/auth.d.ts

@@ -1,5 +1,5 @@
 import type { AuthRequestContext, CompleteProfileInput, DiscoverAccountDecision, DiscoverAccountInput, TwoFactorVerifyInput, UserBase } from "../types/model.js";
-import type { AnyPlugin, AuthConfig, AuthPublicApi, AuthenticateInputFromPlugins, PluginApiMap, PluginMethodsWithApi, RegisterInputFromPlugins } from "../types/plugins.js";
+import type { AnyPlugin, AuthConfig, AuthPublicApi, AuthenticateInputFromPlugins, PluginApiForMethod, PluginMethodsWithApi, RegisterInputFromPlugins } from "../types/plugins.js";
 import { type AuthResult, type OperationResult } from "../types/results.js";
 export declare class OglofusAuth<U extends UserBase, P extends readonly AnyPlugin<U>[]> implements AuthPublicApi<U, P> {
     private readonly config;
@@ -10,7 +10,7 @@ export declare class OglofusAuth<U extends UserBase, P extends readonly AnyPlugi
     discover(input: DiscoverAccountInput, request?: AuthRequestContext): Promise<OperationResult<DiscoverAccountDecision>>;
     authenticate(input: AuthenticateInputFromPlugins<P>, request?: AuthRequestContext): Promise<AuthResult<U>>;
     register(input: RegisterInputFromPlugins<P>, request?: AuthRequestContext): Promise<AuthResult<U>>;
-    method<M extends PluginMethodsWithApi<P>>(method: M): PluginApiMap<P>[M];
+    method<M extends PluginMethodsWithApi<P>>(method: M): PluginApiForMethod<P, M>;
     verifySecondFactor(input: TwoFactorVerifyInput, request?: AuthRequestContext): Promise<AuthResult<U>>;
     completeProfile(input: CompleteProfileInput<U>, request?: AuthRequestContext): Promise<AuthResult<U>>;
     validateSession(sessionId: string, _request?: AuthRequestContext): Promise<{

package/dist/plugins/email-otp.d.ts

@@ -9,4 +9,4 @@ export type EmailOtpPluginConfig<U extends UserBase, K extends keyof U> = {
     maxAttempts?: number;
     codeLength?: number;
 };
-export declare const emailOtpPlugin: <U extends UserBase, K extends keyof U>(config: EmailOtpPluginConfig<U, K>) => AuthMethodPlugin<"email_otp", EmailOtpRegisterInput<U, K>, EmailOtpAuthenticateInput, U, EmailOtpPluginApi>;
+export declare const emailOtpPlugin: <U extends UserBase, K extends keyof U>(config: EmailOtpPluginConfig<U, K>) => AuthMethodPlugin<"email_otp", EmailOtpRegisterInput<U, K>, EmailOtpAuthenticateInput, U, EmailOtpPluginApi, true, true>;

package/dist/plugins/magic-link.d.ts

@@ -8,4 +8,4 @@ export type MagicLinkPluginConfig<U extends UserBase, K extends keyof U> = {
     tokenTtlSeconds?: number;
     baseVerifyUrl: string;
 };
-export declare const magicLinkPlugin: <U extends UserBase, K extends keyof U>(config: MagicLinkPluginConfig<U, K>) => AuthMethodPlugin<"magic_link", MagicLinkRegisterInput<U, K>, MagicLinkAuthenticateInput, U, MagicLinkPluginApi>;
+export declare const magicLinkPlugin: <U extends UserBase, K extends keyof U>(config: MagicLinkPluginConfig<U, K>) => AuthMethodPlugin<"magic_link", MagicLinkRegisterInput<U, K>, MagicLinkAuthenticateInput, U, MagicLinkPluginApi, true, true>;

package/dist/plugins/oauth2.d.ts

@@ -38,11 +38,11 @@ export type OAuth2ProviderConfig<U extends UserBase, P extends string> = {
 };
 export type OAuth2PluginConfig<U extends UserBase, P extends string, K extends keyof U = never> = {
     providers: {
-        [Provider in P]: OAuth2ProviderConfig<U, Provider>;
+        [Provider in P]?: OAuth2ProviderConfig<U, Provider>;
     };
     accounts: OAuth2AccountAdapter<P>;
     requiredProfileFields?: readonly K[];
     pendingProfileTtlSeconds?: number;
 };
 export declare const arcticAuthorizationCodeExchange: (client: ArcticAuthorizationCodeClient) => OAuth2AuthorizationCodeExchange;
-export declare const oauth2Plugin: <U extends UserBase, P extends string, K extends keyof U = never>(config: OAuth2PluginConfig<U, P, K>) => AuthMethodPlugin<"oauth2", OAuth2AuthenticateInput<P>, OAuth2AuthenticateInput<P>, U>;
+export declare const oauth2Plugin: <U extends UserBase, P extends string, K extends keyof U = never>(config: OAuth2PluginConfig<U, P, K>) => AuthMethodPlugin<"oauth2", OAuth2AuthenticateInput<P>, OAuth2AuthenticateInput<P>, U, never, false, false>;

package/dist/plugins/organizations.d.ts

@@ -9,4 +9,4 @@ export type OrganizationsPluginOptions<O extends OrganizationBase, Role extends
         nextRole: Role;
     }) => boolean | Promise<boolean>;
 };
-export declare const organizationsPlugin: <U extends UserBase, O extends OrganizationBase, Role extends string, M extends MembershipBase<Role>, Permission extends string, Feature extends string, LimitKey extends string, RequiredOrgFields extends keyof O = never>(config: OrganizationsPluginOptions<O, Role, M, Permission, Feature, LimitKey, RequiredOrgFields>) => DomainPlugin<"organizations", U, OrganizationsPluginApi<O, Role, M, Permission, Feature, LimitKey, RequiredOrgFields>>;
+export declare const organizationsPlugin: <U extends UserBase, O extends OrganizationBase, Role extends string, M extends MembershipBase<Role>, Permission extends string, Feature extends string, LimitKey extends string, RequiredOrgFields extends keyof O = never>(config: OrganizationsPluginOptions<O, Role, M, Permission, Feature, LimitKey, RequiredOrgFields>) => DomainPlugin<"organizations", U, OrganizationsPluginApi<O, Role, M, Permission, Feature, LimitKey, RequiredOrgFields>, true>;

package/dist/plugins/passkey.d.ts

@@ -5,4 +5,4 @@ export type PasskeyPluginConfig<U extends UserBase, K extends keyof U> = {
     requiredProfileFields: readonly K[];
     passkeys: PasskeyAdapter;
 };
-export declare const passkeyPlugin: <U extends UserBase, K extends keyof U>(config: PasskeyPluginConfig<U, K>) => AuthMethodPlugin<"passkey", PasskeyRegisterInput<U, K>, PasskeyAuthenticateInput, U>;
+export declare const passkeyPlugin: <U extends UserBase, K extends keyof U>(config: PasskeyPluginConfig<U, K>) => AuthMethodPlugin<"passkey", PasskeyRegisterInput<U, K>, PasskeyAuthenticateInput, U, never, true, false>;

package/dist/plugins/password.d.ts

@@ -7,4 +7,4 @@ export type PasswordPluginConfig<U extends UserBase, K extends keyof U> = {
     hashPassword?: (password: string) => string;
     verifyPassword?: (password: string, hash: string) => boolean;
 };
-export declare const passwordPlugin: <U extends UserBase, K extends keyof U>(config: PasswordPluginConfig<U, K>) => AuthMethodPlugin<"password", PasswordRegisterInput<U, K>, PasswordAuthenticateInput, U>;
+export declare const passwordPlugin: <U extends UserBase, K extends keyof U>(config: PasswordPluginConfig<U, K>) => AuthMethodPlugin<"password", PasswordRegisterInput<U, K>, PasswordAuthenticateInput, U, never, true, false>;

package/dist/plugins/stripe.d.ts

@@ -1,6 +1,6 @@
 import type Stripe from "stripe";
 import type { StripeCustomerAdapter, StripeSubscriptionAdapter, StripeTrialUsageAdapter, StripeWebhookEventAdapter } from "../types/adapters.js";
-import type { UserBase } from "../types/model.js";
+import type { StripePlan, StripeSubject, UserBase } from "../types/model.js";
 import type { DomainPlugin, StripePlansResolver, StripePluginApi } from "../types/plugins.js";
 type StripePluginHandlers<Feature extends string, LimitKey extends string> = {
     customers: StripeCustomerAdapter;
@@ -15,5 +15,11 @@ export type StripePluginConfig<U extends UserBase, Feature extends string, Limit
     handlers: StripePluginHandlers<Feature, LimitKey>;
     customerMode?: "user" | "organization" | "both";
 };
-export declare const stripePlugin: <U extends UserBase, Feature extends string, LimitKey extends string>(config: StripePluginConfig<U, Feature, LimitKey>) => DomainPlugin<"stripe", U, StripePluginApi<Feature, LimitKey>>;
+type StripePlanCatalogEntry<Feature extends string, LimitKey extends string> = Omit<StripePlan<Feature, LimitKey>, "scope"> & {
+    scope: StripeSubject["kind"];
+};
+type StripePlanCatalog<Feature extends string, LimitKey extends string> = readonly StripePlanCatalogEntry<Feature, LimitKey>[];
+export declare const stripePlugin: <U extends UserBase, Feature extends string, LimitKey extends string, const Plans extends StripePlanCatalog<Feature, LimitKey>>(config: Omit<StripePluginConfig<U, Feature, LimitKey>, "plans"> & {
+    plans: StripePlansResolver<Feature, LimitKey, Plans>;
+}) => DomainPlugin<"stripe", U, StripePluginApi<Feature, LimitKey>, true>;
 export {};

package/dist/plugins/two-factor.d.ts

@@ -14,7 +14,7 @@ export type TwoFactorPluginConfig<U extends UserBase> = {
     challengeTtlSeconds?: number;
     issuer?: string;
 };
-export declare const twoFactorPlugin: <U extends UserBase>(config: TwoFactorPluginConfig<U>) => DomainPlugin<"two_factor", U, TwoFactorPluginApi<U>>;
+export declare const twoFactorPlugin: <U extends UserBase>(config: TwoFactorPluginConfig<U>) => DomainPlugin<"two_factor", U, TwoFactorPluginApi<U>, true>;
 export declare const testHelpers: {
     generateTotp: (secret: string, at?: Date) => string;
 };

package/dist/types/model.d.ts

@@ -127,7 +127,7 @@ export type ProfileCompletionState<U extends UserBase> = {
     email?: string;
     missingFields: readonly Extract<keyof U, string>[];
     prefill: Partial<U>;
-    continuation?: Record<string, unknown>;
+    continuation?: Record<string, unknown> | null;
 };
 export type CompleteProfileInput<U extends UserBase> = {
     pendingProfileId: string;

package/dist/types/plugins.d.ts

@@ -8,11 +8,12 @@ export interface AuthPluginContext<U extends UserBase> {
     request?: AuthRequestContext;
     getPluginApi?<T = unknown>(method: string): T | null;
 }
-export interface BasePlugin<Method extends string, U extends UserBase, ExposedApi extends object = {}> {
+export interface BasePlugin<Method extends string, U extends UserBase, ExposedApi extends object = never, HasApi extends boolean = boolean> {
     kind: "auth_method" | "domain";
     method: Method;
     version: string;
-    createApi?: (ctx: Omit<AuthPluginContext<U>, "request">) => ExposedApi;
+    createApi?: HasApi extends true ? (ctx: Omit<AuthPluginContext<U>, "request">) => ExposedApi : never;
+    readonly __pluginApiBrand?: HasApi extends true ? ExposedApi : null;
 }
 export interface CompletePendingProfileInput<U extends UserBase> {
     record: ProfileCompletionState<U>;
@@ -22,28 +23,28 @@ export interface AuthMethodPlugin<Method extends string, RegisterInput extends {
     method: Method;
 }, AuthenticateInput extends {
     method: Method;
-}, U extends UserBase, ExposedApi extends object = {}> extends BasePlugin<Method, U, ExposedApi> {
+}, U extends UserBase, ExposedApi extends object = never, SupportsRegister extends boolean = boolean, HasApi extends boolean = boolean> extends BasePlugin<Method, U, ExposedApi, HasApi> {
     kind: "auth_method";
     supports: {
-        register: boolean;
+        register: SupportsRegister;
     };
     validators?: {
         authenticate?: (input: unknown) => AuthenticateInput;
-        register?: (input: unknown) => RegisterInput;
+        register?: SupportsRegister extends true ? (input: unknown) => RegisterInput : never;
     };
     issueFields?: {
         authenticate: readonly Extract<keyof AuthenticateInput, string>[];
-        register?: readonly Extract<keyof RegisterInput, string>[];
+        register?: SupportsRegister extends true ? readonly Extract<keyof RegisterInput, string>[] : never;
     };
-    register?: (ctx: AuthPluginContext<U>, input: RegisterInput) => Promise<OperationResult<{
+    register?: SupportsRegister extends true ? (ctx: AuthPluginContext<U>, input: RegisterInput) => Promise<OperationResult<{
         user: U;
-    }>>;
+    }>> : never;
     authenticate: (ctx: AuthPluginContext<U>, input: AuthenticateInput) => Promise<OperationResult<{
         user: U;
     }>>;
     completePendingProfile?: (ctx: AuthPluginContext<U>, input: CompletePendingProfileInput<U>) => Promise<OperationResult<void>>;
 }
-export interface DomainPlugin<Method extends string, U extends UserBase, ExposedApi extends object = {}> extends BasePlugin<Method, U, ExposedApi> {
+export interface DomainPlugin<Method extends string, U extends UserBase, ExposedApi extends object = never, HasApi extends boolean = boolean> extends BasePlugin<Method, U, ExposedApi, HasApi> {
     kind: "domain";
 }
 export interface TwoFactorEvaluateResult {
@@ -255,7 +256,7 @@ export interface OrganizationsPluginConfig<O extends OrganizationBase, Role exte
     organizationRequiredFields?: readonly Extract<RequiredOrgFields, string>[];
     handlers: OrganizationsPluginHandlers<O, Role, M, Permission, Feature, LimitKey>;
 }
-export type StripePlansResolver<Feature extends string, LimitKey extends string> = readonly StripePlan<Feature, LimitKey>[] | (() => Promise<readonly StripePlan<Feature, LimitKey>[]>);
+export type StripePlansResolver<Feature extends string, LimitKey extends string, Plans extends readonly StripePlan<Feature, LimitKey>[] = readonly StripePlan<Feature, LimitKey>[]> = Plans | (() => Promise<Plans>);
 export type AuthSecurityRateLimitScope = "discover" | "register" | "authenticate" | "emailOtpRequest" | "magicLinkRequest" | "otpVerify";
 export interface AuthSecurityRateLimitPolicy {
     limit: number;
@@ -265,26 +266,33 @@ export interface AuthSecurityConfig {
     rateLimits?: Partial<Record<AuthSecurityRateLimitScope, AuthSecurityRateLimitPolicy>>;
     oauth2IdempotencyTtlSeconds?: number;
 }
-export type AnyMethodPlugin<U extends UserBase> = AuthMethodPlugin<string, any, any, U, any>;
-export type AnyDomainPlugin<U extends UserBase> = DomainPlugin<string, U, any>;
+export type AnyMethodPlugin<U extends UserBase> = AuthMethodPlugin<string, any, any, U, any, boolean, boolean>;
+export type AnyDomainPlugin<U extends UserBase> = DomainPlugin<string, U, any, boolean>;
 export type AnyPlugin<U extends UserBase> = AnyMethodPlugin<U> | AnyDomainPlugin<U>;
-type MethodPlugins<P extends readonly AnyPlugin<any>[]> = Extract<P[number], AnyMethodPlugin<any>>;
-export type RegisterInputFromPlugins<P extends readonly AnyPlugin<any>[]> = MethodPlugins<P> extends infer Pl ? Pl extends {
+type MethodPlugins<P extends readonly AnyPlugin<any>[]> = Extract<P[number], {
+    kind: "auth_method";
+}>;
+type RegisterCapableMethodPlugins<P extends readonly AnyPlugin<any>[]> = Extract<MethodPlugins<P>, {
+    supports: {
+        register: true;
+    };
+}>;
+type PluginExposedApi<Plugin> = Plugin extends {
+    __pluginApiBrand?: infer ExposedApi;
+} ? ExposedApi : never;
+export type RegisterInputFromPlugins<P extends readonly AnyPlugin<any>[]> = RegisterCapableMethodPlugins<P> extends infer Pl ? Pl extends {
     supports: {
         register: true;
     };
-} ? Pl extends AuthMethodPlugin<any, infer R, any, any, any> ? R : never : never : never;
-export type AuthenticateInputFromPlugins<P extends readonly AnyPlugin<any>[]> = MethodPlugins<P> extends AuthMethodPlugin<any, any, infer A, any, any> ? A : never;
+} ? Pl extends AuthMethodPlugin<any, infer R, any, any, any, true, any> ? R : never : never : never;
+export type AuthenticateInputFromPlugins<P extends readonly AnyPlugin<any>[]> = MethodPlugins<P> extends infer Pl ? Pl extends AuthMethodPlugin<any, any, infer A, any, any, any, any> ? A : never : never;
+export type PluginApiForMethod<P extends readonly AnyPlugin<any>[], M extends P[number]["method"]> = Exclude<PluginExposedApi<Extract<P[number], {
+    method: M;
+}>>, null>;
+export type PluginMethodsWithApi<P extends readonly AnyPlugin<any>[]> = P[number]["method"] extends infer Method ? Method extends P[number]["method"] ? [PluginApiForMethod<P, Method>] extends [never] ? never : Method : never : never;
 export type PluginApiMap<P extends readonly AnyPlugin<any>[]> = {
-    [M in P[number]["method"]]: Extract<P[number], {
-        method: M;
-    }> extends {
-        createApi: (...args: any[]) => infer Api;
-    } ? Api : never;
+    [M in PluginMethodsWithApi<P>]: PluginApiForMethod<P, M>;
 };
-export type PluginMethodsWithApi<P extends readonly AnyPlugin<any>[]> = {
-    [M in keyof PluginApiMap<P>]: PluginApiMap<P>[M] extends never ? never : M;
-}[keyof PluginApiMap<P>];
 export interface AuthConfig<U extends UserBase, P extends readonly AnyPlugin<U>[]> {
     adapters: CoreAdapters<U>;
     plugins: P;
@@ -304,7 +312,7 @@ export interface AuthPublicApi<U extends UserBase, P extends readonly AnyPlugin<
     discover(input: DiscoverAccountInput, request?: AuthRequestContext): Promise<OperationResult<DiscoverAccountDecision>>;
     authenticate(input: AuthenticateInputFromPlugins<P>, request?: AuthRequestContext): Promise<AuthResult<U>>;
     register(input: RegisterInputFromPlugins<P>, request?: AuthRequestContext): Promise<AuthResult<U>>;
-    method<M extends PluginMethodsWithApi<P>>(method: M): PluginApiMap<P>[M];
+    method<M extends PluginMethodsWithApi<P>>(method: M): PluginApiForMethod<P, M>;
     verifySecondFactor(input: TwoFactorVerifyInput, request?: AuthRequestContext): Promise<AuthResult<U>>;
     completeProfile(input: CompleteProfileInput<U>, request?: AuthRequestContext): Promise<AuthResult<U>>;
     validateSession(sessionId: string, request?: AuthRequestContext): Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oglofus/auth",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Type-safe, plugin-first authentication core",
   "homepage": "https://github.com/oglofus/auth#readme",
   "bugs": {