@robelest/convex-auth 0.0.3-preview → 0.0.3-preview.3

package/src/server/implementation/{apiKey.ts → keys.ts}

@@ -10,6 +10,7 @@
 
 import { sha256, generateRandomString } from "./utils.js";
 import type { KeyScope, ScopeChecker } from "../types.js";
+import { throwAuthError } from "../errors.js";
 
 // ============================================================================
 // Constants
@@ -110,16 +111,16 @@ export function validateScopes(
   for (const scope of requested) {
     const allowedActions = allowed[scope.resource];
     if (!allowedActions) {
-      throw new Error(
-        `Unknown resource "${scope.resource}" in API key scopes. ` +
-          `Allowed resources: ${Object.keys(allowed).join(", ")}`,
+      throwAuthError(
+        "API_KEY_INVALID_SCOPE",
+        `Unknown resource "${scope.resource}" in API key scopes. Allowed resources: ${Object.keys(allowed).join(", ")}`,
       );
     }
     for (const action of scope.actions) {
       if (action !== "*" && !allowedActions.includes(action)) {
-        throw new Error(
-          `Unknown action "${action}" for resource "${scope.resource}". ` +
-            `Allowed actions: ${allowedActions.join(", ")}`,
+        throwAuthError(
+          "API_KEY_INVALID_SCOPE",
+          `Unknown action "${action}" for resource "${scope.resource}". Allowed actions: ${allowedActions.join(", ")}`,
         );
       }
     }

package/src/server/implementation/mutations/{modifyAccount.ts → account.ts}

@@ -4,7 +4,8 @@ import { GetProviderOrThrowFunc, hash } from "../provider.js";
 import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
 import * as Provider from "../provider.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
+import { throwAuthError } from "../../errors.js";
 
 export const modifyAccountArgs = v.object({
   provider: v.string(),
@@ -28,9 +29,7 @@ export async function modifyAccountImpl(
   });
   const existingAccount = await db.accounts.get(provider, account.id);
   if (existingAccount === null) {
-    throw new Error(
-      `Cannot modify account with ID ${account.id} because it does not exist`,
-    );
+    throwAuthError("ACCOUNT_NOT_FOUND", `Cannot modify account with ID ${account.id} because it does not exist`);
   }
   await db.accounts.patch(existingAccount._id, {
     secret: await hash(getProviderOrThrow(provider), account.secret),

package/src/server/implementation/mutations/{createVerificationCode.ts → code.ts}

@@ -6,7 +6,7 @@ import { getAccountOrThrow, upsertUserAndAccount } from "../users.js";
 import { getAuthSessionId } from "../sessions.js";
 import { LOG_LEVELS, logWithLevel, sha256 } from "../utils.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const createVerificationCodeArgs = v.object({
   accountId: v.optional(v.string()),

package/src/server/implementation/mutations/index.ts

@@ -1,49 +1,49 @@
 import { Infer, v } from "convex/values";
 import { MutationCtx } from "../types.js";
-import { signInArgs, signInImpl } from "./signIn.js";
-import { signOutImpl } from "./signOut.js";
-import { refreshSessionArgs, refreshSessionImpl } from "./refreshSession.js";
+import { signInArgs, signInImpl } from "./signin.js";
+import { signOutImpl } from "./signout.js";
+import { refreshSessionArgs, refreshSessionImpl } from "./refresh.js";
 import {
   verifyCodeAndSignInArgs,
   verifyCodeAndSignInImpl,
-} from "./verifyCodeAndSignIn.js";
+} from "./verify.js";
 import {
   verifierSignatureArgs,
   verifierSignatureImpl,
-} from "./verifierSignature.js";
-import { userOAuthArgs, userOAuthImpl } from "./userOAuth.js";
+} from "./signature.js";
+import { userOAuthArgs, userOAuthImpl } from "./oauth.js";
 import {
   createVerificationCodeArgs,
   createVerificationCodeImpl,
-} from "./createVerificationCode.js";
+} from "./code.js";
 import {
   createAccountFromCredentialsArgs,
   createAccountFromCredentialsImpl,
-} from "./createAccountFromCredentials.js";
+} from "./register.js";
 import {
   retrieveAccountWithCredentialsArgs,
   retrieveAccountWithCredentialsImpl,
-} from "./retrieveAccountWithCredentials.js";
-import { modifyAccountArgs, modifyAccountImpl } from "./modifyAccount.js";
+} from "./retrieve.js";
+import { modifyAccountArgs, modifyAccountImpl } from "./account.js";
 import {
   invalidateSessionsArgs,
   invalidateSessionsImpl,
-} from "./invalidateSessions.js";
+} from "./invalidate.js";
 import * as Provider from "../provider.js";
 import { verifierImpl } from "./verifier.js";
 import { LOG_LEVELS, logWithLevel } from "../utils.js";
-export { callInvalidateSessions } from "./invalidateSessions.js";
-export { callModifyAccount } from "./modifyAccount.js";
-export { callRetreiveAccountWithCredentials } from "./retrieveAccountWithCredentials.js";
-export { callCreateAccountFromCredentials } from "./createAccountFromCredentials.js";
-export { callCreateVerificationCode } from "./createVerificationCode.js";
-export { callUserOAuth } from "./userOAuth.js";
-export { callVerifierSignature } from "./verifierSignature.js";
-export { callVerifyCodeAndSignIn } from "./verifyCodeAndSignIn.js";
+export { callInvalidateSessions } from "./invalidate.js";
+export { callModifyAccount } from "./account.js";
+export { callRetreiveAccountWithCredentials } from "./retrieve.js";
+export { callCreateAccountFromCredentials } from "./register.js";
+export { callCreateVerificationCode } from "./code.js";
+export { callUserOAuth } from "./oauth.js";
+export { callVerifierSignature } from "./signature.js";
+export { callVerifyCodeAndSignIn } from "./verify.js";
 export { callVerifier } from "./verifier.js";
-export { callRefreshSession } from "./refreshSession.js";
-export { callSignOut } from "./signOut.js";
-export { callSignIn } from "./signIn.js";
+export { callRefreshSession } from "./refresh.js";
+export { callSignOut } from "./signout.js";
+export { callSignIn } from "./signin.js";
 
 export const storeArgs = v.object({
   args: v.union(

package/src/server/implementation/mutations/{invalidateSessions.ts → invalidate.ts}

@@ -4,7 +4,7 @@ import { ActionCtx, MutationCtx } from "../types.js";
 import { LOG_LEVELS, logWithLevel } from "../utils.js";
 import * as Provider from "../provider.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const invalidateSessionsArgs = v.object({
   userId: v.string(),

package/src/server/implementation/mutations/{userOAuth.ts → oauth.ts}

@@ -5,7 +5,8 @@ import { OAuthConfig } from "@auth/core/providers/oauth.js";
 import { upsertUserAndAccount } from "../users.js";
 import { generateRandomString, logWithLevel, sha256 } from "../utils.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
+import { throwAuthError } from "../../errors.js";
 
 const OAUTH_SIGN_IN_EXPIRATION_MS = 1000 * 60 * 2; // 2 minutes
 
@@ -32,7 +33,7 @@ export async function userOAuthImpl(
 
   const verifier = await db.verifiers.getBySignature(signature);
   if (verifier === null) {
-    throw new Error("Invalid state");
+    throwAuthError("OAUTH_INVALID_STATE");
   }
 
   const { accountId } = await upsertUserAndAccount(

package/src/server/implementation/mutations/{refreshSession.ts → refresh.ts}

@@ -9,10 +9,10 @@ import {
   parseRefreshToken,
   REFRESH_TOKEN_REUSE_WINDOW_MS,
   refreshTokenIfValid,
-} from "../refreshTokens.js";
+} from "../refresh.js";
 import { generateTokensForSession } from "../sessions.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const refreshSessionArgs = v.object({
   refreshToken: v.string(),

package/src/server/implementation/mutations/{createAccountFromCredentials.ts → register.ts}

@@ -6,7 +6,8 @@ import { upsertUserAndAccount } from "../users.js";
 import { getAuthSessionId } from "../sessions.js";
 import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
+import { throwAuthError } from "../../errors.js";
 
 export const createAccountFromCredentialsArgs = v.object({
   provider: v.string(),
@@ -53,7 +54,7 @@ export async function createAccountFromCredentialsImpl(
         existingAccount.secret ?? "",
       ))
     ) {
-      throw new Error(`Account ${account.id} already exists`);
+      throwAuthError("ACCOUNT_ALREADY_EXISTS", `Account ${account.id} already exists`);
     }
     return {
       account: existingAccount,

package/src/server/implementation/mutations/{retrieveAccountWithCredentials.ts → retrieve.ts}

@@ -4,11 +4,11 @@ import {
   isSignInRateLimited,
   recordFailedSignIn,
   resetSignInRateLimit,
-} from "../rateLimit.js";
+} from "../ratelimit.js";
 import * as Provider from "../provider.js";
 import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const retrieveAccountWithCredentialsArgs = v.object({
   provider: v.string(),

package/src/server/implementation/mutations/{verifierSignature.ts → signature.ts}

@@ -2,7 +2,8 @@ import { GenericId, Infer, v } from "convex/values";
 import { ActionCtx, MutationCtx } from "../types.js";
 import * as Provider from "../provider.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
+import { throwAuthError } from "../../errors.js";
 
 export const verifierSignatureArgs = v.object({
   verifier: v.string(),
@@ -20,7 +21,7 @@ export async function verifierSignatureImpl(
   const db = authDb(ctx, config);
   const verifierDoc = await db.verifiers.getById(verifier as GenericId<"verifier">);
   if (verifierDoc === null) {
-    throw new Error("Invalid verifier");
+    throwAuthError("INVALID_VERIFIER");
   }
   return await db.verifiers.patch(verifierDoc._id, { signature });
 }

package/src/server/implementation/mutations/{signIn.ts → signin.ts}

@@ -6,7 +6,7 @@ import {
   maybeGenerateTokensForSession,
 } from "../sessions.js";
 import { LOG_LEVELS, logWithLevel } from "../utils.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const signInArgs = v.object({
   userId: v.string(),

package/src/server/implementation/mutations/{signOut.ts → signout.ts}

@@ -3,7 +3,7 @@ import { ActionCtx, MutationCtx } from "../types.js";
 import { deleteSession, getAuthSessionId } from "../sessions.js";
 import * as Provider from "../provider.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 type ReturnType = {
   userId: GenericId<"user">;

package/src/server/implementation/mutations/verifier.ts

@@ -3,7 +3,7 @@ import { ActionCtx, MutationCtx } from "../types.js";
 import { getAuthSessionId } from "../sessions.js";
 import * as Provider from "../provider.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 type ReturnType = GenericId<"verifier">;
 

package/src/server/implementation/mutations/{verifyCodeAndSignIn.ts → verify.ts}

@@ -4,7 +4,7 @@ import {
   isSignInRateLimited,
   recordFailedSignIn,
   resetSignInRateLimit,
-} from "../rateLimit.js";
+} from "../ratelimit.js";
 import * as Provider from "../provider.js";
 import {
   createNewAndDeleteExistingSession,
@@ -15,7 +15,7 @@ import { ConvexAuthConfig } from "../../types.js";
 import { LOG_LEVELS, logWithLevel, sha256 } from "../utils.js";
 import { upsertUserAndAccount } from "../users.js";
 import { authDb } from "../db.js";
-import { AUTH_STORE_REF } from "./storeRef.js";
+import { AUTH_STORE_REF } from "./store.js";
 
 export const verifyCodeAndSignInArgs = v.object({
   params: v.any(),