Merge pull request #1465 from credebl/feat/generate-token-for-client

Feat/generate token for client

Author: shitrerohit

.husky/pre-push

@@ -28,9 +28,7 @@ while read local_ref local_sha remote_ref remote_sha; do
       echo "${CYAN}ℹ️  Skipping merge commit $commit${RESET}"
       continue
     fi
-
-    sig_status=$(git log --format='%G?' -n 1 $commit)
-
+    sig_status=$(git log --format='%G?' -n 1 $commit)	
     # Currently only check for "N" - for no signature.
     if [ "$sig_status" = "N" ]; then
       unsigned_commits="$unsigned_commits $commit"
@@ -64,7 +62,6 @@ while read local_ref local_sha remote_ref remote_sha; do
       echo "${YELLOW}You can manually sign commits using:${RESET}"
       echo
       # Latest commit (HEAD)
-      head_commit=$(git rev-parse HEAD)
       echo "  - For the latest commit (HEAD):"
       echo "      git commit --amend -sS --no-edit"
       echo
@@ -75,7 +72,6 @@ while read local_ref local_sha remote_ref remote_sha; do
       echo "  - For the earliest unsigned commit $short_hash (skipping merge commits):"
       echo "      git rebase --onto $parent_commit $parent_commit \\"
       echo "        --exec 'if [ \$(git rev-list --parents -n 1 HEAD | awk \"{print NF-1}\") -eq 1 ]; then git commit --amend -sS --no-edit; else echo \"Skipping merge commit \$(git rev-parse --short HEAD)\"; fi'"
-
       echo
       echo "Then push normally with:"
       echo "      git push"
@@ -92,4 +88,4 @@ while read local_ref local_sha remote_ref remote_sha; do
   fi
 done
 
-echo "${GREEN}✅ All commits are signed and verified${RESET}"
+echo "${GREEN}✅ No unsigned commits found${RESET}"

apps/api-gateway/src/organization/dtos/client-token.dto.ts

@@ -0,0 +1,24 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+
+export class ClientTokenDto {
+  @ApiProperty()
+  @IsString({ message: 'orgId must be in string format.' })
+  orgId: string;
+
+  @ApiProperty()
+  @IsString({ message: 'clientAlias must be in string format.' })
+  clientAlias: string;
+
+  @ApiProperty()
+  @IsString({ message: 'clientId must be in string format.' })
+  clientId: string;
+
+  @ApiProperty()
+  @IsString({ message: 'clientSecret must be in string format.' })
+  clientSecret: string;
+
+  @ApiProperty()
+  @IsString({ message: 'grantType must be in string format.' })
+  grantType?: string = 'client_credentials';
+}

apps/api-gateway/src/organization/organization.controller.ts

@@ -54,6 +54,7 @@ import { UserAccessGuard } from '../authz/guards/user-access-guard';
 import { GetAllOrganizationsDto } from './dtos/get-organizations.dto';
 import { PrimaryDid } from './dtos/set-primary-did.dto';
 import { TrimStringParamPipe } from '@credebl/common/cast.helper';
+import { ClientTokenDto } from './dtos/client-token.dto';
 
 @UseFilters(CustomExceptionFilter)
 @Controller('orgs')
@@ -789,4 +790,16 @@ export class OrganizationController {
     };
     return res.status(HttpStatus.OK).json(finalResponse);
   }
+
+  @Post('/generateIssuerApiToken')
+  @ApiExcludeEndpoint()
+  @ApiOperation({
+    summary: 'Generate API Token for the issuer',
+    description: 'Generate API Token for the issuer'
+  })
+  @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
+  async generateApiToken(@Body() clientTokenDto: ClientTokenDto, @Res() res: Response): Promise<Response> {
+    const finalResponse = await this.organizationService.generateClientApiToken(clientTokenDto);
+    return res.status(HttpStatus.OK).header('Content-Type', 'application/json').send(finalResponse);
+  }
 }

apps/api-gateway/src/organization/organization.service.ts

@@ -24,6 +24,7 @@ import { GetAllOrganizationsDto } from './dtos/get-organizations.dto';
 import { PrimaryDid } from './dtos/set-primary-did.dto';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { ClientProxy } from '@nestjs/microservices';
