studiocms 0.1.0-beta.24 → 0.1.0-beta.26

package/dist/routes/api/dashboard/verify-session.js

@@ -1,17 +1,21 @@
 import { Session } from "studiocms:auth/lib";
 import { logger as _logger } from "studiocms:logger";
 import { SDKCore } from "studiocms:sdk";
-import { Effect, Schema } from "../../../effect.js";
-import { convertToVanilla, genLogger } from "../../../lib/effects/index.js";
-import { AllResponse, OptionsResponse } from "../../../lib/endpointResponses.js";
+import { AuthSessionCookieName } from "../../../consts.js";
+import {
+  AllResponse,
+  createEffectAPIRoutes,
+  createJsonResponse,
+  Effect,
+  genLogger,
+  OptionsResponse,
+  parseAPIContextJson,
+  Schema
+} from "../../../effect.js";
 class JsonData extends Schema.Class("JsonData")({
   originPathname: Schema.String
 }) {
 }
-const getParsedData = (context) => Effect.gen(function* () {
-  const jsonData = yield* Effect.tryPromise(() => context.request.json());
-  return yield* Schema.decodeUnknown(JsonData)(jsonData);
-});
 const responseBuilder = (context, isLoggedIn, user, permissionLevel) => {
   const data = {
     isLoggedIn,
@@ -24,80 +28,88 @@ const responseBuilder = (context, isLoggedIn, user, permissionLevel) => {
     } : null,
     permissionLevel,
     routes: {
-      logout: context.locals.routeMap.authLinks.logoutURL,
-      userProfile: context.locals.routeMap.mainLinks.userProfile,
-      contentManagement: context.locals.routeMap.mainLinks.contentManagement,
-      dashboardIndex: context.locals.routeMap.mainLinks.dashboardIndex
+      logout: context.locals.StudioCMS.routeMap.authLinks.logoutURL,
+      userProfile: context.locals.StudioCMS.routeMap.mainLinks.userProfile,
+      contentManagement: context.locals.StudioCMS.routeMap.mainLinks.contentManagement,
+      dashboardIndex: context.locals.StudioCMS.routeMap.mainLinks.dashboardIndex
     }
   };
-  return new Response(JSON.stringify(data), {
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
+  return createJsonResponse(data);
 };
-const POST = async (context) => await convertToVanilla(
-  genLogger("studiocms/routes/api/dashboard/verify-session.POST")(function* () {
-    const ses = yield* Session;
-    const sdk = yield* SDKCore;
-    const logger = _logger.fork("studiocms:runtime:api:verify-session");
-    const { cookies } = context;
-    const { originPathname } = yield* getParsedData(context);
-    const sessionToken = cookies.get(Session.sessionCookieName)?.value ?? null;
-    if (!sessionToken) {
-      logger.info(
-        `No session token found in cookies, returning unknown session status. Origin: ${originPathname}`
-      );
-      return responseBuilder(context, false, null, "unknown");
-    }
-    const { session, user } = yield* ses.validateSessionToken(sessionToken);
-    if (session === null) {
-      yield* ses.deleteSessionTokenCookie(context);
-      logger.info(
-        `Session token is invalid or expired, deleting cookie. Origin: ${originPathname}`
-      );
-      return responseBuilder(context, false, null, "unknown");
-    }
-    if (!user || user === null) {
-      logger.info(
-        `No user found for session token, returning unknown session status. Origin: ${originPathname}`
-      );
-      return responseBuilder(context, false, null, "unknown");
-    }
-    const result = yield* sdk.AUTH.permission.currentStatus(user.id);
-    if (!result) {
-      logger.error(
-        `Failed to retrieve permission status for user ${user.id}, returning unknown session status. Origin: ${originPathname}`
+const { POST, OPTIONS, ALL } = createEffectAPIRoutes(
+  {
+    POST: (ctx) => genLogger("studiocms/routes/api/dashboard/verify-session.POST")(function* () {
+      const [ses, sdk] = yield* Effect.all([Session, SDKCore]);
+      const logger = _logger.fork("studiocms:runtime:api:verify-session");
+      const { cookies } = ctx;
+      const { originPathname } = yield* parseAPIContextJson(ctx, JsonData);
+      const sessionToken = cookies.get(AuthSessionCookieName)?.value ?? null;
+      if (!sessionToken) {
+        logger.info(
+          `No session token found in cookies, returning unknown session status. Origin: ${originPathname}`
+        );
+        return responseBuilder(ctx, false, null, "unknown");
+      }
+      const { session, user } = yield* ses.validateSessionToken(sessionToken);
+      if (session === null) {
+        yield* ses.deleteSessionTokenCookie(ctx);
+        logger.info(
+          `Session token is invalid or expired, deleting cookie. Origin: ${originPathname}`
+        );
+        return responseBuilder(ctx, false, null, "unknown");
+      }
+      if (!user || user === null) {
+        logger.info(
+          `No user found for session token, returning unknown session status. Origin: ${originPathname}`
+        );
+        return responseBuilder(ctx, false, null, "unknown");
+      }
+      const result = yield* sdk.AUTH.permission.currentStatus(user.id);
+      if (!result) {
+        logger.error(
+          `Failed to retrieve permission status for user ${user.id}, returning unknown session status. Origin: ${originPathname}`
+        );
+        return responseBuilder(ctx, true, user, "unknown");
+      }
+      let permissionLevel = "unknown";
+      switch (result.rank) {
+        case "owner":
+          permissionLevel = "owner";
+          break;
+        case "admin":
+          permissionLevel = "admin";
+          break;
+        case "editor":
+          permissionLevel = "editor";
+          break;
+        case "visitor":
+          permissionLevel = "visitor";
+          break;
+        default:
+          permissionLevel = "unknown";
+          break;
+      }
+      return responseBuilder(ctx, true, user, permissionLevel);
+    }),
+    OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ["POST"] })),
+    ALL: () => Effect.try(() => AllResponse())
+  },
+  {
+    cors: { methods: ["POST", "OPTIONS"] },
+    onError: (error) => {
+      console.error("API Error:", error);
+      return createJsonResponse(
+        { error: "Internal Server Error" },
+        {
+          status: 500
+        }
       );
-      return responseBuilder(context, false, null, "unknown");
-    }
-    let permissionLevel = "unknown";
-    switch (result.rank) {
-      case "owner":
-        permissionLevel = "owner";
-        break;
-      case "admin":
-        permissionLevel = "admin";
-        break;
-      case "editor":
-        permissionLevel = "editor";
-        break;
-      case "visitor":
-        permissionLevel = "visitor";
-        break;
-      default:
-        permissionLevel = "unknown";
-        break;
     }
-    return responseBuilder(context, true, user, permissionLevel);
-  }).pipe(Session.Provide)
+  }
 );
-const OPTIONS = async () => OptionsResponse(["POST"]);
-const ALL = async () => AllResponse();
 export {
   ALL,
   JsonData,
   OPTIONS,
-  POST,
-  getParsedData
+  POST
 };

package/dist/routes/api/mailer/config.d.ts

@@ -1,5 +1,4 @@
-import type { APIRoute } from 'astro';
-import { Schema } from 'effect';
+import { Schema } from '../../../effect.js';
 declare const SmtpConfigSchema_base: Schema.Class<SmtpConfigSchema, {
     port: typeof Schema.Number;
     host: typeof Schema.String;
@@ -41,8 +40,5 @@ declare const SmtpConfigSchema_base: Schema.Class<SmtpConfigSchema, {
 }, {}, {}>;
 export declare class SmtpConfigSchema extends SmtpConfigSchema_base {
 }
-export declare const POST: APIRoute;
-export declare const UPDATE: APIRoute;
-export declare const OPTIONS: APIRoute;
-export declare const ALL: APIRoute;
+export declare const POST: import("astro").APIRoute, PATCH: import("astro").APIRoute, OPTIONS: import("astro").APIRoute, ALL: import("astro").APIRoute;
 export {};

package/dist/routes/api/mailer/config.js

@@ -1,8 +1,15 @@
 import { apiResponseLogger } from "studiocms:logger";
 import { Mailer } from "studiocms:mailer";
-import { Effect, Schema } from "effect";
-import { convertToVanilla, genLogger } from "../../../lib/effects/index.js";
-import { AllResponse, OptionsResponse } from "../../../lib/endpointResponses.js";
+import {
+  AllResponse,
+  createEffectAPIRoutes,
+  createJsonResponse,
+  Effect,
+  genLogger,
+  OptionsResponse,
+  parseAPIContextJson,
+  Schema
+} from "../../../effect.js";
 class SmtpConfigSchema extends Schema.Class("SmtpConfigSchema")({
   port: Schema.Number,
   host: Schema.String,
@@ -15,78 +22,85 @@ class SmtpConfigSchema extends Schema.Class("SmtpConfigSchema")({
   default_sender: Schema.String
 }) {
 }
-const POST = async (context) => await convertToVanilla(
-  genLogger("routes/mailer/config/POST")(function* () {
-    const mailer = yield* Mailer;
-    if (!context.locals.userSessionData.isLoggedIn) {
-      return apiResponseLogger(403, "Unauthorized");
+const { POST, PATCH, OPTIONS, ALL } = createEffectAPIRoutes(
+  {
+    POST: (ctx) => genLogger("routes/mailer/config/POST")(function* () {
+      const mailer = yield* Mailer;
+      if (!ctx.locals.StudioCMS.security?.userSessionData.isLoggedIn) {
+        return apiResponseLogger(401, "Authentication required");
+      }
+      if (!ctx.locals.StudioCMS.security?.userPermissionLevel.isOwner) {
+        return apiResponseLogger(403, "Forbidden");
+      }
+      const smtpConfig = yield* parseAPIContextJson(ctx, SmtpConfigSchema);
+      if (!Number.isInteger(smtpConfig.port) || smtpConfig.port < 1 || smtpConfig.port > 65535) {
+        return apiResponseLogger(
+          400,
+          "Invalid form data, port must be an integer between 1 and 65535"
+        );
+      }
+      if (typeof smtpConfig.host !== "string" || smtpConfig.host.trim() === "") {
+        return apiResponseLogger(400, "Invalid form data, host is required");
+      }
+      if (typeof smtpConfig.secure !== "boolean") {
+        return apiResponseLogger(400, "Invalid form data, secure must be a boolean");
+      }
+      if (typeof smtpConfig.default_sender !== "string" || smtpConfig.default_sender.trim() === "") {
+        return apiResponseLogger(400, "Invalid form data, default_sender is required");
+      }
+      const config = yield* mailer.createMailerConfigTable(smtpConfig);
+      if (!config) {
+        return apiResponseLogger(500, "Error creating mailer config table");
+      }
+      return apiResponseLogger(200, "Mailer config updated");
+    }).pipe(Mailer.Provide),
+    PATCH: (ctx) => genLogger("routes/mailer/config/PATCH")(function* () {
+      const mailer = yield* Mailer;
+      if (!ctx.locals.StudioCMS.security?.userSessionData.isLoggedIn) {
+        return apiResponseLogger(403, "Unauthorized");
+      }
+      if (!ctx.locals.StudioCMS.security?.userPermissionLevel.isOwner) {
+        return apiResponseLogger(403, "Unauthorized");
+      }
+      const smtpConfig = yield* parseAPIContextJson(ctx, SmtpConfigSchema);
+      if (!smtpConfig.port) {
+        return apiResponseLogger(400, "Invalid form data, port is required");
+      }
+      if (!smtpConfig.host) {
+        return apiResponseLogger(400, "Invalid form data, host is required");
+      }
+      if (!smtpConfig.secure) {
+        return apiResponseLogger(400, "Invalid form data, secure is required");
+      }
+      if (!smtpConfig.default_sender) {
+        return apiResponseLogger(400, "Invalid form data, default_sender is required");
+      }
+      const config = yield* mailer.updateMailerConfigTable(smtpConfig);
+      if (!config) {
+        return apiResponseLogger(500, "Error updating mailer config table");
+      }
+      return apiResponseLogger(200, "Mailer config updated");
+    }).pipe(Mailer.Provide),
+    OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ["POST", "PATCH"] })),
+    ALL: () => Effect.try(() => AllResponse())
+  },
+  {
+    cors: { methods: ["POST", "PATCH", "OPTIONS"] },
+    // biome-ignore lint/suspicious/noExplicitAny: allows for better error handling
+    onError: (error) => {
+      console.error("API Error:", error);
+      const isClientError = error?.status === 400 || error?.name === "SyntaxError" || error?._tag === "ParseError" || error?._tag === "JSONParseError" || typeof error?.name === "string" && error.name.includes("Schema");
+      return createJsonResponse(
+        { error: isClientError ? "Invalid request body" : "Internal Server Error" },
+        { status: isClientError ? 400 : 500 }
+      );
     }
-    if (!context.locals.userPermissionLevel.isOwner) {
-      return apiResponseLogger(403, "Unauthorized");
-    }
-    const smtpConfig = yield* Effect.tryPromise(() => context.request.json()).pipe(
-      Effect.flatMap(Schema.decodeUnknown(SmtpConfigSchema))
-    );
-    if (!smtpConfig.port) {
-      return apiResponseLogger(400, "Invalid form data, port is required");
-    }
-    if (!smtpConfig.host) {
-      return apiResponseLogger(400, "Invalid form data, host is required");
-    }
-    if (typeof smtpConfig.secure !== "boolean") {
-      return apiResponseLogger(400, "Invalid form data, secure must be a boolean");
-    }
-    if (!smtpConfig.default_sender) {
-      return apiResponseLogger(400, "Invalid form data, default_sender is required");
-    }
-    const config = yield* mailer.createMailerConfigTable(smtpConfig);
-    if (!config) {
-      return apiResponseLogger(500, "Error creating mailer config table");
-    }
-    return apiResponseLogger(200, "Mailer config updated");
-  }).pipe(Mailer.Provide)
-).catch((error) => {
-  return apiResponseLogger(500, `Error updating mailer config: ${error.message}`);
-});
-const UPDATE = async (context) => await convertToVanilla(
-  genLogger("routes/mailer/config/UPDATE")(function* () {
-    const mailer = yield* Mailer;
-    if (!context.locals.userSessionData.isLoggedIn) {
-      return apiResponseLogger(403, "Unauthorized");
-    }
-    if (!context.locals.userPermissionLevel.isOwner) {
-      return apiResponseLogger(403, "Unauthorized");
-    }
-    const smtpConfig = yield* Effect.tryPromise(() => context.request.json()).pipe(
-      Effect.flatMap(Schema.decodeUnknown(SmtpConfigSchema))
-    );
-    if (!smtpConfig.port) {
-      return apiResponseLogger(400, "Invalid form data, port is required");
-    }
-    if (!smtpConfig.host) {
-      return apiResponseLogger(400, "Invalid form data, host is required");
-    }
-    if (!smtpConfig.secure) {
-      return apiResponseLogger(400, "Invalid form data, secure is required");
-    }
-    if (!smtpConfig.default_sender) {
-      return apiResponseLogger(400, "Invalid form data, default_sender is required");
-    }
-    const config = yield* mailer.updateMailerConfigTable(smtpConfig);
-    if (!config) {
-      return apiResponseLogger(500, "Error updating mailer config table");
-    }
-    return apiResponseLogger(200, "Mailer config updated");
-  }).pipe(Mailer.Provide)
-).catch((error) => {
-  return apiResponseLogger(500, `Error updating mailer config: ${error.message}`);
-});
-const OPTIONS = async () => OptionsResponse(["POST", "UPDATE"]);
-const ALL = async () => AllResponse();
+  }
+);
 export {
   ALL,
   OPTIONS,
+  PATCH,
   POST,
-  SmtpConfigSchema,
-  UPDATE
+  SmtpConfigSchema
 };

package/dist/routes/api/mailer/test-email.d.ts

@@ -1,4 +1 @@
-import type { APIRoute } from 'astro';
-export declare const POST: APIRoute;
-export declare const OPTIONS: APIRoute;
-export declare const ALL: APIRoute;
+export declare const POST: import("astro").APIRoute, OPTIONS: import("astro").APIRoute, ALL: import("astro").APIRoute;

package/dist/routes/api/mailer/test-email.js

@@ -1,39 +1,62 @@
 import { apiResponseLogger } from "studiocms:logger";
 import { Mailer } from "studiocms:mailer";
-import { Effect } from "effect";
-import { convertToVanilla, genLogger } from "../../../lib/effects/index.js";
-import { AllResponse, OptionsResponse } from "../../../lib/endpointResponses.js";
-const POST = async (context) => await convertToVanilla(
-  genLogger("routes/mailer/test-email/POST")(function* () {
-    const mailer = yield* Mailer;
-    if (!context.locals.siteConfig.data.enableMailer) {
-      return apiResponseLogger(400, "Mailer is disabled, this action is disabled.");
+import {
+  AllResponse,
+  createEffectAPIRoutes,
+  createJsonResponse,
+  Effect,
+  genLogger,
+  OptionsResponse,
+  readAPIContextJson
+} from "../../../effect.js";
+const { POST, OPTIONS, ALL } = createEffectAPIRoutes(
+  {
+    POST: (ctx) => genLogger("routes/mailer/test-email/POST")(function* () {
+      const mailer = yield* Mailer;
+      if (!ctx.locals.StudioCMS.siteConfig.data.enableMailer) {
+        return apiResponseLogger(403, "Mailer is disabled for this site");
+      }
+      if (!ctx.locals.StudioCMS.security?.userSessionData.isLoggedIn) {
+        return apiResponseLogger(403, "Unauthorized");
+      }
+      if (!ctx.locals.StudioCMS.security?.userPermissionLevel.isOwner) {
+        return apiResponseLogger(403, "Unauthorized");
+      }
+      let test_email;
+      try {
+        ({ test_email } = yield* readAPIContextJson(ctx));
+      } catch {
+        return apiResponseLogger(400, "Invalid JSON body");
+      }
+      if (typeof test_email !== "string" || test_email.trim() === "") {
+        return apiResponseLogger(400, "Invalid form data, test_email is required");
+      }
+      const email = test_email.trim();
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+        return apiResponseLogger(400, "Invalid email address");
+      }
+      const response = yield* mailer.sendMail({
+        to: test_email,
+        subject: "StudioCMS Test Email",
+        text: "This is a test email from StudioCMS."
+      });
+      if ("error" in response) {
+        console.error("Mailer test-email failed:", response.error);
+        return apiResponseLogger(500, "Failed to send test email");
+      }
+      return apiResponseLogger(200, "Test email sent");
+    }).pipe(Mailer.Provide),
+    OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ["POST"] })),
+    ALL: () => Effect.try(() => AllResponse())
+  },
+  {
+    cors: { methods: ["POST", "OPTIONS"] },
+    onError: (error) => {
+      console.error("API Error:", error);
+      return createJsonResponse({ error: "Internal Server Error" }, { status: 500 });
     }
-    if (!context.locals.userSessionData.isLoggedIn) {
-      return apiResponseLogger(403, "Unauthorized");
-    }
-    if (!context.locals.userPermissionLevel.isOwner) {
-      return apiResponseLogger(403, "Unauthorized");
-    }
-    const { test_email } = yield* Effect.tryPromise(() => context.request.json());
-    if (!test_email || typeof test_email !== "string") {
-      return apiResponseLogger(400, "Invalid form data, test_email is required");
-    }
-    const response = yield* mailer.sendMail({
-      to: test_email,
-      subject: "StudioCMS Test Email",
-      text: "This is a test email from StudioCMS."
-    });
-    if ("error" in response) {
-      return apiResponseLogger(500, response.error);
-    }
-    return apiResponseLogger(200, response.message);
-  }).pipe(Mailer.Provide)
-).catch((error) => {
-  return apiResponseLogger(500, `Error sending test email: ${error.message}`);
-});
-const OPTIONS = async () => OptionsResponse(["POST"]);
-const ALL = async () => AllResponse();
+  }
+);
 export {
   ALL,
   OPTIONS,

package/dist/routes/api/render.astro

@@ -1,7 +1,7 @@
 ---
 export const partial = true;
 
-import { pipe } from 'effect';
+import { pipe } from '../../effect.js';
 import { parseMarkdown } from '../../utils/tinyMDParser.js';
 
 const astroJsonData = await Astro.request.json();

package/dist/routes/api/rest/utils/auth-token.d.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { Effect } from 'effect';
+import { Effect } from '../../../../effect.js';
 /**
  * Verifies the authentication token from the request header in the given API context.
  *
@@ -13,5 +13,5 @@ import { Effect } from 'effect';
 export declare const verifyAuthTokenFromHeader: (context: APIContext) => Effect.Effect<Response | {
     userId: string;
     key: string;
-    rank: string;
-}, import("effect/Cause").UnknownException | import("../../../../sdk/errors.js").SDKCoreError, never>;
+    rank: "unknown" | "owner" | "admin" | "editor" | "visitor";
+}, import("effect/Cause").UnknownException | import("../../../../virtuals/sdk/errors.js").SDKCoreError, never>;

package/dist/routes/api/rest/utils/auth-token.js

@@ -1,7 +1,6 @@
 import { apiResponseLogger } from "studiocms:logger";
 import { SDKCore } from "studiocms:sdk";
-import { Effect } from "effect";
-import { genLogger } from "../../../../lib/effects/index.js";
+import { Effect, genLogger } from "../../../../effect.js";
 const getAuthTokenFromHeader = (context) => genLogger("routes/rest/utils/auth-token/getAuthTokenFromHeader")(function* () {
   const authTokenData = yield* Effect.try(() => context.request.headers.get("Authorization"));
   if (!authTokenData) {

package/dist/routes/api/rest/v1/folders/[id].d.ts

@@ -1,5 +1,4 @@
-import type { APIRoute } from 'astro';
-import { Schema } from 'effect';
+import { Schema } from '../../../../../effect.js';
 declare const FolderBase_base: Schema.Class<FolderBase, {
     folderName: typeof Schema.String;
     parentFolder: Schema.Union<[typeof Schema.String, typeof Schema.Null]>;
@@ -13,9 +12,5 @@ declare const FolderBase_base: Schema.Class<FolderBase, {
 }, {}, {}>;
 export declare class FolderBase extends FolderBase_base {
 }
-export declare const GET: APIRoute;
-export declare const PATCH: APIRoute;
-export declare const DELETE: APIRoute;
-export declare const OPTIONS: APIRoute;
-export declare const ALL: APIRoute;
+export declare const GET: import("astro").APIRoute, PATCH: import("astro").APIRoute, DELETE: import("astro").APIRoute, OPTIONS: import("astro").APIRoute, ALL: import("astro").APIRoute;
 export {};