@oglofus/auth 1.0.1 → 1.1.1

package/dist/plugins/passkey.js

@@ -1,45 +1,34 @@
+import { cloneWithout, createId } from "../core/utils.js";
+import { ensureFields } from "../core/validators.js";
 import { AuthError } from "../errors/index.js";
 import { createIssue } from "../issues/index.js";
 import { errorOperation, successOperation } from "../types/results.js";
-import { cloneWithout, createId } from "../core/utils.js";
-import { ensureFields } from "../core/validators.js";
-const getString = (obj, key) => {
-    const value = obj[key];
-    return typeof value === "string" && value.length > 0 ? value : null;
-};
-const getNumber = (obj, key) => {
-    const value = obj[key];
-    return typeof value === "number" && Number.isFinite(value) ? value : null;
-};
 export const passkeyPlugin = (config) => ({
     kind: "auth_method",
     method: "passkey",
-    version: "1.0.0",
+    version: "2.0.0",
     supports: {
         register: true,
     },
     issueFields: {
-        authenticate: ["email", "assertion"],
-        register: ["email", "attestation", ...config.requiredProfileFields.map(String)],
+        authenticate: ["authentication"],
+        register: ["email", "registration", ...config.requiredProfileFields.map(String)],
     },
     authenticate: async (ctx, input) => {
-        const credentialId = getString(input.assertion, "credentialId");
+        const credentialId = input.authentication.credentialId;
         if (!credentialId) {
-            return errorOperation(new AuthError("PASSKEY_INVALID_ASSERTION", "Credential id missing from assertion.", 400, [
-                createIssue("credentialId is required", ["assertion", "credentialId"]),
+            return errorOperation(new AuthError("PASSKEY_INVALID_ASSERTION", "Credential id missing from verified passkey authentication.", 400, [
+                createIssue("credentialId is required", ["authentication", "credentialId"]),
             ]));
         }
         const credential = await config.passkeys.findByCredentialId(credentialId);
         if (!credential) {
             return errorOperation(new AuthError("PASSKEY_INVALID_ASSERTION", "Unknown passkey credential.", 400));
         }
-        const counter = getNumber(input.assertion, "counter");
-        if (counter !== null) {
-            if (counter <= credential.counter) {
-                return errorOperation(new AuthError("PASSKEY_INVALID_ASSERTION", "Passkey counter regression detected.", 400));
-            }
-            await config.passkeys.updateCounter(credential.credentialId, counter);
+        if (input.authentication.nextCounter <= credential.counter) {
+            return errorOperation(new AuthError("PASSKEY_INVALID_ASSERTION", "Passkey counter regression detected.", 400));
         }
+        await config.passkeys.updateCounter(credential.credentialId, input.authentication.nextCounter);
         const user = await ctx.adapters.users.findById(credential.userId);
         if (!user) {
             return errorOperation(new AuthError("USER_NOT_FOUND", "User not found.", 404));
@@ -51,20 +40,21 @@ export const passkeyPlugin = (config) => ({
         if (requiredError) {
             return errorOperation(requiredError);
         }
-        const credentialId = getString(input.attestation, "credentialId");
-        const publicKey = getString(input.attestation, "publicKey");
-        const counter = getNumber(input.attestation, "counter") ?? 0;
+        const { credentialId, publicKey, counter, transports } = input.registration;
         if (!credentialId || !publicKey) {
-            return errorOperation(new AuthError("PASSKEY_INVALID_ATTESTATION", "Invalid passkey attestation.", 400, [
-                createIssue("credentialId/publicKey is required", ["attestation"]),
+            return errorOperation(new AuthError("PASSKEY_INVALID_ATTESTATION", "Invalid verified passkey registration.", 400, [
+                createIssue("credentialId/publicKey is required", ["registration"]),
+            ]));
+        }
+        const existingCredential = await config.passkeys.findByCredentialId(credentialId);
+        if (existingCredential) {
+            return errorOperation(new AuthError("CONFLICT", "Passkey credential already exists.", 409, [
+                createIssue("credentialId already registered", ["registration", "credentialId"]),
             ]));
         }
         let user = await ctx.adapters.users.findByEmail(input.email);
         if (!user) {
-            const payload = cloneWithout(input, [
-                "method",
-                "attestation",
-            ]);
+            const payload = cloneWithout(input, ["method", "registration"]);
             payload.emailVerified = true;
             user = await ctx.adapters.users.create(payload);
         }
@@ -74,6 +64,7 @@ export const passkeyPlugin = (config) => ({
             credentialId,
             publicKey,
             counter,
+            transports,
             createdAt: ctx.now(),
         });
         return successOperation({ user });

package/dist/plugins/password.js

@@ -1,12 +1,12 @@
+import { cloneWithout, secretHash, secretVerify } from "../core/utils.js";
+import { ensureFields } from "../core/validators.js";
 import { AuthError } from "../errors/index.js";
 import { createIssue } from "../issues/index.js";
 import { errorOperation, successOperation } from "../types/results.js";
-import { cloneWithout, secretHash, secretVerify } from "../core/utils.js";
-import { ensureFields } from "../core/validators.js";
 export const passwordPlugin = (config) => ({
     kind: "auth_method",
     method: "password",
-    version: "1.0.0",
+    version: "2.0.0",
     supports: {
         register: true,
     },
@@ -25,10 +25,7 @@ export const passwordPlugin = (config) => ({
         if (requiredError) {
             return errorOperation(requiredError);
         }
-        const payload = cloneWithout(input, [
-            "method",
-            "password",
-        ]);
+        const payload = cloneWithout(input, ["method", "password"]);
         if (payload.emailVerified === undefined) {
             payload.emailVerified = false;
         }

package/dist/plugins/stripe.d.ts

@@ -0,0 +1,19 @@
+import type Stripe from "stripe";
+import type { StripeCustomerAdapter, StripeSubscriptionAdapter, StripeTrialUsageAdapter, StripeWebhookEventAdapter } from "../types/adapters.js";
+import type { UserBase } from "../types/model.js";
+import type { DomainPlugin, StripePlansResolver, StripePluginApi } from "../types/plugins.js";
+type StripePluginHandlers<Feature extends string, LimitKey extends string> = {
+    customers: StripeCustomerAdapter;
+    subscriptions: StripeSubscriptionAdapter<Feature, LimitKey>;
+    events: StripeWebhookEventAdapter;
+    trials?: StripeTrialUsageAdapter;
+};
+export type StripePluginConfig<U extends UserBase, Feature extends string, LimitKey extends string> = {
+    stripe: Stripe;
+    webhookSecret: string;
+    plans: StripePlansResolver<Feature, LimitKey>;
+    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>>;
+export {};