@effect-auth/core 0.1.0-alpha.16 → 0.1.0-alpha.18

package/dist/MagicLink.js

@@ -1,74 +1,22 @@
-import { Context, Data, Duration, Effect, Layer, Option, Redacted } from "effect";
+import { Context, Data, Duration, Effect, Layer, Option, Redacted, } from "effect";
+import { magicLinkEvidence } from "./Assurance.js";
 import { AuthFlow, AuthResult } from "./AuthFlow.js";
 import { Challenge } from "./Challenge.js";
 import { Crypto } from "./Crypto.js";
-import { Email, UserId } from "./Identifiers.js";
+import { prepareEmailIdentityChallenge, resolveEmailIdentityChallenge, } from "./EmailIdentityAuth.js";
+import { Email } from "./Identifiers.js";
+import { IdentityKindRegistry } from "./Identity.js";
 import { currentUnixMillis } from "./Internal.js";
 import { AuthMailer } from "./Mailer.js";
-import { UserStore } from "./Storage.js";
+import { IdentityStore, RegistrationStore, UserStore } from "./Storage.js";
 export class MagicLinkStartError extends Data.TaggedError("MagicLinkStartError") {
 }
 export class MagicLinkVerifyError extends Data.TaggedError("MagicLinkVerifyError") {
 }
 export class MagicLinkLogin extends Context.Service()("auth/login/MagicLink") {
 }
-(function (MagicLinkLogin) {
-    MagicLinkLogin.make = (service) => MagicLinkLogin.of(service);
-})(MagicLinkLogin || (MagicLinkLogin = {}));
 export const defaultMagicLinkTtl = Duration.minutes(15);
 export const defaultMagicLinkSecretBytes = 32;
-const verifiedExistingUser = (users, user) => Effect.gen(function* () {
-    if (user.disabledAt !== undefined) {
-        return AuthResult.AccountDisabled();
-    }
-    if (user.emailVerified) {
-        return { _tag: "User", user };
-    }
-    const updatedAt = yield* currentUnixMillis;
-    const updated = yield* users
-        .markEmailVerified({ userId: user.id, updatedAt })
-        .pipe(Effect.mapError((cause) => new MagicLinkVerifyError({
-        message: "Failed to mark email verified",
-        cause,
-    })));
-    if (Option.isNone(updated)) {
-        return yield* new MagicLinkVerifyError({ message: "User not found" });
-    }
-    return { _tag: "User", user: updated.value };
-});
-const findByEmail = (users, email) => users.findByEmail(email).pipe(Effect.mapError((cause) => new MagicLinkVerifyError({
-    message: "Failed to load user by email",
-    cause,
-})));
-const createVerifiedUser = (dependencies, email) => Effect.gen(function* () {
-    const now = yield* currentUnixMillis;
-    const userId = UserId(yield* dependencies.crypto
-        .randomToken(dependencies.userIdBytes ?? 16)
-        .pipe(Effect.mapError((cause) => new MagicLinkVerifyError({
-        message: "Failed to generate user id",
-        cause,
-    }))));
-    const user = {
-        id: userId,
-        email,
-        emailVerified: true,
-        createdAt: now,
-        updatedAt: now,
-    };
-    return yield* dependencies.users.insert(user).pipe(Effect.as({ _tag: "User", user }), Effect.catchTag("StorageError", (cause) => findByEmail(dependencies.users, email).pipe(Effect.flatMap((existing) => Option.isSome(existing)
-        ? verifiedExistingUser(dependencies.users, existing.value)
-        : Effect.fail(new MagicLinkVerifyError({
-            message: "Failed to create user",
-            cause,
-        }))))));
-});
-const findOrCreateVerifiedUser = (dependencies, email) => Effect.gen(function* () {
-    const existing = yield* findByEmail(dependencies.users, email);
-    if (Option.isSome(existing)) {
-        return yield* verifiedExistingUser(dependencies.users, existing.value);
-    }
-    return yield* createVerifiedUser(dependencies, email);
-});
 const invalidateChallenge = (challenge, id) => challenge
     .consume(id)
     .pipe(Effect.catchTag("ChallengeConsumeError", () => Effect.void));
