@friggframework/core 2.0.0--canary.395.4cca0c3.0 → 2.0.0--canary.395.25f994b.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.395.4cca0c3.0",
+  "version": "2.0.0--canary.395.25f994b.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.395.4cca0c3.0",
-    "@friggframework/prettier-config": "2.0.0--canary.395.4cca0c3.0",
-    "@friggframework/test": "2.0.0--canary.395.4cca0c3.0",
+    "@friggframework/eslint-config": "2.0.0--canary.395.25f994b.0",
+    "@friggframework/prettier-config": "2.0.0--canary.395.25f994b.0",
+    "@friggframework/test": "2.0.0--canary.395.25f994b.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "4cca0c3988898d86f3d8b0679b05939bb3049848"
+  "gitHead": "25f994b4ae76131e3c0f333b3d17211950254c54"
 }

package/user/tests/doubles/test-user-repository.js

@@ -14,19 +14,11 @@ class TestUserRepository {
     }
 
     async findOrganizationUserById(userId) {
-        const orgUserDoc = this.organizationUsers.get(userId);
-        if (!orgUserDoc) {
-            throw Boom.unauthorized('Organization User Not Found');
-        }
-        return new User(null, orgUserDoc, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.organizationUsers.get(userId);
     }
 
     async findIndividualUserById(userId) {
-        const individualUserDoc = this.individualUsers.get(userId);
-        if (!individualUserDoc) {
-            throw Boom.unauthorized('Individual User Not Found');
-        }
-        return new User(individualUserDoc, null, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.individualUsers.get(userId);
     }
 
     async createToken(userId, rawToken, minutes = 120) {
@@ -38,77 +30,42 @@ class TestUserRepository {
     async createIndividualUser(params) {
         const individualUserData = { id: `individual-${Date.now()}`, ...params };
         this.individualUsers.set(individualUserData.id, individualUserData);
-        return new User(
-            individualUserData,
-            null,
-            this.userConfig.usePassword,
-            this.userConfig.primary,
-            this.userConfig.individualUserRequired,
-            this.userConfig.organizationUserRequired
-        );
+        return individualUserData;
     }
 
     async createOrganizationUser(params) {
         const orgUserData = { ...params, id: `org-${Date.now()}` };
         this.organizationUsers.set(orgUserData.id, orgUserData);
-        return new User(
-            null,
-            orgUserData,
-            this.userConfig.usePassword,
-            this.userConfig.primary,
-            this.userConfig.individualUserRequired,
-            this.userConfig.organizationUserRequired
-        );
+        return orgUserData;
     }
 
     async findIndividualUserByUsername(username) {
         for (const userDoc of this.individualUsers.values()) {
             if (userDoc.username === username) {
-                return new User(
-                    userDoc,
-                    null,
-                    this.userConfig.usePassword,
-                    this.userConfig.primary,
-                    this.userConfig.individualUserRequired,
-                    this.userConfig.organizationUserRequired
-                );
+                return userDoc;
             }
         }
-        throw Boom.unauthorized('user not found');
+        return null;
     }
 
     async findIndividualUserByAppUserId(appUserId) {
-        if (!appUserId) throw Boom.unauthorized('user not found');
+        if (!appUserId) return null;
         for (const userDoc of this.individualUsers.values()) {
             if (userDoc.appUserId === appUserId) {
-                return new User(
-                    userDoc,
-                    null,
-                    this.userConfig.usePassword,
-                    this.userConfig.primary,
-                    this.userConfig.individualUserRequired,
-                    this.userConfig.organizationUserRequired
-                );
+                return userDoc;
             }
         }
-        throw Boom.unauthorized('user not found');
+        return null;
     }
 
     async findOrganizationUserByAppOrgId(appOrgId) {
-        if (!appOrgId) throw Boom.unauthorized('user not found');
+        if (!appOrgId) return null;
         for (const userDoc of this.organizationUsers.values()) {
             if (userDoc.appOrgId === appOrgId) {
-                return new User(
-                    null,
-                    userDoc,
-                    this.userConfig.usePassword,
-                    this.userConfig.primary,
-                    this.userConfig.individualUserRequired,
-                    this.userConfig.organizationUserRequired
-                );
+                return userDoc;
             }
         }
-        throw Boom.unauthorized('user not found');
+        return null;
     }
 }
 

package/user/tests/use-cases/get-user-from-bearer-token.test.js

@@ -25,14 +25,14 @@ describe('GetUserFromBearerToken Use Case', () => {
     it('should retrieve a user for a valid bearer token', async () => {
         const userId = 'user-123';
         const token = await userRepository.createToken(userId);
-        const createdUser = await userRepository.createIndividualUser({
+        const createdUserData = await userRepository.createIndividualUser({
             id: userId,
         });
 
         const user = await getUserFromBearerToken.execute(`Bearer ${token}`);
 
         expect(user).toBeDefined();
-        expect(user.getId()).toBe(createdUser.getId());
+        expect(user.getId()).toBe(createdUserData.id);
     });
 
     it('should throw an unauthorized error if the bearer token is missing', async () => {

package/user/tests/use-cases/login-user.test.js

@@ -58,9 +58,6 @@ describe('LoginUser Use Case', () => {
         it('should throw an unauthorized error for a non-existent user', async () => {
             const username = 'non-existent-user';
             const password = 'password123';
-            userRepository.findIndividualUserByUsername = jest
-                .fn()
-                .mockRejectedValue(new Error('user not found'));
 
             await expect(
                 loginUser.execute({ username, password })
@@ -80,18 +77,19 @@ describe('LoginUser Use Case', () => {
 
         it('should successfully retrieve a user by appUserId', async () => {
             const appUserId = 'app-user-123';
-            const createdUser = await userRepository.createIndividualUser({
+            const createdUserData = await userRepository.createIndividualUser({
                 appUserId,
             });
 
             const result = await loginUser.execute({ appUserId });
-            expect(result.getId()).toBe(createdUser.getId());
+            expect(result.getId()).toBe(createdUserData.id);
         });
     });
 
     describe('With Organization User', () => {
         beforeEach(() => {
             userConfig = {
+                primary: 'organization',
                 individualUserRequired: false,
                 organizationUserRequired: true,
             };
@@ -104,23 +102,20 @@ describe('LoginUser Use Case', () => {
 
         it('should successfully retrieve an organization user by appOrgId', async () => {
             const appOrgId = 'app-org-123';
-            const createdUser = await userRepository.createOrganizationUser({
+            const createdUserData = await userRepository.createOrganizationUser({
                 name: 'Test Org',
                 appOrgId,
             });
 
             const result = await loginUser.execute({ appOrgId });
-            expect(result.getId()).toBe(createdUser.getId());
+            expect(result.getId()).toBe(createdUserData.id);
         });
 
         it('should throw an unauthorized error for a non-existent organization user', async () => {
             const appOrgId = 'non-existent-org';
-            userRepository.findOrganizationUserByAppOrgId = jest
-                .fn()
-                .mockRejectedValue(new Error('user not found'));
 
             await expect(loginUser.execute({ appOrgId })).rejects.toThrow(
-                'user not found'
+                'org user non-existent-org not found'
             );
         });
     });
@@ -132,9 +127,6 @@ describe('LoginUser Use Case', () => {
                 usePassword: false,
             };
             userRepository = new TestUserRepository({ userConfig });
-            userRepository.findIndividualUserByAppUserId = jest
-                .fn()
-                .mockRejectedValue(new Error('user not found'));
             loginUser = new LoginUser({
                 userRepository,
                 userConfig,

package/user/use-cases/create-individual-user.js

@@ -1,5 +1,6 @@
 const { get } = require('../../assertions');
 const Boom = require('@hapi/boom');
+const { User } = require('../user');
 
 /**
  * Use case for creating an individual user.
@@ -38,14 +39,22 @@ class CreateIndividualUser {
         const appUserId = get(params, 'appUserId', null);
         const organizationUserId = get(params, 'organizationUserId', null);
 
-        const individualUser = await this.userRepository.createIndividualUser({
+        const individualUserData = await this.userRepository.createIndividualUser({
             email,
             username,
             hashword,
             appUserId,
             organizationUser: organizationUserId,
         });
-        return individualUser;
+
+        return new User(
+            individualUserData,
+            null,
+            this.userConfig.usePassword,
+            this.userConfig.primary,
+            this.userConfig.individualUserRequired,
+            this.userConfig.organizationUserRequired
+        );
     }
 }
 

package/user/use-cases/create-organization-user.js

@@ -1,6 +1,6 @@
 const { get } = require('../../assertions');
+const { User } = require('../user');
 
-// todo: this is not used anywhere, check if needed
 /**
  * Use case for creating an organization user.
  * @class CreateOrganizationUser
@@ -27,12 +27,20 @@ class CreateOrganizationUser {
         const name = get(params, 'name');
         const appOrgId = get(params, 'appOrgId');
 
-        const organizationUser =
+        const organizationUserData =
             await this.userRepository.createOrganizationUser({
                 name,
                 appOrgId,
             });
-        return organizationUser;
+
+        return new User(
+            null,
+            organizationUserData,
+            this.userConfig.usePassword,
+            this.userConfig.primary,
+            this.userConfig.individualUserRequired,
+            this.userConfig.organizationUserRequired
+        );
     }
 }
 

package/user/use-cases/get-user-from-bearer-token.js

@@ -1,4 +1,5 @@
 const Boom = require('@hapi/boom');
+const { User } = require('../user');
 
 /**
  * Use case for retrieving a user from a bearer token.
@@ -40,10 +41,36 @@ class GetUserFromBearerToken {
         }
 
         if (this.userConfig.primary === 'organization') {
-            return this.userRepository.findOrganizationUserById(sessionToken.user);
+            const organizationUserData = await this.userRepository.findOrganizationUserById(sessionToken.user);
+
+            if (!organizationUserData) {
+                throw Boom.unauthorized('Organization User Not Found');
+            }
+
+            return new User(
+                null,
+                organizationUserData,
+                this.userConfig.usePassword,
+                this.userConfig.primary,
+                this.userConfig.individualUserRequired,
+                this.userConfig.organizationUserRequired
+            );
+        }
+
+        const individualUserData = await this.userRepository.findIndividualUserById(sessionToken.user);
+
+        if (!individualUserData) {
+            throw Boom.unauthorized('Individual User Not Found');
         }
 
-        return this.userRepository.findIndividualUserById(sessionToken.user);
+        return new User(
+            individualUserData,
+            null,
+            this.userConfig.usePassword,
+            this.userConfig.primary,
+            this.userConfig.individualUserRequired,
+            this.userConfig.organizationUserRequired
+        );
     }
 }
 

package/user/use-cases/login-user.js

@@ -2,6 +2,7 @@ const Boom = require('@hapi/boom');
 const {
     RequiredPropertyError,
 } = require('../../errors');
+const { User } = require('../user');
 
 /**
  * Use case for logging in a user.
@@ -46,22 +47,48 @@ class LoginUser {
                     });
                 }
 
-                const individualUser =
+                const individualUserData =
                     await this.userRepository.findIndividualUserByUsername(
                         username
                     );
 
+                if (!individualUserData) {
+                    throw Boom.unauthorized('user not found');
+                }
+
+                const individualUser = new User(
+                    individualUserData,
+                    null,
+                    this.userConfig.usePassword,
+                    this.userConfig.primary,
+                    this.userConfig.individualUserRequired,
+                    this.userConfig.organizationUserRequired
+                );
+
                 if (!individualUser.isPasswordValid(password)) {
                     throw Boom.unauthorized('Incorrect username or password');
                 }
 
                 return individualUser;
             } else {
-                const individualUser =
+                const individualUserData =
                     await this.userRepository.findIndividualUserByAppUserId(
                         appUserId
                     );
 
+                if (!individualUserData) {
+                    throw Boom.unauthorized('user not found');
+                }
+
+                const individualUser = new User(
+                    individualUserData,
+                    null,
+                    this.userConfig.usePassword,
+                    this.userConfig.primary,
+                    this.userConfig.individualUserRequired,
+                    this.userConfig.organizationUserRequired
+                );
+
                 return individualUser;
             }
         }
@@ -69,13 +96,22 @@ class LoginUser {
 
         if (this.userConfig.organizationUserRequired) {
 
-            const organizationUser =
+            const organizationUserData =
                 await this.userRepository.findOrganizationUserByAppOrgId(appOrgId);
 
-            if (!organizationUser) {
+            if (!organizationUserData) {
                 throw Boom.unauthorized(`org user ${appOrgId} not found`);
             }
 
+            const organizationUser = new User(
+                null,
+                organizationUserData,
+                this.userConfig.usePassword,
+                this.userConfig.primary,
+                this.userConfig.individualUserRequired,
+                this.userConfig.organizationUserRequired
+            );
+
             return organizationUser;
         }
 

package/user/user-repository.js

@@ -1,11 +1,7 @@
 const { Token } = require('../database/models/Token');
 const { IndividualUser } = require('../database/models/IndividualUser');
 const { OrganizationUser } = require('../database/models/OrganizationUser');
-const { User } = require('./user');
-const Boom = require('@hapi/boom');
 
-
-//todo: the user class instantiation needs to happen in each use case and not here.
 class UserRepository {
     /**
      * @param {Object} userConfig - The user config in the app definition.
@@ -26,23 +22,11 @@ class UserRepository {
     }
 
     async findOrganizationUserById(userId) {
-        const organizationUser = await this.OrganizationUser.findById(userId);
-
-        if (!organizationUser) {
-            throw Boom.unauthorized('Organization User Not Found');
-        }
-
-        return new User(null, organizationUser, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.OrganizationUser.findById(userId);
     }
 
     async findIndividualUserById(userId) {
-        const individualUser = await this.IndividualUser.findById(userId);
-
-        if (!individualUser) {
-            throw Boom.unauthorized('Individual User Not Found');
-        }
-
-        return new User(individualUser, null, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.IndividualUser.findById(userId);
     }
 
     async createToken(userId, rawToken, minutes = 120) {
@@ -55,43 +39,23 @@ class UserRepository {
     }
 
     async createIndividualUser(params) {
-        const individualUser = await this.IndividualUser.create(params);
-        return new User(individualUser, null, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.IndividualUser.create(params);
     }
 
     async createOrganizationUser(params) {
-        const organizationUser = await this.OrganizationUser.create(params);
-        return new User(null, organizationUser, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.OrganizationUser.create(params);
     }
 
     async findIndividualUserByUsername(username) {
-        const individualUser = await this.IndividualUser.findOne({ username });
-
-        if (!individualUser) {
-            throw Boom.unauthorized('user not found');
-        }
-
-        return new User(individualUser, null, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.IndividualUser.findOne({ username });
     }
 
     async findIndividualUserByAppUserId(appUserId) {
-        const individualUser = await this.IndividualUser.getUserByAppUserId(appUserId);
-
-        if (!individualUser) {
-            throw Boom.unauthorized('user not found');
-        }
-
-        return new User(individualUser, null, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.IndividualUser.getUserByAppUserId(appUserId);
     }
 
     async findOrganizationUserByAppOrgId(appOrgId) {
-        const organizationUser = await this.OrganizationUser.getUserByAppOrgId(appOrgId);
-
-        if (!organizationUser) {
-            throw Boom.unauthorized('user not found');
-        }
-
-        return new User(null, organizationUser, this.userConfig.usePassword, this.userConfig.primary, this.userConfig.individualUserRequired, this.userConfig.organizationUserRequired);
+        return this.OrganizationUser.getUserByAppOrgId(appOrgId);
     }
 }