@solidstarters/solid-core 1.2.174 → 1.2.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.174",
+  "version": "1.2.175",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/config/iam.config.ts

@@ -32,7 +32,7 @@ export const jwtConfig = registerAs('jwt', () => {
         secret: process.env.IAM_JWT_SECRET,
         audience: process.env.IAM_JWT_TOKEN_AUDIENCE,
         issuer: process.env.IAM_JWT_TOKEN_ISSUER,
-        accessTokenTtl: parseInt(process.env.IAM_JWT_ACCESS_TOKEN_TTL ?? '3600', 10),
-        refreshTokenTtl: parseInt(process.env.IAM_JWT_REFRESH_TOKEN_TTL ?? '86400', 10),
+        accessTokenTtl: parseInt(process.env.IAM_JWT_ACCESS_TOKEN_TTL ?? '1200', 10), // 20 minutes 
+        refreshTokenTtl: parseInt(process.env.IAM_JWT_REFRESH_TOKEN_TTL ?? '604800', 10), // 7 days
     };
 });

package/src/constants/chatter-message.constants.ts

@@ -0,0 +1,11 @@
+export const CHATTER_MESSAGE_TYPE = {
+    AUDIT: 'audit',
+    CUSTOM: 'custom',
+} as const;
+
+export const CHATTER_MESSAGE_SUBTYPE = {
+    AUDIT_INSERT: 'audit_insert',
+    AUDIT_UPDATE: 'audit_update',
+    AUDIT_DELETE: 'audit_delete',
+    CUSTOM: 'custom',
+} as const;

package/src/controllers/chatter-message-details.controller.ts

