@aeriajs/server 0.0.277 → 0.0.279

package/dist/getToken.d.ts

@@ -0,0 +1,3 @@
+import type { GetTokenFunction, Token, AuthenticatedToken } from '@aeriajs/types';
+export declare const authenticationGuard: (decodedToken: Token) => decodedToken is AuthenticatedToken;
+export declare const getToken: GetTokenFunction;

package/dist/getToken.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getToken = exports.authenticationGuard = void 0;
+const types_1 = require("@aeriajs/types");
+const common_1 = require("@aeriajs/common");
+const core_1 = require("@aeriajs/core");
+const authenticationGuard = (decodedToken) => {
+    decodedToken.authenticated = true;
+    return true;
+};
+exports.authenticationGuard = authenticationGuard;
+const getToken = async (request, context) => {
+    if (!request.headers.authorization) {
+        return types_1.Result.result({
+            authenticated: false,
+            sub: null,
+        });
+    }
+    const decodedToken = await (0, core_1.decodeToken)(typeof request.headers.authorization === 'string'
+        ? request.headers.authorization.split('Bearer ').at(-1)
+        : '');
+    if ((0, exports.authenticationGuard)(decodedToken)) {
+        if (typeof decodedToken.sub === 'string') {
+            decodedToken.sub = new core_1.ObjectId(decodedToken.sub);
+            Object.assign(decodedToken.userinfo, (0, common_1.throwIfError)(await (0, core_1.traverseDocument)(decodedToken.userinfo, context.collections.user.description, {
+                autoCast: true,
+            })));
+            if (context.config.security.revalidateToken) {
+                const userCollection = (0, core_1.getDatabaseCollection)('user');
+                const user = await userCollection.findOne({
+                    _id: decodedToken.sub,
+                    active: true,
+                }, {
+                    projection: {
+                        roles: 1,
+                    },
+                });
+                if (!user) {
+                    return types_1.Result.error(types_1.ACError.InvalidToken);
+                }
+                const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
+                if (!rolesMatch) {
+                    return types_1.Result.error(types_1.ACError.InvalidToken);
+                }
+            }
+        }
+    }
+    return types_1.Result.result(decodedToken);
+};
+exports.getToken = getToken;

package/dist/getToken.mjs

@@ -0,0 +1,44 @@
+"use strict";
+import { Result, ACError } from "@aeriajs/types";
+import { throwIfError } from "@aeriajs/common";
+import { getDatabaseCollection, decodeToken, traverseDocument, ObjectId } from "@aeriajs/core";
+export const authenticationGuard = (decodedToken) => {
+  decodedToken.authenticated = true;
+  return true;
+};
+export const getToken = async (request, context) => {
+  if (!request.headers.authorization) {
+    return Result.result({
+      authenticated: false,
+      sub: null
+    });
+  }
+  const decodedToken = await decodeToken(typeof request.headers.authorization === "string" ? request.headers.authorization.split("Bearer ").at(-1) : "");
+  if (authenticationGuard(decodedToken)) {
+    if (typeof decodedToken.sub === "string") {
+      decodedToken.sub = new ObjectId(decodedToken.sub);
+      Object.assign(decodedToken.userinfo, throwIfError(await traverseDocument(decodedToken.userinfo, context.collections.user.description, {
+        autoCast: true
+      })));
+      if (context.config.security.revalidateToken) {
+        const userCollection = getDatabaseCollection("user");
+        const user = await userCollection.findOne({
+          _id: decodedToken.sub,
+          active: true
+        }, {
+          projection: {
+            roles: 1
+          }
+        });
+        if (!user) {
+          return Result.error(ACError.InvalidToken);
+        }
+        const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
+        if (!rolesMatch) {
+          return Result.error(ACError.InvalidToken);
+        }
+      }
+    }
+  }
+  return Result.result(decodedToken);
+};

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './init.js';
 export * from './warmup.js';
 export * from './loader.js';
+export * from './getToken.js';

package/dist/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./init.js"), exports);
 __exportStar(require("./warmup.js"), exports);
 __exportStar(require("./loader.js"), exports);
+__exportStar(require("./getToken.js"), exports);

package/dist/index.mjs

@@ -2,3 +2,4 @@
 export * from "./init.mjs";
 export * from "./warmup.mjs";
 export * from "./loader.mjs";
+export * from "./getToken.mjs";

package/dist/init.d.ts

@@ -1,4 +1,4 @@
-import type { RouteContext, Collection, GenericRequest, ApiConfig, AuthenticatedToken, NonCircularJsonSchema } from '@aeriajs/types';
+import type { RouteContext, Collection, ApiConfig, NonCircularJsonSchema } from '@aeriajs/types';
 import { type createRouter } from '@aeriajs/http';
 import { DEFAULT_API_CONFIG } from './constants.js';
 type DeepPartial<T> = T extends Record<string, unknown> ? {
@@ -14,22 +14,6 @@ export type InitOptions = {
         description: NonCircularJsonSchema;
     }>;
 };
