Merge pull request #315 from kmcwebdev/development

Create new propelauth user if user does not exist
kmcwebdev · Oct 9, 2023 · 4e270ea · 4e270ea
2 parents 8f51e8f + f41e86c
commit 4e270ea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/src/finance/services/memphis/reimbursement.memphis.new-request.service.ts b/src/finance/services/memphis/reimbursement.memphis.new-request.service.ts
@@ -201,16 +201,27 @@ export class ReimbursementMemphisNewRequestService implements OnModuleInit {
                   }
                 }
 
+                let propelauth_user_id = '';
+
                 const propelauthUser =
                   await this.usersApiService.fetchUserInPropelauthByEmail(
                     email,
                   );
 
+                propelauth_user_id = propelauthUser.userId;
+
                 if (!propelauthUser) {
-                  await this.usersApiService.createUserInPropelauth(
-                    email,
-                    'External Reimbursement Approver Manager',
-                  );
+                  const newPropelauthUser =
+                    await this.usersApiService.createUserInPropelauth(
+                      email,
+                      'External Reimbursement Approver Manager',
+                    );
+
+                  propelauth_user_id = newPropelauthUser.userId;
+                }
+
+                if (!propelauth_user_id) {
+                  throw new Error('Propelauth user id not populated with data');
                 }
 
                 let approverManager = await trx
@@ -239,6 +250,7 @@ export class ReimbursementMemphisNewRequestService implements OnModuleInit {
                   const dbUser =
                     await this.usersApiService.createOrGetUserInDatabase({
                       email,
+                      propelauth_user_id,
                     });
 
                   const newApprover = await trx
@@ -254,7 +266,7 @@ export class ReimbursementMemphisNewRequestService implements OnModuleInit {
                   approverManager = {
                     approver_id: newApprover.approver_id,
                     user_id: dbUser.user_id,
-                    propelauth_user_id: dbUser.propelauth_user_id,
+                    propelauth_user_id,
                     email: dbUser.email,
                     full_name: dbUser.full_name,
                   };
@@ -305,7 +317,7 @@ export class ReimbursementMemphisNewRequestService implements OnModuleInit {
 
                 const actionToken =
                   await this.generatePropelauthLongliveAcessToken({
-                    user_id: approverManager.propelauth_user_id,
+                    user_id: propelauth_user_id,
                   })
                     .then((data) => data.access_token)
                     .catch(() => {

diff --git a/src/users/services/users.api.service.ts b/src/users/services/users.api.service.ts
@@ -127,13 +127,10 @@ export class UsersApiService {
 
     const newPropelauthUser = await propelauth.createUser({
       email: email,
-      firstName: 'Juan',
-      lastName: 'Dela Cruz',
-      username: email.match(/([^@]+)/)[0],
       password: temporaryPassword,
       askUserToUpdatePasswordOnLogin: true,
-      sendEmailToConfirmEmailAddress: false,
-      emailConfirmed: true,
+      sendEmailToConfirmEmailAddress: true,
+      emailConfirmed: false,
     });
 
     this.eventEmitter.emit('reimbursement-request-send-email-new-user', {