fix:modification in session creation and account creation

Signed-off-by: shitrerohit <[email protected]>

Author: shitrerohit

apps/organization/src/organization.service.ts

@@ -27,7 +27,7 @@ import { sendEmail } from '@credebl/common/send-grid-helper-file';
 import { CreateOrganizationDto } from '../dtos/create-organization.dto';
 import { BulkSendInvitationDto } from '../dtos/send-invitation.dto';
 import { UpdateInvitationDto } from '../dtos/update-invitation.dt';
-import { DidMethod, Invitation, Ledgers, PrismaTables, TokenType, transition } from '@credebl/enum/enum';
+import { DidMethod, Invitation, Ledgers, PrismaTables, SessionType, TokenType, transition } from '@credebl/enum/enum';
 import {
   IGetOrgById,
   IGetOrganization,
@@ -712,7 +712,8 @@ export class OrganizationService {
     const sessionData = {
       sessionToken: authenticationResult?.access_token,
       userId: orgRoleDetails['user'].id,
-      expires: authenticationResult?.expires_in
+      expires: authenticationResult?.expires_in,
+      sessionType: SessionType.ORG_SESSION
     };
 
     const fetchAccountDetails = await this.userRepository.checkAccountDetails(orgRoleDetails['user'].id);
@@ -733,7 +734,7 @@ export class OrganizationService {
         userId: orgRoleDetails['user'].id,
         expires: authenticationResult?.expires_in,
         keycloakUserId: orgRoleDetails['user'].keycloakUserId,
-        type: TokenType.ORG_TOKEN
+        type: TokenType.BEARER_TOKEN
       };
 
       await this.userRepository.addAccountDetails(accountData).then(async (response) => {

apps/user/interfaces/user.interface.ts

@@ -189,6 +189,7 @@ export interface ISession {
   keycloakUserId?: string;
   type?: string;
   accountId?: string;
+  sessionType?: string;
 }
 
 export interface ISessionDetails extends ISession {

apps/user/repositories/user.repository.ts

@@ -678,15 +678,15 @@ export class UserRepository {
 
   async createSession(tokenDetails: ISession): Promise<session> {
     try {
-      const { sessionToken, userId, expires, refreshToken, accountId } = tokenDetails;
+      const { sessionToken, userId, expires, refreshToken, accountId, sessionType } = tokenDetails;
       const sessionResponse = await this.prisma.session.create({
         data: {
           sessionToken,
           expires,
           userId,
-          // eslint-disable-next-line camelcase
-          refresh_token: refreshToken,
-          accountId
+          refreshToken,
+          accountId,
+          sessionType
         }
       });
       return sessionResponse;
@@ -731,12 +731,9 @@ export class UserRepository {
           userId: accountDetails.userId
         },
         data: {
-          // eslint-disable-next-line camelcase
-          access_token: accountDetails.sessionToken,
-          // eslint-disable-next-line camelcase
-          refresh_token: accountDetails.refreshToken,
-          // eslint-disable-next-line camelcase
-          expires_at: accountDetails.expires
+          accessToken: accountDetails.sessionToken,
+          refreshToken: accountDetails.refreshToken,
+          expiresAt: accountDetails.expires
         }
       });
       return userAccountDetails;
@@ -753,14 +750,10 @@ export class UserRepository {
           userId: accountDetails.userId,
           provider: ProviderType.KEYCLOAK,
           providerAccountId: accountDetails.keycloakUserId,
-          // eslint-disable-next-line camelcase
-          access_token: accountDetails.sessionToken,
-          // eslint-disable-next-line camelcase
-          refresh_token: accountDetails.refreshToken,
-          // eslint-disable-next-line camelcase
-          expires_at: accountDetails.expires,
-          // eslint-disable-next-line camelcase
-          token_type: accountDetails.type
+          accessToken: accountDetails.sessionToken,
+          refreshToken: accountDetails.refreshToken,
+          expiresAt: accountDetails.expires,
+          tokenType: accountDetails.type
         }
       });
       return userAccountDetails;

apps/user/src/user.service.ts

@@ -48,7 +48,7 @@ import { UserActivityService } from '@credebl/user-activity';
 import { SupabaseService } from '@credebl/supabase';
 import { UserDevicesRepository } from '../repositories/user-device.repository';
 import { v4 as uuidv4 } from 'uuid';
-import { Invitation, ProviderType, TokenType, UserRole } from '@credebl/enum/enum';
+import { Invitation, ProviderType, SessionType, TokenType, UserRole } from '@credebl/enum/enum';
 import validator from 'validator';
 import { DISALLOWED_EMAIL_DOMAIN } from '@credebl/common/common.constant';
 import { AwsService } from '@credebl/aws';
@@ -385,7 +385,7 @@ export class UserService {
         provider: ProviderType.KEYCLOAK,
         providerAccountId: keycloakDetails.keycloakUserId.toString(),
         // eslint-disable-next-line camelcase
-        token_type: TokenType.USER_TOKEN
+        token_type: TokenType.BEARER_TOKEN
       };
 
       await this.userRepository.addAccountDetails(userAccountDetails);
@@ -480,7 +480,8 @@ export class UserService {
           sessionToken: tokenDetails?.access_token,
           userId: userData?.id,
           expires: tokenDetails?.expires_in,
-          refreshToken: tokenDetails?.refresh_token
+          refreshToken: tokenDetails?.refresh_token,
+          sessionType: SessionType.USER_SESSION
         };
 
         const fetchAccountDetails = await this.userRepository.checkAccountDetails(userData?.id);
@@ -493,7 +494,7 @@ export class UserService {
             expires: tokenDetails?.expires_in,
             refreshToken: tokenDetails?.refresh_token,
             keycloakUserId: userData?.keycloakUserId,
-            type: TokenType.USER_TOKEN
+            type: TokenType.BEARER_TOKEN
           };
 
           await this.userRepository.addAccountDetails(accountData).then(async (response) => {

libs/enum/src/enum.ts

@@ -259,8 +259,12 @@ export enum ProofType {
 }
 
 export enum TokenType {
-  USER_TOKEN = 'user-token',
-  ORG_TOKEN = 'organization-token'
+  BEARER_TOKEN = 'Bearer'
+}
+
+export enum SessionType {
+  USER_SESSION = 'user-session',
+  ORG_SESSION = 'organization-session'
 }
 
 export enum ProviderType {