@access-dlsu/leapify 0.260507.4 → 0.260507.5

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createKyselyAdapter, getKyselyDatabaseType } from './chunk-FUCJEA2S.js';
 import { createDefu, wildcardMatch, getOrigin, getHost, getProtocol, betterFetch, PACKAGE_VERSION, isDynamicBaseURLConfig, getBaseURL, resolveBaseURL, isRequestLike, defu } from './chunk-IQEWVHLM.js';
 import './chunk-HHNEB7YR.js';
-import { createMiddleware, Hono, HTTPException, tryDecode, decodeURIComponent_, createPowChallengeMiddleware, POW_VERIFY_PATH, handlePowVerify } from './chunk-LJ5BSSYE.js';
+import { createMiddleware, Hono, HTTPException, tryDecode, decodeURIComponent_, createPowChallengeMiddleware, POW_VERIFY_PATH, handlePowVerify } from './chunk-5YYVBPAE.js';
 import { createRandomStringGenerator, createAdapterFactory, withSpan, ATTR_CONTEXT, import_semantic_conventions, ATTR_HOOK_TYPE, ATTR_OPERATION_ID, generateId, safeJSONParse, getAuthTables, initGetModelName, initGetFieldName } from './chunk-GNRL67OU.js';
 import './chunk-EGRHWZRV.js';
 import { APIError2, BASE_ERROR_CODES, kAPIErrorHeaderSymbol, BetterCallError, BetterAuthError, logger, ValidationError, APIError, env, isProduction, shouldPublishLog, isDevelopment, createLogger, isTest, getBooleanEnvVar, ENV, getEnvVar } from './chunk-MNEW2V4T.js';
@@ -62,11 +62,14 @@ function shouldPullFromContentful(mode) {
 
 // node_modules/hono/dist/middleware/cors/index.js
 var cors = (options) => {
-  const opts = {
+  const defaults = {
     origin: "*",
     allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"],
     allowHeaders: [],
-    exposeHeaders: [],
+    exposeHeaders: []
+  };
+  const opts = {
+    ...defaults,
     ...options
   };
   const findAllowOrigin = ((optsOrigin) => {
@@ -157,9 +160,22 @@ function createCorsMiddleware(allowedOrigins) {
   });
   return async (c, next) => {
     const origin = c.req.header("origin");
+    if (c.req.path.startsWith("/api/uploads/images")) {
+      c.header("Access-Control-Allow-Origin", "*");
+      c.header("Access-Control-Allow-Methods", "GET, OPTIONS");
+      if (c.req.method === "OPTIONS") {
+        return c.body(null, 204);
+      }
+      return next();
+    }
     if (!c.req.path.startsWith("/health") && !c.req.path.startsWith("/api/auth") && !c.req.path.startsWith("/internal") && origin && !allowedOrigins.includes("*") && !allowedOrigins.includes(origin)) {
       return c.json(
-        { error: { code: "DOMAIN_RESTRICTED", message: `Origin ${origin} is not allowed` } },
+        {
+          error: {
+            code: "DOMAIN_RESTRICTED",
+            message: `Origin ${origin} is not allowed`
+          }
+        },
         403
       );
     }
@@ -36664,11 +36680,21 @@ function createAuth(env2) {
             };
             if (isFirstUser) {
               await db.insert(users).values(base).onConflictDoUpdate({
-                target: users.betterAuthId,
-                set: { role: "super_admin" }
+                target: users.email,
+                set: {
+                  betterAuthId: user.id,
+                  role: "super_admin",
+                  name: user.name ?? user.email.split("@")[0]
+                }
               });
             } else {
-              await db.insert(users).values(base).onConflictDoNothing({ target: users.betterAuthId });
+              await db.insert(users).values(base).onConflictDoUpdate({
+                target: users.email,
+                set: {
+                  betterAuthId: user.id,
+                  name: user.name ?? user.email.split("@")[0]
+                }
+              });
             }
           }
         }
@@ -36697,7 +36723,13 @@ async function resolveUser(env2, betterAuthUserId, betterAuthUserEmail, betterAu
       betterAuthId: betterAuthUserId,
       email: betterAuthUserEmail,
       name: betterAuthUserName ?? betterAuthUserEmail.split("@")[0]
-    }).onConflictDoNothing({ target: users.betterAuthId }).returning();
+    }).onConflictDoUpdate({
+      target: users.email,
+      set: {
+        betterAuthId: betterAuthUserId,
+        name: betterAuthUserName ?? betterAuthUserEmail.split("@")[0]
+      }
+    }).returning();
     dbUser = created;
   }
   if (!dbUser) throw unauthorized("Failed to resolve user record");
@@ -40106,7 +40138,7 @@ async function ensureDatabase(d1) {
     try {
       await d1.prepare(sql3).run();
     } catch (err) {
-      if (err?.message?.includes("duplicate column") || err?.message?.includes("no such column: is_major")) {
+      if (err?.message?.includes("duplicate column") || err?.message?.includes("no such column") && err?.message?.includes("is_major")) {
         continue;
       }
       throw err;