@sqrzro/server 2.0.0-bz.20 → 2.0.0-bz.22

package/dist/cache/CacheService.js

@@ -1,37 +1,24 @@
 import { createClient } from 'redis';
 let client = null;
 async function getClient() {
-    console.log('Getting the Redis client');
     if (!process.env.REDIS_URL) {
-        console.log('Redis URL is not defined. Access to the cache is not possible.');
         throw new Error('REDIS_URL is not defined. Access to the cache is not possible.');
     }
-    console.log('Redis URL is defined', process.env.REDIS_URL);
     if (client) {
-        console.log('Client already exists, using it');
         return client;
     }
-    console.log('Creating client...');
     client = createClient({
         socket: {
             tls: true,
         },
         url: process.env.REDIS_URL,
     });
-    console.log('Client created', client);
-    client.on('error', (err) => {
-        console.log('REDIS ERROR', err);
-    });
-    console.log('Connecting to the Redis server...');
     await client.connect();
-    console.log('Connected to the Redis server');
     return client;
 }
 export async function getFromCache(key) {
-    console.log('Getting from cache', key);
     return (await getClient()).get(key);
 }
 export async function setToCache(key, value) {
-    console.log('Setting to cache', key, value);
     await (await getClient()).set(key, value);
 }

package/dist/middleware.js

@@ -15,16 +15,26 @@ function redirect(request, pathname = DEFAULT_REDIRECT) {
     return applyHeaders(request, NextResponse.redirect(`${request.nextUrl.origin}${pathname}?r=${encodeURIComponent(getRelativeUrl(request.nextUrl))}`));
 }
 export async function handleMiddleware(request, nextFn) {
+    console.log('middleware', request.nextUrl.pathname);
+    // If the URL is /api/session, we should just return the response, otherwise we end up in a loop
+    if (request.nextUrl.pathname === '/api/session') {
+        console.log('URL is /api/session, returning');
+        return applyHeaders(request, nextFn ? nextFn() : NextResponse.next());
+    }
+    console.log('URL is not /api/session, continuing');
     const sessionID = request.cookies.get(process.env.AUTH_COOKIE_NAME || 'auth_session')?.value || '';
+    console.log(sessionID);
     try {
         const session = await fetch(`${request.nextUrl.origin}/api/session?id=${sessionID}&pathname=${request.nextUrl.pathname}`);
         const json = (await session.json());
+        console.log('json', json);
         if (json.redirect === null) {
             return applyHeaders(request, nextFn ? nextFn() : NextResponse.next());
         }
         return redirect(request, json.redirect);
     }
     catch (err) {
+        console.log('error', err);
         return redirect(request);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqrzro/server",
-  "version": "2.0.0-bz.20",
+  "version": "2.0.0-bz.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "ISC",