-export declare const getToken: (request: GenericRequest, context: RouteContext) => Promise<{
-    readonly _tag: "Error";
-    readonly error: "INVALID_TOKEN";
-    readonly result: undefined;
-} | {
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: import("@aeriajs/types").UnauthenticatedToken | AuthenticatedToken<true, import("@aeriajs/types").UserRole>;
-} | {
-    readonly _tag: "Error";
-    readonly error: {
-        readonly httpStatus: 401;
-        readonly code: "AUTHENTICATION_ERROR";
-    };
-    readonly result: undefined;
-}>;
 export declare const init: (_options?: InitOptions) => {
     options: {
         config: {};

package/dist/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.getToken = void 0;
+exports.init = void 0;
 const types_1 = require("@aeriajs/types");
 const common_1 = require("@aeriajs/common");
 const http_1 = require("@aeriajs/http");
@@ -9,60 +9,7 @@ const core_1 = require("@aeriajs/core");
 const constants_js_1 = require("./constants.js");
 const warmup_js_1 = require("./warmup.js");
 const routes_js_1 = require("./routes.js");
-const authenticationGuard = (decodedToken) => {
-    decodedToken.authenticated = true;
-    return true;
-};
-const getToken = async (request, context) => {
-    if (!request.headers.authorization) {
-        return types_1.Result.result({
-            authenticated: false,
-            sub: null,
-        });
-    }
-    try {
-        const decodedToken = await (0, core_1.decodeToken)(typeof request.headers.authorization === 'string'
-            ? request.headers.authorization.split('Bearer ').at(-1)
-            : '');
-        if (authenticationGuard(decodedToken)) {
-            if (typeof decodedToken.sub === 'string') {
-                decodedToken.sub = new core_1.ObjectId(decodedToken.sub);
-                Object.assign(decodedToken.userinfo, (0, common_1.throwIfError)(await (0, core_1.traverseDocument)(decodedToken.userinfo, context.collections.user.description, {
-                    autoCast: true,
-                })));
-                if (context.config.security.revalidateToken) {
-                    const userCollection = (0, core_1.getDatabaseCollection)('user');
-                    const user = await userCollection.findOne({
-                        _id: decodedToken.sub,
-                        active: true,
-                    }, {
-                        projection: {
-                            roles: 1,
-                        },
-                    });
-                    if (!user) {
-                        return types_1.Result.error(types_1.ACError.InvalidToken);
-                    }
-                    const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
-                    if (!rolesMatch) {
-                        return types_1.Result.error(types_1.ACError.InvalidToken);
-                    }
-                }
-            }
-        }
-        return types_1.Result.result(decodedToken);
-    }
-    catch (err) {
-        if (process.env.NODE_ENV === 'development') {
-            console.trace(err);
-        }
-        return (0, common_1.endpointError)({
-            httpStatus: types_1.HTTPStatus.Unauthorized,
-            code: types_1.ACError.AuthenticationError,
-        });
-    }
-};
-exports.getToken = getToken;
+const getToken_js_1 = require("./getToken.js");
 const init = (_options = {}) => {
     const options = Object.assign({
         config: {},
@@ -86,14 +33,41 @@ const init = (_options = {}) => {
             const apiRouter = (0, routes_js_1.registerRoutes)();
             const server = (0, node_http_1.registerServer)(config.server, async (request, response) => {
                 if (config.server && config.server.cors) {
-                    if ((0, http_1.cors)(request, response, config.server.cors) === null) {
+                    let result;
+                    switch (typeof config.server.cors) {
+                        case 'function': {
+                            result = await config.server.cors(request, response, constants_js_1.DEFAULT_API_CONFIG.server.cors);
+                            break;
+                        }
+                        case 'object': {
+                            result = await (0, http_1.cors)(request, response, config.server.cors);
+                            break;
+                        }
+                    }
+                    if (result === null) {
                         return;
                     }
                 }
                 await (0, http_1.wrapRouteExecution)(response, async () => {
-                    const { error, result: token } = await (0, exports.getToken)(request, parentContext);
-                    if (error) {
-                        return types_1.Result.error(error);
+                    const getTokenFn = config.server?.getToken
+                        ? config.server.getToken
+                        : getToken_js_1.getToken;
+                    let token;
+                    try {
+                        const { error, result } = await getTokenFn(request, parentContext);
+                        if (error) {
+                            return types_1.Result.error(error);
+                        }
+                        token = result;
+                    }
+                    catch (err) {
+                        if (process.env.NODE_ENV === 'development') {
+                            console.trace(err);
+                        }
+                        return (0, common_1.endpointError)({
+                            httpStatus: types_1.HTTPStatus.Unauthorized,
+                            code: types_1.ACError.AuthenticationError,
+                        });
                     }
                     const context = await (0, core_1.createContext)({
                         parentContext,

package/dist/init.mjs

@@ -1,62 +1,13 @@
 "use strict";
-import { Result, ACError, HTTPStatus } from "@aeriajs/types";
-import { endpointError, throwIfError, deepMerge } from "@aeriajs/common";
+import { ACError, HTTPStatus, Result } from "@aeriajs/types";
+import { deepMerge, endpointError } from "@aeriajs/common";
 import { cors, wrapRouteExecution } from "@aeriajs/http";
 import { registerServer } from "@aeriajs/node-http";
-import { createContext, getDatabase, getDatabaseCollection, decodeToken, traverseDocument, ObjectId } from "@aeriajs/core";
+import { createContext, getDatabase } from "@aeriajs/core";
 import { DEFAULT_API_CONFIG } from "./constants.mjs";
 import { warmup } from "./warmup.mjs";
 import { registerRoutes } from "./routes.mjs";
-const authenticationGuard = (decodedToken) => {
-  decodedToken.authenticated = true;
-  return true;
-};
-export const getToken = async (request, context) => {
-  if (!request.headers.authorization) {
-    return Result.result({
-      authenticated: false,
-      sub: null
-    });
-  }
-  try {
-    const decodedToken = await decodeToken(typeof request.headers.authorization === "string" ? request.headers.authorization.split("Bearer ").at(-1) : "");
-    if (authenticationGuard(decodedToken)) {
-      if (typeof decodedToken.sub === "string") {
-        decodedToken.sub = new ObjectId(decodedToken.sub);
-        Object.assign(decodedToken.userinfo, throwIfError(await traverseDocument(decodedToken.userinfo, context.collections.user.description, {
-          autoCast: true
-        })));
-        if (context.config.security.revalidateToken) {
-          const userCollection = getDatabaseCollection("user");
-          const user = await userCollection.findOne({
-            _id: decodedToken.sub,
-            active: true
-          }, {
-            projection: {
-              roles: 1
-            }
-          });
-          if (!user) {
-            return Result.error(ACError.InvalidToken);
-          }
-          const rolesMatch = decodedToken.roles.every((role) => user.roles.includes(role));
-          if (!rolesMatch) {
-            return Result.error(ACError.InvalidToken);
-          }
-        }
-      }
-    }
-    return Result.result(decodedToken);
-  } catch (err) {
-    if (true) {
-      console.trace(err);
-    }
-    return endpointError({
-      httpStatus: HTTPStatus.Unauthorized,
-      code: ACError.AuthenticationError
-    });
-  }
-};
+import { getToken } from "./getToken.mjs";
 export const init = (_options = {}) => {
   const options = Object.assign({
     config: {}
@@ -80,14 +31,38 @@ export const init = (_options = {}) => {
       const apiRouter = registerRoutes();
       const server = registerServer(config.server, async (request, response) => {
         if (config.server && config.server.cors) {
-          if (cors(request, response, config.server.cors) === null) {
+          let result;
+          switch (typeof config.server.cors) {
+            case "function": {
+              result = await config.server.cors(request, response, DEFAULT_API_CONFIG.server.cors);
+              break;
+            }
+            case "object": {
+              result = await cors(request, response, config.server.cors);
+              break;
+            }
+          }
+          if (result === null) {
             return;
           }
         }
         await wrapRouteExecution(response, async () => {
-          const { error, result: token } = await getToken(request, parentContext);
-          if (error) {
-            return Result.error(error);
+          const getTokenFn = config.server?.getToken ? config.server.getToken : getToken;
+          let token;
+          try {
+            const { error, result } = await getTokenFn(request, parentContext);
+            if (error) {
+              return Result.error(error);
+            }
+            token = result;
+          } catch (err) {
+            if (true) {
+              console.trace(err);
+            }
+            return endpointError({
+              httpStatus: HTTPStatus.Unauthorized,
+              code: ACError.AuthenticationError
+            });
           }
           const context = await createContext({
             parentContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/server",
-  "version": "0.0.277",
+  "version": "0.0.279",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,14 +33,14 @@
     "mongodb": "^6.17.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.275",
-    "@aeriajs/builtins": "^0.0.275",
-    "@aeriajs/common": "^0.0.156",
-    "@aeriajs/entrypoint": "^0.0.162",
-    "@aeriajs/http": "^0.0.191",
-    "@aeriajs/node-http": "^0.0.191",
-    "@aeriajs/server": "^0.0.277",
-    "@aeriajs/types": "^0.0.134",
+    "@aeriajs/core": "^0.0.277",
+    "@aeriajs/builtins": "^0.0.277",
+    "@aeriajs/common": "^0.0.157",
+    "@aeriajs/entrypoint": "^0.0.163",
+    "@aeriajs/http": "^0.0.193",
+    "@aeriajs/node-http": "^0.0.193",
+    "@aeriajs/server": "^0.0.279",
+    "@aeriajs/types": "^0.0.135",
     "mongodb": "^6.17.0"
   },
   "scripts": {