feat: Link the auth_email module to the auth_providers module

modules/auth/config.ts → modules/auth_email/config.ts

@@ -1,8 +1,4 @@
 export interface Config {
-	email?: EmailConfig;
-}
-
-export interface EmailConfig {
 	fromEmail: string;
 	fromName?: string;
 }

modules/auth_email/db/migrations/20240701232228_init/migration.sql

@@ -0,0 +1,16 @@
+-- CreateTable
+CREATE TABLE "Verifications" (
+    "id" UUID NOT NULL,
+    "email" TEXT NOT NULL,
+    "code" TEXT NOT NULL,
+    "attemptCount" INTEGER NOT NULL DEFAULT 0,
+    "maxAttemptCount" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "expireAt" TIMESTAMP NOT NULL,
+    "completedAt" TIMESTAMP,
+
+    CONSTRAINT "Verifications_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Verifications_code_key" ON "Verifications"("code");

modules/auth/db/schema.prisma → modules/auth_email/db/schema.prisma

@@ -3,19 +3,9 @@ datasource db {
     url      = env("DATABASE_URL")
 }
 
-model EmailPasswordless {
-    id        String   @id @default(uuid()) @db.Uuid
-    userId    String   @db.Uuid @unique
-    email     String   @unique
-    createdAt DateTime @default(now()) @db.Timestamp
-}
-
-model EmailPasswordlessVerification {
+model Verifications {
     id String @id @default(uuid()) @db.Uuid
 
-    // If exists, link to existing identity. If null, create new identity.
-    userId String? @db.Uuid
-
     email String
 
     // Code the user has to input to verify the email

modules/auth_email/module.json

@@ -0,0 +1,62 @@
+{
+	"name": "Authentication",
+	"description": "Authenticate users with multiple authentication methods.",
+	"icon": "key",
+	"tags": [
+		"core",
+		"auth",
+		"user"
+	],
+	"authors": [
+		"rivet-gg",
+		"NathanFlurry"
+	],
+	"status": "stable",
+	"dependencies": {
+		"email": {},
+        "auth_providers": {},
+        "users": {},
+		"rate_limit": {}
+	},
+	"scripts": {
+		"send_email": {
+			"name": "Send Email Verification",
+			"description": "Send a one-time verification code to an email address to verify ownership.",
+			"public": true
+		},
+		"verify_and_add": {
+			"name": "Verify and add Email to Existing User",
+			"description": "Verify a user's email address and register it with an existing account.",
+			"public": true
+		},
+		"verify_and_login_or_create": {
+			"name": "Verify and Login as (or Create) User",
+			"description": "Verify the email address code and return a userToken to AN account (creates a new account if one doesn't exist)",
+			"public": true
+		},
+		"verify_code": {
+			"name": "Verify Code",
+			"description": "Verify the email address code"
+		}
+	},
+	"errors": {
+		"provider_disabled": {
+			"name": "Provider Disabled"
+		},
+		"verification_code_invalid": {
+			"name": "Verification Code Invalid"
+		},
+		"verification_code_attempt_limit": {
+			"name": "Verification Code Attempt Limit"
+		},
+		"verification_code_expired": {
+			"name": "Verification Code Expired"
+		},
+		"verification_code_already_used": {
+			"name": "Verification Code Already Used"
+		},
+		"email_already_used": {
+			"name": "Email Already Used"
+		}
+	}
+}

modules/auth/scripts/send_email_verification.ts → modules/auth_email/scripts/send_email.ts

@@ -17,35 +17,12 @@ export async function run(
 ): Promise<Response> {
 	await ctx.modules.rateLimit.throttlePublic({});
 
-	if (!ctx.config.email) throw new RuntimeError("provider_disabled");
-
-	// Check if the email is already associated with an identity
-	const existingIdentity = await ctx.db.emailPasswordless.findFirst({
-		where: { email: req.email },
-	});
-
-	// Fetch existing user if session token is provided
-	let userId: string | undefined = existingIdentity?.userId;
-
-	if (req.userToken) {
-		const authRes = await ctx.modules.users.authenticateToken({
-			userToken: req.userToken,
-		});
-
-		if (existingIdentity && existingIdentity.userId !== authRes.userId) {
-			throw new RuntimeError("email_already_used");
-		}
-
-		userId = authRes.userId;
-	}
-
 	// Create verification
 	const code = generateCode();
 	const maxAttemptCount = 3;
 	const expiration = 60 * 60 * 1000;
-	const verification = await ctx.db.emailPasswordlessVerification.create({
+	const verification = await ctx.db.verifications.create({
 		data: {
-			userId,
 			email: req.email,
 			code,
 			maxAttemptCount,
@@ -54,11 +31,13 @@ export async function run(
 		select: { id: true },
 	});
 
+
+	console.log(ctx.config);
 	// Send email
 	await ctx.modules.email.sendEmail({
 		from: {
-			email: ctx.config.email.fromEmail ?? "[email protected]",
-			name: ctx.config.email.fromName ?? "Authentication Code",
+			email: ctx.config.fromEmail ?? "[email protected]",
+			name: ctx.config.fromName ?? "Authentication Code",
 		},
 		to: [{ email: req.email }],
 		subject: "Your verification code",