@yimingliao/cms 0.0.24 → 0.0.26

package/dist/server/index.d.ts

@@ -5,7 +5,8 @@ import Keyv from 'keyv';
 import { Logger } from 'logry';
 import { e as AdminRole, v as SingleItem, B as BaseTranslation, a as Admin, c as AdminFull, f as AdminSafe, D as DeviceInfo, d as AdminRefreshToken, k as File, m as FileFull, o as FileType, p as Folder, F as FolderFull, u as PostType, M as MultiItems, E as ExternalLink, j as Faq, T as TocItem, q as Post, s as PostListCard, t as PostTranslation, r as PostFull, S as SeoMetadata, g as AdminTranslation, n as FileTranslation, h as Alternate } from '../base-DbGnfZr6.js';
 import { BaseTranslator, LocaleMessages } from 'intor';
-import { S as SuccessResult, R as Result, E as ErrorDetail } from '../types-DHlRoJwv.js';
+import { S as SuccessResult, R as Result } from '../types-DHlRoJwv.js';
+import { NextResponse } from 'next/server';
 
 interface CreateJwtServiceOptions {
     defaultSecret: string;
@@ -26,7 +27,7 @@ declare function createJwtService({ defaultSecret, ...options }: CreateJwtServic
 
 declare function createArgon2Service(): {
     hash: (password: string) => Promise<string>;
-    verify: (hash: string, plain: string) => Promise<boolean>;
+    verify: (digest: string, password: string) => Promise<boolean>;
 };
 
 interface CreateCryptoServiceOptions {
@@ -601,7 +602,7 @@ declare const POST_ORDER_BY: ({
 type Action<D> = (translator: BaseTranslator<LocaleMessages>) => Promise<Omit<SuccessResult<D>, "success"> & {
     i18nKey?: string;
 }>;
-interface CreateServerActionOptions {
+interface CreateExecuteActionOptions {
     initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
     cacheResult: <T>({ key, ttl, load }: CacheResultOptions<T>) => Promise<T>;
     cache: Keyv<unknown>;
@@ -612,13 +613,57 @@ interface ServerActionOptions {
     key?: RawCacheKey;
     ttl?: number;
 }
-declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateServerActionOptions): <D = void>(fn: Action<D>, options?: ServerActionOptions) => Promise<Result<D>>;
+declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateExecuteActionOptions): <D = void>(fn: Action<D>, options?: ServerActionOptions) => Promise<Result<D>>;
 
-declare const normalizeError: (error: unknown, translator: BaseTranslator<LocaleMessages>) => {
-    message: string;
-    errors?: ErrorDetail[];
-    statusCode: number;
-    isInternal?: boolean;
+type Api = (translator: BaseTranslator<LocaleMessages>) => Promise<NextResponse<unknown>>;
+interface CreateExecuteApiOptions {
+    initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
+    logger: Logger;
+}
+declare function createExecuteApi({ initI18n, logger, }: CreateExecuteApiOptions): (fn: Api) => Promise<NextResponse<unknown>>;
+
+interface CreateAuthUseCases {
+    prisma: any;
+    adminQueryRepository: ReturnType<typeof createAdminQueryRepository>;
+    adminRefreshTokenCommandRepository: ReturnType<typeof createAdminRefreshTokenCommandRepository>;
+    jwtService: ReturnType<typeof createJwtService>;
+    argon2Service: ReturnType<typeof createArgon2Service>;
+    cryptoService: ReturnType<typeof createCryptoService>;
+    config: {
+        resetPasswordSecret: string;
+        resetPasswordTtl: number;
+        verifyEmailSecret: string;
+        verifyEmailTtl: number;
+        refreshTokenTtl: number;
+    };
+}
+declare function createAuthUseCases({ prisma, adminQueryRepository, adminRefreshTokenCommandRepository, jwtService, argon2Service, cryptoService, config, }: CreateAuthUseCases): {
+    verifyCredentials: ({ email, password, }: {
+        email: string;
+        password: string;
+    }) => Promise<Admin>;
+    updatePassword: ({ email, password, }: {
+        email: string;
+        password: string;
+    }) => Promise<Admin>;
+    signPasswordResetToken: ({ admin }: {
+        admin: AdminSafe;
+    }) => string;
+    verifyPasswordResetToken: ({ token }: {
+        token: string;
+    }) => {
+        email: string;
+    };
+    signEmailVerificationToken: () => string;
+    verifyEmailAndUpdate: ({ token, admin, }: {
+        token: string;
+        admin: AdminSafe;
+    }) => Promise<AdminSafe>;
+    createRefreshToken: ({ admin, deviceInfo, ip, }: {
+        admin: AdminSafe;
+        deviceInfo: DeviceInfo;
+        ip: string;
+    }) => Promise<string>;
 };
 
 declare class ServerError extends Error {
@@ -639,4 +684,4 @@ declare class ServerError extends Error {
     static internalServerError(): ServerError;
 }
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createAuthUseCases, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createExecuteApi, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };

package/dist/server/index.js

@@ -8,6 +8,7 @@ import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
 import { ulid } from 'ulid';
 import { ZodError } from 'zod';
+import { NextResponse } from 'next/server';
 
 function createJwtService({
   defaultSecret,
@@ -53,8 +54,8 @@ function createArgon2Service() {
   async function hash(password) {
     return await argon2.hash(password, DEFAULT_OPTIONS);
   }
-  async function verify(hash2, plain) {
-    return await argon2.verify(hash2, plain);
+  async function verify(digest, password) {
+    return await argon2.verify(digest, password);
   }
   return {
     hash,
@@ -1457,7 +1458,7 @@ var ServerError = class _ServerError extends Error {
   }
 };
 
-// src/server/interfaces/execute-action/normalize-error.ts
+// src/server/interfaces/normalize-error.ts
 var normalizeError = (error, translator) => {
   if (error instanceof ZodError) {
     const errors = error.issues.map((issue) => {
@@ -1496,7 +1497,7 @@ function createExecuteAction({
 }) {
   return async function executeAction(fn, options = {}) {
     const translator = await initI18n();
-    const withCache = options.key && options.type === "query";
+    const withCache = options.type === "query" && options.key;
     try {
       const { data, i18nKey, message, meta } = withCache ? await cacheResult({
         key: options.key,
@@ -1507,7 +1508,7 @@ function createExecuteAction({
       const finalMessage = i18nKey ? translator.t(i18nKey) : message;
       return result.success({
         ...finalMessage ? { message: finalMessage } : {},
-        ...data ? { data: data ?? {} } : {},
+        ...data !== void 0 ? { data } : {},
         ...meta ? { meta } : {}
       });
     } catch (error) {
@@ -1520,5 +1521,129 @@ function createExecuteAction({
     }
   };
 }
+function createExecuteApi({
+  initI18n,
+  logger
+}) {
+  return async function serverApi(fn) {
+    const translator = await initI18n();
+    try {
+      return await fn(translator);
+    } catch (error) {
+      const { message, errors, statusCode, isInternal } = normalizeError(
+        error,
+        translator
+      );
+      logger.error({ message, errors });
+      return NextResponse.json(
+        result.error({
+          message: isInternal ? "Internal server error" : message,
+          ...errors ? { errors } : {}
+        }),
+        { status: statusCode }
+      );
+    }
+  };
+}
+
+// src/server/applications/auth/create-auth-use-cases.ts
+function createAuthUseCases({
+  prisma,
+  adminQueryRepository,
+  adminRefreshTokenCommandRepository,
+  jwtService,
+  argon2Service,
+  cryptoService,
+  config
+}) {
+  async function verifyCredentials({
+    email,
+    password
+  }) {
+    const found = await adminQueryRepository.findWithPasswordHash({ email });
+    if (found) {
+      const isValid = await argon2Service.verify(found.passwordHash, password);
+      if (isValid) return found;
+    }
+    throw new ServerError({ i18nKey: "error.credentials-incorrect" });
+  }
+  async function updatePassword({
+    email,
+    password
+  }) {
+    const updatedAdmin = await prisma.admin.update({
+      where: { email },
+      data: { passwordHash: await argon2Service.hash(password) }
+    });
+    return updatedAdmin;
+  }
+  function signPasswordResetToken({ admin }) {
+    const payload = { email: admin.email };
+    const passwordResetToken = jwtService.sign({
+      payload,
+      secret: config.resetPasswordSecret,
+      expiresIn: config.resetPasswordTtl
+    });
+    return passwordResetToken;
+  }
+  function verifyPasswordResetToken({ token }) {
+    const payload = jwtService.verify({
+      token,
+      secret: config.resetPasswordSecret
+    });
+    return payload;
+  }
+  function signEmailVerificationToken() {
+    const emailVerificationToken = jwtService.sign({
+      payload: {},
+      secret: config.verifyEmailSecret,
+      expiresIn: config.verifyEmailTtl
+    });
+    return emailVerificationToken;
+  }
+  async function verifyEmailAndUpdate({
+    token,
+    admin
+  }) {
+    let updatedAdmin = admin;
+    jwtService.verify({
+      token,
+      secret: config.verifyEmailSecret
+    });
+    updatedAdmin = await prisma.admin.update({
+      where: { email: admin.email },
+      data: { emailVerifiedAt: /* @__PURE__ */ new Date() }
+    });
+    return updatedAdmin;
+  }
+  async function createRefreshToken({
+    admin,
+    deviceInfo,
+    ip
+  }) {
+    const token = cryptoService.generateToken();
+    const tokenHash = cryptoService.hash(token);
+    await adminRefreshTokenCommandRepository.create({
+      tokenHash,
+      ip,
+      deviceInfo,
+      expiresAt: new Date(Date.now() + config.refreshTokenTtl * 1e3),
+      adminId: admin.id,
+      email: admin.email
+    });
+    return token;
+  }
+  return {
+    verifyCredentials,
+    updatePassword,
+    // reset password
+    signPasswordResetToken,
+    verifyPasswordResetToken,
+    // verify email
+    signEmailVerificationToken,
+    verifyEmailAndUpdate,
+    createRefreshToken
+  };
+}
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createAuthUseCases, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createExecuteApi, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",