@@ -15,46 +15,46 @@ enum ShowSoftDeleted {
 export class ChatterMessageDetailsController {
   constructor(private readonly service: ChatterMessageDetailsService) {}
 
-  @ApiBearerAuth("jwt")
-  @Post()
-  @UseInterceptors(AnyFilesInterceptor())
-  create(@Body() createDto: CreateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.create(createDto, files);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Post()
+  // @UseInterceptors(AnyFilesInterceptor())
+  // create(@Body() createDto: CreateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   return this.service.create(createDto, files);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk')
-  @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateChatterMessageDetailsDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
-    return this.service.insertMany(createDtos, filesArray);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // insertMany(@Body() createDtos: CreateChatterMessageDetailsDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+  //   return this.service.insertMany(createDtos, filesArray);
+  // }
 
 
-  @ApiBearerAuth("jwt")
-  @Put(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Put(':id')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // update(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   return this.service.update(id, updateDto, files);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Patch(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files, true);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Patch(':id')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDetailsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   return this.service.update(id, updateDto, files, true);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk-recover')
-  async recoverMany(@Body() ids: number[]) {
-    return this.service.recoverMany(ids);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk-recover')
+  // async recoverMany(@Body() ids: number[]) {
+  //   return this.service.recoverMany(ids);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Get('/recover/:id')
-  async recover(@Param('id') id: number) {
-    return this.service.recover(id);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Get('/recover/:id')
+  // async recover(@Param('id') id: number) {
+  //   return this.service.recover(id);
+  // }
     
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
@@ -77,16 +77,16 @@ export class ChatterMessageDetailsController {
     return this.service.findOne(+id, query);
   }
 
-  @ApiBearerAuth("jwt")
-  @Delete('/bulk')
-  async deleteMany(@Body() ids: number[]) {
-    return this.service.deleteMany(ids);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Delete('/bulk')
+  // async deleteMany(@Body() ids: number[]) {
+  //   return this.service.deleteMany(ids);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Delete(':id')
-  async delete(@Param('id') id: number) {
-    return this.service.delete(id);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Delete(':id')
+  // async delete(@Param('id') id: number) {
+  //   return this.service.delete(id);
+  // }
 
 }

package/src/controllers/chatter-message.controller.ts

@@ -7,6 +7,7 @@ import { UpdateChatterMessageDto } from '../dtos/update-chatter-message.dto';
 import { PostChatterMessageDto } from '../dtos/post-chatter-message.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
+import { Public } from 'src/decorators/public.decorator';
 
 enum ShowSoftDeleted {
   INCLUSIVE = "inclusive",
@@ -25,40 +26,59 @@ export class ChatterMessageController {
     return this.service.create(createDto, files);
   }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk')
-  @UseInterceptors(AnyFilesInterceptor())
-  insertMany(@Body() createDtos: CreateChatterMessageDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
-    return this.service.insertMany(createDtos, filesArray);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // insertMany(@Body() createDtos: CreateChatterMessageDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+  //   return this.service.insertMany(createDtos, filesArray);
+  // }
 
 
-  @ApiBearerAuth("jwt")
-  @Put(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  update(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Put(':id')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // update(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   return this.service.update(id, updateDto, files);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Patch(':id')
-  @UseInterceptors(AnyFilesInterceptor())
-  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.update(id, updateDto, files, true);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Patch(':id')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateChatterMessageDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   return this.service.update(id, updateDto, files, true);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk-recover')
-  async recoverMany(@Body() ids: number[]) {
-    return this.service.recoverMany(ids);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk-recover')
+  // async recoverMany(@Body() ids: number[]) {
+  //   return this.service.recoverMany(ids);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Get('/recover/:id')
-  async recover(@Param('id') id: number) {
-    return this.service.recover(id);
+  // @ApiBearerAuth("jwt")
+  // @Get('/recover/:id')
+  // async recover(@Param('id') id: number) {
+  //   return this.service.recover(id);
+  // }
+
+  @Public()
+  @Get('/getChatterMessages/:entityId/:entityName')
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array })
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  async getChatterMessages(
+    @Param('entityId') entityId: number,
+    @Param('entityName') entityName: string,
+    @Query() query: any
+  ) {
+    return this.service.getChatterMessages(entityId, entityName, query);
   }
-    
+
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
   @ApiQuery({ name: 'limit', required: false, type: Number })
@@ -80,17 +100,17 @@ export class ChatterMessageController {
     return this.service.findOne(+id, query);
   }
 
-  @ApiBearerAuth("jwt")
-  @Delete('/bulk')
-  async deleteMany(@Body() ids: number[]) {
-    return this.service.deleteMany(ids);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Delete('/bulk')
+  // async deleteMany(@Body() ids: number[]) {
+  //   return this.service.deleteMany(ids);
+  // }
 
-  @ApiBearerAuth("jwt")
-  @Delete(':id')
-  async delete(@Param('id') id: number) {
-    return this.service.delete(id);
-  }
+  // @ApiBearerAuth("jwt")
+  // @Delete(':id')
+  // async delete(@Param('id') id: number) {
+  //   return this.service.delete(id);
+  // }
 
   @ApiBearerAuth("jwt")
   @Post('post')

package/src/entities/chatter-message-details.entity.ts

@@ -22,4 +22,7 @@ newValueDisplay: string;
 
 @Column({ type: "varchar" })
 fieldName: string;
+
+@Column({ type: "text", nullable: true })
+fieldDisplayName: string;
 }

package/src/entities/chatter-message.entity.ts

@@ -1,6 +1,7 @@
 import { CommonEntity } from 'src/entities/common.entity'
-import { Entity, Column, Index, JoinColumn, ManyToOne } from 'typeorm';
+import {Entity, Column, Index, JoinColumn, ManyToOne, OneToMany} from 'typeorm';
 import { User } from 'src/entities/user.entity'
+import { ChatterMessageDetails } from './chatter-message-details.entity';
 
 @Entity("ss_chatter_message")
 export class ChatterMessage extends CommonEntity {
@@ -8,7 +9,7 @@ export class ChatterMessage extends CommonEntity {
     @Column({ type: "varchar" })
     messageType: string; // audit | custom 
     @Column({ type: "varchar" })
-    messageSubType: string; // update | insert | delete | post_message
+    messageSubType: string; // audit_update | audit_insert | audit_delete | custom
     @Column({ type: "text" })
     messageBody: string;
     @Index()
@@ -19,4 +20,10 @@ export class ChatterMessage extends CommonEntity {
     @ManyToOne(() => User, { onDelete: "CASCADE", nullable: true })
     @JoinColumn()
     user: User;
+    @OneToMany(() => ChatterMessageDetails, (chatterMessageDetails) => chatterMessageDetails.chatterMessage, { cascade: true })
+    chatterMessageDetails: ChatterMessageDetails[];
+    @Column({ type: "text", nullable: true })
+    modelDisplayName: string;
+    @Column({ type: "text", nullable: true })
+    modelUserKey: string;
 }

package/src/seeders/seed-data/solid-core-metadata.json

@@ -3748,7 +3748,8 @@
             "selectionStaticValues": [
               "audit_insert:audit_insert",
               "audit_update:audit_update",
-              "audit_delete:audit_delete"
+              "audit_delete:audit_delete",
+              "custom:custom"
             ]
           },
           {
@@ -3835,6 +3836,30 @@
             "columnName": null,
             "relationJoinTableName": "",
             "isRelationManyToManyOwner": null
+          },
+          {
+            "name": "modelDisplayName",
+            "displayName": "Model Display Name",
+            "type": "shortText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
+          {
+            "name": "modelUserKey",
+            "displayName": "Model User Key",
+            "type": "shortText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
           }
         ]
       },
@@ -3910,6 +3935,19 @@
             "encrypt": false,
             "isSystem": false
           },
+          {
+            "name": "fieldDisplayName",
+            "displayName": "Field Display Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
           {
             "name": "chatterMessage",
             "displayName": "Chatter Message",

package/src/services/authentication.service.ts

@@ -986,7 +986,7 @@ export class AuthenticationService {
         return accessToken;
     }
 
-    async generateRefreshToken(user: User) {
+    async generateRefreshToken(user: User, previousRefreshToken?: string) {
         const refreshTokenId = randomUUID();
 
         const refreshToken = await this.signToken(user.id, this.jwtConfiguration.refreshTokenTtl, {
@@ -994,7 +994,7 @@ export class AuthenticationService {
         })
 
         // store the refresh token id in the redis storage.
-        await this.refreshTokenIdsStorage.insert(user.id, refreshToken);
+        await this.refreshTokenIdsStorage.insert(user.id, refreshToken, previousRefreshToken);
 
         return refreshToken;
     }
@@ -1164,7 +1164,11 @@ export class AuthenticationService {
                 roles: true
             }
         });
-        const tokens = await this.generateTokens(user);
+
+        // const tokens = await this.generateTokens(user);
+
+        // Get the refresh token for a user from refresh token storage.
+        const refreshTokenState = await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(user.id);
 
         const response = {
             user: {
@@ -1175,7 +1179,8 @@ export class AuthenticationService {
                 id: user.id,
                 roles: user.roles.map((role) => role.name)
             },
-            ...tokens
+            refreshToken: refreshTokenState.currentRefreshToken,
+            // ...tokens
         }
         return response;
     }