@simple-auth-kit/cli 1.5.0 → 1.6.1

package/registry/combos/express-prisma/variants/workspaces/src/openapi-workspace.ts

@@ -6,7 +6,7 @@ import {
   missingPermission,
   requiresPermission,
   type OpenApiFragment,
-} from "./openapi-fragment.js";
+} from "./openapi/openapi-fragment.js";
 import { WORKSPACE_HEADER } from "./middleware/authz.middleware.js";
 
 /** Every route that acts *inside* a workspace names it with this header, never a path segment. */

package/registry/combos/express-prisma/variants/workspaces/src/repositories/audit-log.repository.ts

@@ -5,8 +5,8 @@ import {
   normalizeLimit,
   normalizePage,
   type Paginated,
-} from "../pagination.js";
-import { toIdOrNull, toIdOrUndefined } from "../id.helper.js";
+} from "../helpers/pagination.js";
+import { toIdOrNull, toIdOrUndefined } from "../helpers/id.helper.js";
 
 export interface AuditLogEntry {
   id: string;

package/registry/combos/express-prisma/variants/workspaces/src/repositories/rbac.repository.ts

@@ -1,15 +1,15 @@
 import { resolvePermissions } from "@/lib/auth/core/rbac.js";
 import { Prisma, PrismaClient } from "../../generated/prisma/client.js";
 import type { AuthzContext } from "../middleware/authz.middleware.js";
-import { HttpError } from "../http-error.js";
+import { HttpError } from "../errors/http-error.js";
 import {
   buildPageMeta,
   normalizeLimit,
   normalizePage,
   type Paginated,
-} from "../pagination.js";
-import { PermissionCache } from "../permission-cache.js";
-import { toId, toIdOrNull } from "../id.helper.js";
+} from "../helpers/pagination.js";
+import { PermissionCache } from "../cache/permission-cache.js";
+import { toId, toIdOrNull } from "../helpers/id.helper.js";
 
 export interface MemberSummary {
   memberId: string;

package/registry/combos/express-prisma/variants/workspaces/src/repositories/workspace.repository.ts

@@ -1,11 +1,11 @@
 import { PrismaClient } from "../../generated/prisma/client.js";
-import { HttpError } from "../http-error.js";
+import { HttpError } from "../errors/http-error.js";
 import {
   provisionDefaultRoles,
   WORKSPACE_CREATOR_ROLES,
 } from "../rbac.defaults.js";
 import { RbacRepository } from "./rbac.repository.js";
-import { toId } from "../id.helper.js";
+import { toId } from "../helpers/id.helper.js";
 
 export interface WorkspaceSummary {
   id: string;

package/registry/combos/express-prisma/variants/workspaces/src/routers/admin.router.ts

@@ -1,6 +1,6 @@
 import type { NextFunction, Request, RequestHandler, Response } from "express";
 import { AuthService } from "../services/auth.service.js";
-import { HttpError } from "../http-error.js";
+import { HttpError } from "../errors/http-error.js";
 import { ability, createTieredRouter } from "../route-tiers.js";
 import { WorkspaceRepository } from "../repositories/workspace.repository.js";
 import { hashPassword } from "@/lib/auth/core/crypto.js";
@@ -64,15 +64,13 @@ export function createAdminRouter(deps: AdminRouterDeps): RequestHandler {
           string,
           string | undefined
         >;
-        res
-          .status(200)
-          .json(
-            await auth.listUsers(req.authz!, {
-              search,
-              page: page ? Number(page) : undefined,
-              limit: limit ? Number(limit) : undefined,
-            }),
-          );
+        res.status(200).json(
+          await auth.listUsers(req.authz!, {
+            search,
+            page: page ? Number(page) : undefined,
+            limit: limit ? Number(limit) : undefined,
+          }),
+        );
       } catch (err) {
         next(err);
       }
@@ -206,18 +204,16 @@ export function createAdminRouter(deps: AdminRouterDeps): RequestHandler {
       try {
         const { userId, action, since, until, page, limit } =
           req.query as Record<string, string | undefined>;
-        res
-          .status(200)
-          .json(
-            await auth.listAuditLog(req.authz!, {
-              userId,
-              action,
-              since,
-              until,
-              page: page ? Number(page) : undefined,
-              limit: limit ? Number(limit) : undefined,
-            }),
-          );
+        res.status(200).json(
+          await auth.listAuditLog(req.authz!, {
+            userId,
+            action,
+            since,
+            until,
+            page: page ? Number(page) : undefined,
+            limit: limit ? Number(limit) : undefined,
+          }),
+        );
       } catch (err) {
         next(err);
       }

package/registry/combos/express-prisma/variants/workspaces/src/routers/workspace.router.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import type { NextFunction, Request, RequestHandler, Response } from "express";
-import { HttpError } from "../http-error.js";
+import { HttpError } from "../errors/http-error.js";
 import { RbacRepository } from "../repositories/rbac.repository.js";
 import { ability, authenticated, createTieredRouter } from "../route-tiers.js";
 import { WorkspaceRepository } from "../repositories/workspace.repository.js";

package/registry/combos/express-prisma/variants/workspaces/src/services/auth.service.ts

@@ -42,8 +42,8 @@ import {
   verifyTotpCode,
 } from "@/lib/auth/core/two-factor.js";
 import type { Revoker } from "@/lib/auth/core/types.js";
-import type { AuthConfig } from "../auth.config.js";
-import { HttpError } from "../http-error.js";
+import type { AuthConfig } from "../config/auth.config.js";
+import { HttpError } from "../errors/http-error.js";
 import type { AuthzContext } from "../middleware/authz.middleware.js";
 import {
   AuditLogEntry,
@@ -51,9 +51,9 @@ import {
   AuditLogRepository,
   toAuditLogEntry,
 } from "../repositories/audit-log.repository.js";
-import type { Paginated } from "../pagination.js";
+import type { Paginated } from "../helpers/pagination.js";
 import { PrismaClient } from "../../generated/prisma/client.js";
-import { KeyProviderService } from "../key-provider.js";
+import { KeyProviderService } from "../config/key-provider.js";
 import { OAuthRepository } from "../repositories/oauth.repository.js";
 import { PasswordResetRepository } from "../repositories/password-reset.repository.js";
 import {
@@ -68,7 +68,7 @@ import {
 } from "../repositories/rbac.repository.js";
 import { SessionRepository } from "../repositories/session.repository.js";
 import { TwoFactorRepository } from "../repositories/two-factor.repository.js";
-import { toId, toIdOrNull } from "../id.helper.js";
+import { toId, toIdOrNull } from "../helpers/id.helper.js";
 
 export interface AuthTokens {
   accessToken: string;
@@ -452,9 +452,7 @@ export class AuthService {
     return { twoFactorEnabled: user.twoFactorEnabled };
   }
 
-  async listActiveSessions(
-    userId: string,
-  ): Promise<
+  async listActiveSessions(userId: string): Promise<
     Array<{
       id: string;
       createdAt: string;