@@ -92,17 +40,18 @@ const verifySecret = (secret) => Redacted.make(Redacted.value(secret).trim());
 export const makeMagicLinkLogin = (dependencies) => {
     const ttl = dependencies.ttl ?? defaultMagicLinkTtl;
     const secretBytes = dependencies.secretBytes ?? defaultMagicLinkSecretBytes;
-    return MagicLinkLogin.make({
+    return MagicLinkLogin.of({
         start: Effect.fn("auth.magic_link.start")(function* (input) {
             yield* Effect.annotateCurrentSpan("auth.method", "magic-link");
+            const binding = yield* prepareEmailIdentityChallenge(dependencies, input.identity, input.metadata, (message, cause) => new MagicLinkStartError({ message, cause }));
             const secret = yield* startSecret(dependencies.crypto, input, secretBytes);
             const issued = yield* dependencies.challenge
                 .issue({
                 type: "magic-link",
-                subject: input.email,
+                subject: binding.identityId,
                 ttl: input.ttl ?? ttl,
                 secret,
-                metadata: input.metadata,
+                metadata: binding.metadata,
             })
                 .pipe(Effect.mapError((cause) => new MagicLinkStartError({
                 message: "Failed to issue magic link challenge",
@@ -110,7 +59,7 @@ export const makeMagicLinkLogin = (dependencies) => {
             })));
             const started = {
                 challengeId: issued.id,
-                email: input.email,
+                email: binding.email,
                 expiresAt: issued.expiresAt,
             };
             const url = yield* makeMagicLinkUrl(dependencies, {
@@ -125,7 +74,8 @@ export const makeMagicLinkLogin = (dependencies) => {
             yield* dependencies.authMailer
                 .send({
                 _tag: "MagicLink",
-                to: input.email,
+                to: binding.email,
+                identityId: binding.identityId,
                 challengeId: issued.id,
                 url,
                 expiresAt: issued.expiresAt,
@@ -157,28 +107,40 @@ export const makeMagicLinkLogin = (dependencies) => {
                 yield* Effect.annotateCurrentSpan("auth.result", "InvalidCredentials");
                 return AuthResult.InvalidCredentials();
             }
-            const email = Email(verifiedOption.value.subject);
-            const userResult = yield* findOrCreateVerifiedUser(dependencies, email);
-            if (userResult._tag === "AccountDisabled") {
+            const userResult = yield* resolveEmailIdentityChallenge(dependencies, verifiedOption.value.subject, verifiedOption.value.metadata, (message, cause) => new MagicLinkVerifyError({ message, cause }));
+            if (!("user" in userResult)) {
                 yield* Effect.annotateCurrentSpan("auth.result", "AccountDisabled");
                 return userResult;
             }
+            const verifiedAt = yield* currentUnixMillis;
             return yield* dependencies.authFlow
                 .completePrimaryFactor({
                 userId: userResult.user.id,
-                email: userResult.user.email,
+                identity: {
+                    identityId: userResult.identity.id,
+                    kind: "email",
+                    verified: true,
+                },
+                emailDestination: {
+                    identityId: userResult.identity.id,
+                    email: Email(userResult.identity.value),
+                },
                 intent: "sign-in",
                 method: "magic-link",
-                amr: ["email", "link"],
-                aal: "aal1",
-                claims: { emailVerified: true },
+                evidence: [
+                    magicLinkEvidence({
+                        identityId: userResult.identity.id,
+                        verifiedAt,
+                    }),
+                ],
+                claims: { verifiedIdentityKinds: ["email"] },
                 ...(input.trustedDeviceToken === undefined
                     ? {}
                     : { trustedDeviceToken: input.trustedDeviceToken }),
                 ...(input.request === undefined ? {} : { request: input.request }),
-                ...(verifiedOption.value.metadata === undefined
+                ...(userResult.metadata === undefined
                     ? {}
-                    : { metadata: verifiedOption.value.metadata }),
+                    : { metadata: userResult.metadata }),
             })
                 .pipe(Effect.mapError((cause) => new MagicLinkVerifyError({
                 message: "Failed to complete magic link authentication",
@@ -190,6 +152,9 @@ export const makeMagicLinkLogin = (dependencies) => {
 export const MagicLinkLoginLive = (options) => Layer.effect(MagicLinkLogin)(Effect.gen(function* () {
     const challenge = yield* Challenge;
     const users = yield* UserStore;
+    const identities = yield* IdentityStore;
+    const registration = yield* RegistrationStore;
+    const identityKinds = yield* IdentityKindRegistry;
     const crypto = yield* Crypto;
     const authFlow = yield* AuthFlow;
     const authMailer = yield* AuthMailer;
@@ -197,10 +162,12 @@ export const MagicLinkLoginLive = (options) => Layer.effect(MagicLinkLogin)(Effe
         ...options,
         challenge,
         users,
+        identities,
+        registration,
+        identityKinds,
         crypto,
         authFlow,
         authMailer,
     });
 }));
-export const MagicLinkFeatureLive = MagicLinkLoginLive;
 //# sourceMappingURL=MagicLink.js.map

package/dist/MagicLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"MagicLink.js","sourceRoot":"","sources":["../src/MagicLink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MagicLink.js","sourceRoot":"","sources":["../src/MagicLink.ts"],"names":[],"mappings":"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"}

package/dist/Mailer.d.ts

@@ -1,5 +1,5 @@
 import { Context, Effect, Layer, Redacted } from "effect";
-import type { ChallengeId, Email, SessionId, UnixMillis, UserId } from "./Identifiers.js";
+import type { ChallengeId, Email, IdentityId, SessionId, UnixMillis, UserId } from "./Identifiers.js";
 import type { LoginRequestContext } from "./LoginRisk.js";
 export type EmailAddress = Email | {
     readonly email: Email;
@@ -31,9 +31,6 @@ export interface MailerService {
 declare const Mailer_base: Context.ServiceClass<Mailer, "auth/Mailer", MailerService>;
 export declare class Mailer extends Mailer_base {
 }
-export declare namespace Mailer {
-    const make: (service: MailerService) => MailerService;
-}
 export interface AuthEmailBase {
     readonly to: Email;
     readonly locale?: string;
@@ -41,12 +38,28 @@ export interface AuthEmailBase {
 }
 export interface AuthEmailOtp extends AuthEmailBase {
     readonly _tag: "EmailOtp";
+    readonly identityId: IdentityId;
     readonly challengeId: ChallengeId;
     readonly secret: Redacted.Redacted<string>;
     readonly expiresAt: UnixMillis;
 }
+export interface AuthEmailAuth extends AuthEmailBase {
+    readonly _tag: "EmailAuth";
+    readonly identityId: IdentityId;
+    readonly emailOtp: {
+        readonly challengeId: ChallengeId;
+        readonly secret: Redacted.Redacted<string>;
+        readonly expiresAt: UnixMillis;
+    };
+    readonly magicLink: {
+        readonly challengeId: ChallengeId;
+        readonly url: string;
+        readonly expiresAt: UnixMillis;
+    };
+}
 export interface AuthMagicLinkEmail extends AuthEmailBase {
     readonly _tag: "MagicLink";
+    readonly identityId: IdentityId;
     readonly challengeId: ChallengeId;
     readonly url: string;
     readonly expiresAt: UnixMillis;
@@ -60,7 +73,7 @@ export interface AuthPasswordResetEmail extends AuthEmailBase {
 export interface AuthEmailVerificationEmail extends AuthEmailBase {
     readonly _tag: "EmailVerification";
     readonly challengeId: ChallengeId;
-    readonly userId?: UserId;
+    readonly identityId: IdentityId;
     readonly secret?: Redacted.Redacted<string>;
     readonly url?: string;
     readonly expiresAt: UnixMillis;
@@ -89,7 +102,7 @@ export interface AuthLoginNotificationEmail extends AuthEmailBase {
     readonly reportUrl?: string;
     readonly reportExpiresAt?: UnixMillis;
 }
-export type AuthEmail = AuthEmailOtp | AuthMagicLinkEmail | AuthPasswordResetEmail | AuthEmailVerificationEmail | AuthLoginApprovalEmail | AuthLoginNotificationEmail;
+export type AuthEmail = AuthEmailOtp | AuthEmailAuth | AuthMagicLinkEmail | AuthPasswordResetEmail | AuthEmailVerificationEmail | AuthLoginApprovalEmail | AuthLoginNotificationEmail;
 export interface RenderedEmail {
     readonly from?: EmailAddress;
     readonly subject: string;
@@ -111,9 +124,6 @@ export interface AuthEmailTemplatesService {
 declare const AuthEmailTemplates_base: Context.ServiceClass<AuthEmailTemplates, "auth/AuthEmailTemplates", AuthEmailTemplatesService>;
 export declare class AuthEmailTemplates extends AuthEmailTemplates_base {
 }
-export declare namespace AuthEmailTemplates {
-    const make: (service: AuthEmailTemplatesService) => AuthEmailTemplatesService;
-}
 declare const AuthMailerError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "AuthMailerError";
 } & Readonly<A>;
@@ -128,9 +138,6 @@ export interface AuthMailerService {
 declare const AuthMailer_base: Context.ServiceClass<AuthMailer, "auth/AuthMailer", AuthMailerService>;
 export declare class AuthMailer extends AuthMailer_base {
 }
-export declare namespace AuthMailer {
-    const make: (service: AuthMailerService) => AuthMailerService;
-}
 export interface AuthMailerOptions {
     readonly from?: EmailAddress;
 }

package/dist/Mailer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Mailer.d.ts","sourceRoot":"","sources":["../src/Mailer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Mailer.d.ts","sourceRoot":"","sources":["../src/Mailer.ts"],"names":[],"mappings":"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"}

package/dist/Mailer.js

@@ -4,23 +4,14 @@ export class EmailSendError extends Data.TaggedError("EmailSendError") {
 }
 export class Mailer extends Context.Service()("auth/Mailer") {
 }
-(function (Mailer) {
-    Mailer.make = (service) => Mailer.of(service);
-})(Mailer || (Mailer = {}));
 export class AuthEmailTemplateError extends Data.TaggedError("AuthEmailTemplateError") {
 }
 export class AuthEmailTemplates extends Context.Service()("auth/AuthEmailTemplates") {
 }
-(function (AuthEmailTemplates) {
-    AuthEmailTemplates.make = (service) => AuthEmailTemplates.of(service);
-})(AuthEmailTemplates || (AuthEmailTemplates = {}));
 export class AuthMailerError extends Data.TaggedError("AuthMailerError") {
 }
 export class AuthMailer extends Context.Service()("auth/AuthMailer") {
 }
-(function (AuthMailer) {
-    AuthMailer.make = (service) => AuthMailer.of(service);
-})(AuthMailer || (AuthMailer = {}));
 const expiresAtText = (expiresAt) => new Date(Number(expiresAt)).toISOString();
 const deviceStatusText = (status) => {
     switch (status) {
@@ -74,7 +65,7 @@ const userAgentSummary = (userAgent) => {
     }
     return browser ?? os ?? userAgent;
 };
-export const makeDefaultAuthEmailTemplates = () => AuthEmailTemplates.make({
+export const makeDefaultAuthEmailTemplates = () => AuthEmailTemplates.of({
     render: Effect.fn("auth.email_templates.default.render")(function* (input) {
         switch (input._tag) {
             case "EmailOtp": {
@@ -84,6 +75,13 @@ export const makeDefaultAuthEmailTemplates = () => AuthEmailTemplates.make({
                     text: `Your login code is ${code}.\n\nThis code expires at ${expiresAtText(input.expiresAt)}.`,
                 };
             }
+            case "EmailAuth": {
+                const code = Redacted.value(input.emailOtp.secret);
+                return {
+                    subject: "Sign in to your account",
+                    text: `Your login code is ${code}.\n\nOr use this link to sign in:\n\n${input.magicLink.url}\n\nThe code expires at ${expiresAtText(input.emailOtp.expiresAt)}. The link expires at ${expiresAtText(input.magicLink.expiresAt)}.`,
+                };
+            }
             case "MagicLink": {
                 return {
                     subject: "Your sign-in link",
@@ -178,7 +176,7 @@ const emailMessageFromRendered = (input, rendered, options) => {
         ...(rendered.headers === undefined ? {} : { headers: rendered.headers }),
     };
 };
-export const makeAuthMailer = (dependencies) => AuthMailer.make({
+export const makeAuthMailer = (dependencies) => AuthMailer.of({
     send: Effect.fn("auth.email.send")(function* (input) {
         yield* Effect.annotateCurrentSpan("auth.email.kind", input._tag);
         const rendered = yield* dependencies.templates.render(input).pipe(Effect.mapError((cause) => new AuthMailerError({
@@ -202,7 +200,7 @@ export const AuthMailerLive = (options = {}) => Layer.effect(AuthMailer)(Effect.
         templates,
     });
 }));
-export const MailerNoopLive = Layer.succeed(Mailer, Mailer.make({
+export const MailerNoopLive = Layer.succeed(Mailer, Mailer.of({
     send: () => Effect.void,
 }));
 //# sourceMappingURL=Mailer.js.map

package/dist/Mailer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Mailer.js","sourceRoot":"","sources":["../src/Mailer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Mailer.js","sourceRoot":"","sources":["../src/Mailer.ts"],"names":[],"mappings":"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"}