+import { ClientTokenDto } from './dtos/client-token.dto';
 
 @Injectable()
 export class OrganizationService extends BaseService {
@@ -238,4 +239,7 @@ export class OrganizationService extends BaseService {
     const imageBuffer = Buffer.from(base64Data, 'base64');
     return imageBuffer;
   }
+  async generateClientApiToken(clientTokenDto: ClientTokenDto): Promise<{ token: string }> {
+    return this.natsClient.sendNatsMessage(this.serviceProxy, 'generate-client-api-token', clientTokenDto);
+  }
 }

apps/organization/dtos/client-token.dto.ts

@@ -0,0 +1,7 @@
+export class ClientTokenDto {
+  orgId: string;
+  clientAlias: string;
+  clientId: string;
+  clientSecret: string;
+  grantType?: string = 'client_credentials';
+}

apps/organization/repositories/organization.repository.ts

@@ -662,6 +662,7 @@ export class OrganizationRepository {
             countryId: true,
             stateId: true,
             cityId: true,
+            appLaunchDetails: true,
             userOrgRoles: {
               where: {
                 orgRole: {

apps/organization/src/organization.controller.ts

@@ -4,12 +4,27 @@ import { OrganizationService } from './organization.service';
 import { CreateOrganizationDto } from '../dtos/create-organization.dto';
 import { BulkSendInvitationDto } from '../dtos/send-invitation.dto';
 import { UpdateInvitationDto } from '../dtos/update-invitation.dt';
-import { IDidList, IGetOrgById, IGetOrganization, IOrgDetails, IUpdateOrganization, Payload } from '../interfaces/organization.interface';
-import { IOrgCredentials, IOrganizationInvitations, IOrganization, IOrganizationDashboard, IDeleteOrganization, IOrgActivityCount } from '@credebl/common/interfaces/organization.interface';
+import {
+  IDidList,
+  IGetOrgById,
+  IGetOrganization,
+  IOrgDetails,
+  IUpdateOrganization,
+  Payload
+} from '../interfaces/organization.interface';
+import {
+  IOrgCredentials,
+  IOrganizationInvitations,
+  IOrganization,
+  IOrganizationDashboard,
+  IDeleteOrganization,
+  IOrgActivityCount
+} from '@credebl/common/interfaces/organization.interface';
 import { organisation, user } from '@prisma/client';
 import { IAccessTokenData } from '@credebl/common/interfaces/interface';
 import { IClientRoles } from '@credebl/client-registration/interfaces/client.interface';
 import { IOrgRoles } from 'libs/org-roles/interfaces/org-roles.interface';
+import { ClientTokenDto } from '../dtos/client-token.dto';
 
 @Controller()
 export class OrganizationController {
@@ -23,7 +38,9 @@ export class OrganizationController {
    */
 
   @MessagePattern({ cmd: 'create-organization' })
-  async createOrganization(@Body() payload: { createOrgDto: CreateOrganizationDto; userId: string, keycloakUserId: string }): Promise<organisation> {
+  async createOrganization(
+    @Body() payload: { createOrgDto: CreateOrganizationDto; userId: string; keycloakUserId: string }
+  ): Promise<organisation> {
     return this.organizationService.createOrganization(payload.createOrgDto, payload.userId, payload.keycloakUserId);
   }
 
@@ -34,17 +51,19 @@ export class OrganizationController {
    */
 
   @MessagePattern({ cmd: 'set-primary-did' })
-  async setPrimaryDid(@Body() payload: { orgId:string, did:string, id:string}): Promise<string> {
+  async setPrimaryDid(@Body() payload: { orgId: string; did: string; id: string }): Promise<string> {
     return this.organizationService.setPrimaryDid(payload.orgId, payload.did, payload.id);
   }
 
   /**
-   * 
-   * @param payload 
+   *
+   * @param payload
    * @returns organization client credentials
    */
   @MessagePattern({ cmd: 'create-org-credentials' })
-  async createOrgCredentials(@Body() payload: { orgId: string; userId: string, keycloakUserId: string }): Promise<IOrgCredentials> {
+  async createOrgCredentials(
+    @Body() payload: { orgId: string; userId: string; keycloakUserId: string }
+  ): Promise<IOrgCredentials> {
     return this.organizationService.createOrgCredentials(payload.orgId, payload.userId, payload.keycloakUserId);
   }
 
@@ -55,7 +74,11 @@ export class OrganizationController {
    */
 
   @MessagePattern({ cmd: 'update-organization' })
-  async updateOrganization(payload: { updateOrgDto: IUpdateOrganization; userId: string, orgId: string }): Promise<organisation> {
+  async updateOrganization(payload: {
+    updateOrgDto: IUpdateOrganization;
+    userId: string;
+    orgId: string;
+  }): Promise<organisation> {
     return this.organizationService.updateOrganization(payload.updateOrgDto, payload.userId, payload.orgId);
   }
 
@@ -65,7 +88,7 @@ export class OrganizationController {
    * @returns organization's did list
    */
   @MessagePattern({ cmd: 'fetch-organization-dids' })
-  async getOrgDidList(payload: {orgId:string}): Promise<IDidList[]> {
+  async getOrgDidList(payload: { orgId: string }): Promise<IDidList[]> {
     return this.organizationService.getOrgDidList(payload.orgId);
   }
 
@@ -75,9 +98,7 @@ export class OrganizationController {
    * @returns Get created organization details
    */
   @MessagePattern({ cmd: 'get-organizations' })
-  async getOrganizations(
-    @Body() payload: { userId: string} & Payload
-  ): Promise<IGetOrganization> {
+  async getOrganizations(@Body() payload: { userId: string } & Payload): Promise<IGetOrganization> {
     const { userId, pageNumber, pageSize, search, role } = payload;
     return this.organizationService.getOrganizations(userId, pageNumber, pageSize, search, role);
   }
@@ -87,22 +108,17 @@ export class OrganizationController {
    * @returns Get created organization details
    */
   @MessagePattern({ cmd: 'get-organizations-count' })
-  async countTotalOrgs(
-    @Body() payload: { userId: string}
-  ): Promise<number> {
-    
+  async countTotalOrgs(@Body() payload: { userId: string }): Promise<number> {
     const { userId } = payload;
-    
+
     return this.organizationService.countTotalOrgs(userId);
   }
 
   /**
    * @returns Get public organization details
    */
   @MessagePattern({ cmd: 'get-public-organizations' })
-  async getPublicOrganizations(
-    @Body() payload: Payload
-  ): Promise<IGetOrganization> {
+  async getPublicOrganizations(@Body() payload: Payload): Promise<IGetOrganization> {
     const { pageNumber, pageSize, search } = payload;
     return this.organizationService.getPublicOrganizations(pageNumber, pageSize, search);
   }
@@ -113,13 +129,13 @@ export class OrganizationController {
    * @returns Get created organization details
    */
   @MessagePattern({ cmd: 'get-organization-by-id' })
-  async getOrganization(@Body() payload: { orgId: string; userId: string}): Promise<IGetOrgById> {
+  async getOrganization(@Body() payload: { orgId: string; userId: string }): Promise<IGetOrgById> {
     return this.organizationService.getOrganization(payload.orgId);
   }
-/**
- * @param orgSlug 
- * @returns organization details
- */
+  /**
+   * @param orgSlug
+   * @returns organization details
+   */
   @MessagePattern({ cmd: 'get-organization-public-profile' })
   async getPublicProfile(payload: { orgSlug }): Promise<IGetOrgById> {
     return this.organizationService.getPublicProfile(payload);
@@ -131,9 +147,7 @@ export class OrganizationController {
    * @returns Get created invitation details
    */
   @MessagePattern({ cmd: 'get-invitations-by-orgId' })
-  async getInvitationsByOrgId(
-    @Body() payload: { orgId: string } & Payload
-  ): Promise<IOrganizationInvitations> {
+  async getInvitationsByOrgId(@Body() payload: { orgId: string } & Payload): Promise<IOrganizationInvitations> {
     return this.organizationService.getInvitationsByOrgId(
       payload.orgId,
       payload.pageNumber,
@@ -143,11 +157,11 @@ export class OrganizationController {
   }
 
   /**
-   * @returns Get org-roles 
+   * @returns Get org-roles
    */
 
   @MessagePattern({ cmd: 'get-org-roles' })
-  async getOrgRoles(payload: {orgId: string, user: user}): Promise<IClientRoles[]> {
+  async getOrgRoles(payload: { orgId: string; user: user }): Promise<IClientRoles[]> {
     return this.organizationService.getOrgRoles(payload.orgId, payload.user);
   }
 
@@ -163,7 +177,7 @@ export class OrganizationController {
    */
   @MessagePattern({ cmd: 'send-invitation' })
   async createInvitation(
-    @Body() payload: { bulkInvitationDto: BulkSendInvitationDto; userId: string, userEmail: string }
+    @Body() payload: { bulkInvitationDto: BulkSendInvitationDto; userId: string; userEmail: string }
   ): Promise<string> {
     return this.organizationService.createInvitation(payload.bulkInvitationDto, payload.userId, payload.userEmail);
   }
@@ -198,7 +212,7 @@ export class OrganizationController {
    */
 
   @MessagePattern({ cmd: 'update-user-roles' })
-  async updateUserRoles(payload: { orgId: string; roleIds: string[]; userId: string}): Promise<boolean> {
+  async updateUserRoles(payload: { orgId: string; roleIds: string[]; userId: string }): Promise<boolean> {
     return this.organizationService.updateUserRoles(payload.orgId, payload.roleIds, payload.userId);
   }
 
@@ -212,9 +226,9 @@ export class OrganizationController {
     return this.organizationService.getOrganizationActivityCount(payload.orgId, payload.userId);
   }
 
-/**
- * @returns organization profile details
- */
+  /**
+   * @returns organization profile details
+   */
   @MessagePattern({ cmd: 'fetch-organization-profile' })
   async getOrgPofile(payload: { orgId: string }): Promise<organisation> {
     return this.organizationService.getOrgPofile(payload.orgId);
@@ -231,27 +245,27 @@ export class OrganizationController {
   }
 
   @MessagePattern({ cmd: 'get-organization-details' })
-  async getOrgData(payload: { orgId: string; }): Promise<organisation> {
+  async getOrgData(payload: { orgId: string }): Promise<organisation> {
     return this.organizationService.getOrgDetails(payload.orgId);
   }
-  
+
   @MessagePattern({ cmd: 'delete-organization' })
-  async deleteOrganization(payload: { orgId: string, user: user }): Promise<IDeleteOrganization> {
+  async deleteOrganization(payload: { orgId: string; user: user }): Promise<IDeleteOrganization> {
     return this.organizationService.deleteOrganization(payload.orgId, payload.user);
   }
 
   @MessagePattern({ cmd: 'delete-org-client-credentials' })
-  async deleteOrganizationCredentials(payload: { orgId: string, user: user }): Promise<string> {
+  async deleteOrganizationCredentials(payload: { orgId: string; user: user }): Promise<string> {
     return this.organizationService.deleteClientCredentials(payload.orgId, payload.user);
   }
 
   @MessagePattern({ cmd: 'delete-organization-invitation' })
-  async deleteOrganizationInvitation(payload: { orgId: string; invitationId: string; }): Promise<boolean> {
+  async deleteOrganizationInvitation(payload: { orgId: string; invitationId: string }): Promise<boolean> {
     return this.organizationService.deleteOrganizationInvitation(payload.orgId, payload.invitationId);
   }
 
   @MessagePattern({ cmd: 'authenticate-client-credentials' })
-  async clientLoginCredentails(payload: { clientId: string; clientSecret: string;}): Promise<IAccessTokenData> {
+  async clientLoginCredentails(payload: { clientId: string; clientSecret: string }): Promise<IAccessTokenData> {
     return this.organizationService.clientLoginCredentails(payload);
   }
 
@@ -261,12 +275,12 @@ export class OrganizationController {
   }
 
   @MessagePattern({ cmd: 'get-agent-type-by-org-agent-type-id' })
-  async getAgentTypeByAgentTypeId(payload: {orgAgentTypeId: string}): Promise<string> {
+  async getAgentTypeByAgentTypeId(payload: { orgAgentTypeId: string }): Promise<string> {
     return this.organizationService.getAgentTypeByAgentTypeId(payload.orgAgentTypeId);
   }
 
   @MessagePattern({ cmd: 'get-org-roles-details' })
-  async getOrgRolesDetails(payload: {roleName: string}): Promise<object> {
+  async getOrgRolesDetails(payload: { roleName: string }): Promise<object> {
     return this.organizationService.getOrgRolesDetails(payload.roleName);
   }
 
@@ -286,7 +300,12 @@ export class OrganizationController {
   }
 
   @MessagePattern({ cmd: 'get-org-agents-and-user-roles' })
-  async getOrgAgentDetailsForEcosystem(payload: {orgIds: string[], search: string}): Promise<IOrgDetails> {
+  async getOrgAgentDetailsForEcosystem(payload: { orgIds: string[]; search: string }): Promise<IOrgDetails> {
     return this.organizationService.getOrgAgentDetailsForEcosystem(payload);
   }
-}
+
+  @MessagePattern({ cmd: 'generate-client-api-token' })
+  async generateClientApiToken(payload: ClientTokenDto): Promise<{ token: string }> {
+    return this.organizationService.generateClientApiToken(payload);
+  }
+}