@sqrzro/server 2.0.0-bz.2 → 2.0.0-bz.3

package/dist/SessionService.js

@@ -12,7 +12,7 @@ async function createSessionForId(id) {
         .setJti((0, uuid_1.v4)())
         .setProtectedHeader({ alg: 'HS256' })
         .setSubject(id.toString())
-        .sign(new TextEncoder().encode('secret'));
+        .sign(new TextEncoder().encode(process.env.APP_KEY));
     (0, headers_1.cookies)().set('token', token, {
         httpOnly: true,
         maxAge: SESSION_COOKIE_EXPIRY,
@@ -20,11 +20,11 @@ async function createSessionForId(id) {
 }
 exports.createSessionForId = createSessionForId;
 async function getIdFromToken(token) {
-    if (!token) {
-        throw new Error('Could not get ID. Token does not exist.');
+    if (!token || !process.env.APP_KEY) {
+        throw new Error('No token and/or app key provided');
     }
     try {
-        const verified = await (0, jose_1.jwtVerify)(token, new TextEncoder().encode('secret'));
+        const verified = await (0, jose_1.jwtVerify)(token, new TextEncoder().encode(process.env.APP_KEY));
         return verified.payload.sub ? parseInt(verified.payload.sub, 10) : 0;
     }
     catch (err) {

package/dist/middleware.d.ts

@@ -0,0 +1,4 @@
+import { NextResponse } from 'next/server';
+import type { NextRequest } from 'next/server';
+export declare function getIdFromToken(token: string | null): Promise<number>;
+export declare function handleMiddleware(request: NextRequest, url: string): Promise<NextResponse>;

package/dist/middleware.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleMiddleware = exports.getIdFromToken = void 0;
+const jose_1 = require("jose");
+const server_1 = require("next/server");
+async function getIdFromToken(token) {
+    if (!token || !process.env.APP_KEY) {
+        return 0;
+    }
+    try {
+        const verified = await (0, jose_1.jwtVerify)(token, new TextEncoder().encode(process.env.APP_KEY));
+        return verified.payload.sub ? parseInt(verified.payload.sub, 10) : 0;
+    }
+    catch (err) {
+        return 0;
+    }
+}
+exports.getIdFromToken = getIdFromToken;
+function getRelativeUrl(url) {
+    return url.replace(new URL(url).origin, '');
+}
+function redirectToLogin(request, url) {
+    if (new URL(request.url).pathname === '/login') {
+        return server_1.NextResponse.next();
+    }
+    return server_1.NextResponse.redirect(`${url}login?r=${encodeURIComponent(getRelativeUrl(request.url))}`);
+}
+async function handleMiddleware(request, url) {
+    const token = request.cookies.get('token')?.value;
+    const userId = await getIdFromToken(token || null);
+    if (!userId) {
+        return redirectToLogin(request, url);
+    }
+    return server_1.NextResponse.next();
+}
+exports.handleMiddleware = handleMiddleware;

package/middleware.d.ts

@@ -0,0 +1 @@
+export * from './dist/middleware';

package/middleware.js

@@ -0,0 +1 @@
+module.exports = require('./dist/middleware');

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "@sqrzro/server",
-  "version": "2.0.0-bz.2",
+  "version": "2.0.0-bz.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "exports": {
-    ".": "./dist/index.js"
-  },
   "license": "ISC",
   "files": [
-    "dist"
+    "dist",
+    "middleware.js",
+    "middleware.d.ts"
   ],
   "dependencies": {
     "@sqrzro/utility": "bz",
     "bcryptjs": "^2.4.3",
     "joi": "^17.11.0",
-    "jose": "^5.0.1",
+    "jose": "^5.2.0",
     "next": "^14.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -30,8 +29,8 @@
     "eslint": "^8.55.0",
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
-    "tslib": "^2.3.1",
-    "typescript": "^5.2.2"
+    "tslib": "^2.6.2",
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "build": "pnpm clean && tsc --project tsconfig.build.json",