Merge branch 'develop' of https://github.com/d-rec/drec-origin into D…

…R-839_Update_User_Fix
d-rec · Jul 8, 2024 · d4abe69 · d4abe69
2 parents c01cd53 + 093e0fb
commit d4abe69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/drec-api/src/pods/admin/admin.controller.ts b/apps/drec-api/src/pods/admin/admin.controller.ts
@@ -161,7 +161,11 @@ export class AdminController {
     type: CreateUserORGDTO,
     description: 'Returns a new created user',
   })
-  public async createUser(@Body() newUser: CreateUserORGDTO): Promise<UserDTO> {
+  public async createUser(
+    @Body() newUser: CreateUserORGDTO,
+    @UserDecorator() { api_user_id }: LoggedInUser,
+  ): Promise<UserDTO> {
+    newUser.api_user_id = api_user_id;
     return await this.userService.adminnewcreate(newUser);
   }
 

diff --git a/apps/drec-api/src/pods/user/user.service.ts b/apps/drec-api/src/pods/user/user.service.ts
@@ -166,6 +166,9 @@ export class UserService {
     inviteuser?: boolean,
   ): Promise<UserDTO> {
     await this.checkForExistingUser(data.email.toLowerCase());
+    const admin = await this.oauthClientCredentialsService.findOneByApiUserId(
+      data.api_user_id,
+    );
     let org_id;
     if (!inviteuser) {
       const orgdata = {
@@ -175,7 +178,7 @@ export class UserService {
         orgEmail: data.email,
         address: data.orgAddress,
       };
-
+      orgdata['api_user_id'] = admin.api_user_id;
       if (await this.organizationService.isNameAlreadyTaken(orgdata.name)) {
         throw new ConflictException({
           success: false,
@@ -212,6 +215,7 @@ export class UserService {
       role: role,
       roleId: roleId,
       organization: org_id ? { id: org_id } : {},
+      api_user_id: admin ? admin.api_user_id : null,
     });
     const { password, ...userData } = user;
     this.logger.debug(