@aeriajs/builtins 0.0.135 → 0.0.137

package/dist/authentication.d.ts

@@ -1,9 +1,9 @@
 import type { RouteContext, SchemaWithId, TokenRecipient } from '@aeriajs/types';
-import type { ObjectId } from '@aeriajs/core';
 import type { description } from './collections/user/description.js';
+export type TokenableUser = Pick<SchemaWithId<typeof description>, '_id' | 'name' | 'email' | 'roles' | 'active'>;
 export type SuccessfulAuthentication = {
-    user: Pick<SchemaWithId<typeof description>, 'name' | 'email' | 'roles' | 'active'> & {
-        _id: ObjectId | null;
+    user: TokenableUser & {
+        _id: null;
     };
     token: TokenRecipient;
 };
@@ -11,7 +11,7 @@ export declare enum AuthenticationError {
     InvalidCredentials = "INVALID_CREDENTIALS",
     InactiveUser = "INACTIVE_USER"
 }
-export declare const successfulAuthentication: (userId: ObjectId, context: RouteContext) => Promise<SuccessfulAuthentication>;
+export declare const successfulAuthentication: <TUser extends TokenableUser>(user: TUser, context: RouteContext) => Promise<SuccessfulAuthentication>;
 export declare const defaultSuccessfulAuthentication: () => Promise<{
     user: {
         _id: null;

package/dist/authentication.js

@@ -7,16 +7,7 @@ var AuthenticationError;
     AuthenticationError["InvalidCredentials"] = "INVALID_CREDENTIALS";
     AuthenticationError["InactiveUser"] = "INACTIVE_USER";
 })(AuthenticationError || (exports.AuthenticationError = AuthenticationError = {}));
-const successfulAuthentication = async (userId, context) => {
-    const { error, result: user } = await context.collections.user.functions.get({
-        filters: {
-            _id: userId,
-        },
-        populate: ['picture_file'],
-    });
-    if (error) {
-        throw new Error();
-    }
+const successfulAuthentication = async (user, context) => {
     const tokenContent = {
         sub: user._id,
         roles: user.roles,
@@ -46,7 +37,7 @@ const successfulAuthentication = async (userId, context) => {
     }
     const token = await (0, core_1.signToken)(tokenContent);
     return {
-        user: user,
+        user,
         token: {
             type: 'bearer',
             content: token,

package/dist/authentication.mjs

@@ -5,16 +5,7 @@ export var AuthenticationError = /* @__PURE__ */ ((AuthenticationError2) => {
   AuthenticationError2["InactiveUser"] = "INACTIVE_USER";
   return AuthenticationError2;
 })(AuthenticationError || {});
-export const successfulAuthentication = async (userId, context) => {
-  const { error, result: user } = await context.collections.user.functions.get({
-    filters: {
-      _id: userId
-    },
-    populate: ["picture_file"]
-  });
-  if (error) {
-    throw new Error();
-  }
+export const successfulAuthentication = async (user, context) => {
   const tokenContent = {
     sub: user._id,
     roles: user.roles,

package/dist/collections/user/authenticate.js

@@ -4,6 +4,7 @@ exports.authenticate = void 0;
 const types_1 = require("@aeriajs/types");
 const bcrypt_1 = require("bcrypt");
 const core_1 = require("@aeriajs/core");
+const common_1 = require("@aeriajs/common");
 const authentication_js_1 = require("../../authentication.js");
 const authenticate = async (props, context) => {
     if ('revalidate' in props) {
@@ -16,8 +17,17 @@ const authenticate = async (props, context) => {
         const decodedToken = token
             ? await (0, core_1.decodeToken)(token.content)
             : context.token;
+        const { error, result: user } = await context.collections.user.functions.get({
+            filters: {
+                _id: decodedToken.sub,
+            },
+            populate: ['picture_file'],
+        });
+        if (error) {
+            throw new Error();
+        }
         return types_1.Result.result(decodedToken.sub
-            ? await (0, authentication_js_1.successfulAuthentication)(decodedToken.sub, context)
+            ? await (0, authentication_js_1.successfulAuthentication)(user, context)
             : await (0, authentication_js_1.defaultSuccessfulAuthentication)());
     }
     if (typeof props.email !== 'string') {
@@ -34,7 +44,6 @@ const authenticate = async (props, context) => {
         email: props.email,
     }, {
         projection: {
-            email: 1,
             password: 1,
             active: 1,
         },
@@ -49,6 +58,12 @@ const authenticate = async (props, context) => {
             code: authentication_js_1.AuthenticationError.InactiveUser,
         });
     }
-    return types_1.Result.result(await (0, authentication_js_1.successfulAuthentication)(user._id, context));
+    const completeUser = (0, common_1.throwIfError)(await (0, core_1.get)({
+        filters: {
+            _id: user._id,
+        },
+        populate: ['picture_file'],
+    }, context));
+    return types_1.Result.result(await (0, authentication_js_1.successfulAuthentication)(completeUser, context));
 };
 exports.authenticate = authenticate;

package/dist/collections/user/authenticate.mjs

@@ -1,7 +1,8 @@
 "use strict";
 import { Result, HTTPStatus, ACError } from "@aeriajs/types";
 import { compare as bcryptCompare } from "bcrypt";
-import { decodeToken } from "@aeriajs/core";
+import { decodeToken, get } from "@aeriajs/core";
+import { throwIfError } from "@aeriajs/common";
 import { successfulAuthentication, defaultSuccessfulAuthentication, AuthenticationError } from "../../authentication.mjs";
 export const authenticate = async (props, context) => {
   if ("revalidate" in props) {
@@ -12,7 +13,16 @@ export const authenticate = async (props, context) => {
       });
     }
     const decodedToken = token ? await decodeToken(token.content) : context.token;
-    return Result.result(decodedToken.sub ? await successfulAuthentication(decodedToken.sub, context) : await defaultSuccessfulAuthentication());
+    const { error, result: user2 } = await context.collections.user.functions.get({
+      filters: {
+        _id: decodedToken.sub
+      },
+      populate: ["picture_file"]
+    });
+    if (error) {
+      throw new Error();
+    }
+    return Result.result(decodedToken.sub ? await successfulAuthentication(user2, context) : await defaultSuccessfulAuthentication());
   }
   if (typeof props.email !== "string") {
     return context.error(HTTPStatus.Unauthorized, {
@@ -30,7 +40,6 @@ export const authenticate = async (props, context) => {
     },
     {
       projection: {
-        email: 1,
         password: 1,
         active: 1
       }
@@ -46,5 +55,11 @@ export const authenticate = async (props, context) => {
       code: AuthenticationError.InactiveUser
     });
   }
-  return Result.result(await successfulAuthentication(user._id, context));
+  const completeUser = throwIfError(await get({
+    filters: {
+      _id: user._id
+    },
+    populate: ["picture_file"]
+  }, context));
+  return Result.result(await successfulAuthentication(completeUser, context));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.135",
+  "version": "0.0.137",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -45,11 +45,11 @@
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.135",
-    "@aeriajs/common": "^0.0.85",
-    "@aeriajs/entrypoint": "^0.0.87",
-    "@aeriajs/types": "^0.0.73",
-    "@aeriajs/validation": "^0.0.88"
+    "@aeriajs/core": "^0.0.137",
+    "@aeriajs/common": "^0.0.86",
+    "@aeriajs/entrypoint": "^0.0.88",
+    "@aeriajs/types": "^0.0.74",
+    "@aeriajs/validation": "^0.0.89"
   },
   "scripts": {
     "test": "echo skipping",