@solidstarters/solid-core 1.2.121 → 1.2.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.121",
+  "version": "1.2.123",
   "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/controllers/setting.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch, ParseArrayPipe, BadRequestException } from '@nestjs/common';
 import { AnyFilesInterceptor } from "@nestjs/platform-express";
 import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
 import { SettingService } from '../services/setting.service';
@@ -89,7 +89,35 @@ export class SettingController {
   @ApiBearerAuth("jwt")
   @Post('/bulk-update')
   @UseInterceptors(AnyFilesInterceptor())
-  async updateSettings(@Body() updateSettingsDto: UpdateSettingsDto, @UploadedFiles() files: Array<Express.Multer.File>) {
-    return this.service.updateSettings(updateSettingsDto.settings, files);
+  async updateSettings(
+    @Body() body: any,
+    @UploadedFiles() files: Array<Express.Multer.File>
+  ) {
+    let settings: CreateSettingDto[] = [];
+
+    try {
+      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+    } catch (e) {
+      throw new BadRequestException('Invalid settings payload');
+    }
+    return this.service.updateSettings(settings, files);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk/user')
+  @UseInterceptors(AnyFilesInterceptor())
+  async updateUserSettings(
+    @Body() body: any,
+    @UploadedFiles() files: Array<Express.Multer.File>
+  ) {
+    let settings: CreateSettingDto[] = [];
+
+    try {
+      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+    } catch (e) {
+      throw new BadRequestException('Invalid settings payload');
+    }
+    return this.service.updateSettings(settings, files);
   }
-}
+}

package/src/controllers/user-activity-history.controller.ts

@@ -0,0 +1,93 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { UserActivityHistoryService } from '../services/user-activity-history.service';
+import { CreateUserActivityHistoryDto } from '../dtos/create-user-activity-history.dto';
+import { UpdateUserActivityHistoryDto } from '../dtos/update-user-activity-history.dto';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('user-activity-history')
+export class UserActivityHistoryController {
+  constructor(private readonly service: UserActivityHistoryService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateUserActivityHistoryDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateUserActivityHistoryDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateUserActivityHistoryDto, @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: UpdateUserActivityHistoryDto, @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")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+    
+  @ApiBearerAuth("jwt")
+  @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 })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @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);
+  }
+
+
+}

package/src/controllers/user.controller.ts

@@ -10,6 +10,7 @@ import { ActiveUser } from '../decorators/active-user.decorator';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
+import { UpdateUserProfileDto } from 'src/dtos/update-user-profile.dto';
 
 @ApiTags('Solid Core')
 @Controller('user') //FIXME: Change this to the model plural name 
@@ -116,5 +117,15 @@ export class UserController {
     return this.service.removeRoleFromUser(userEmail, roleName);
   }
 
-
+  @ApiBearerAuth('jwt')
+  @Post('/profile')
+  @UseInterceptors(AnyFilesInterceptor())
+  async updateOwnProfile(
+    @Body() updateDto: UpdateUserProfileDto,
+    @UploadedFiles() files: Array<Express.Multer.File>,
+    @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto,
+    @ActiveUser() user: ActiveUserData,
+  ) {
+    return this.service.update(user.sub, updateDto, files, true, solidRequestContext);
+  }
 }

package/src/dtos/create-setting.dto.ts

@@ -1,5 +1,5 @@
 import { IsString } from 'class-validator';
-import { IsOptional, IsBoolean } from 'class-validator';
+import { IsOptional, IsBoolean, IsInt } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class CreateSettingDto {
@@ -11,4 +11,16 @@ export class CreateSettingDto {
     @IsString()
     @ApiProperty()
     value: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the user id field" })
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the user id field" })
+    userUserKey: string;
 }

package/src/dtos/create-user-activity-history.dto.ts

@@ -0,0 +1,30 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt } from 'class-validator';
+import { IsOptional } from 'class-validator';
+import { IsString } from 'class-validator';
+export class CreateUserActivityHistoryDto {
+@IsOptional()
+@IsInt()
+@ApiProperty()
+userId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+userUserKey: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+event: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+ipAddress: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+userAgent: string;
+}

package/src/dtos/update-setting.dto.ts

@@ -1,4 +1,4 @@
-import { IsInt,IsOptional, IsString, IsBoolean } from 'class-validator';
+import { IsInt, IsOptional, IsString, IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class UpdateSettingDto {
@@ -13,4 +13,16 @@ export class UpdateSettingDto {
     @IsString()
     @ApiProperty()
     value: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the user id field" })
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the user id field" })
+    userUserKey: string;
 }

package/src/dtos/update-user-activity-history.dto.ts

@@ -0,0 +1,32 @@
+import { IsInt,IsOptional, IsString } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+export class UpdateUserActivityHistoryDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+
+@IsOptional()
+@IsInt()
+@ApiProperty()
+userId: number;
+
+@IsString()
+@IsOptional()
+@ApiProperty()
+userUserKey: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+event: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+ipAddress: string;
+
+@IsOptional()
+@IsString()
+@ApiProperty()
+userAgent: string;
+}

package/src/dtos/update-user-profile.dto.ts

@@ -0,0 +1,19 @@
+import { IsOptional, IsString, IsEmail } from 'class-validator';
+
+export class UpdateUserProfileDto {
+  @IsOptional()
+  @IsString()
+  fullName?: string;
+
+  @IsOptional()
+  @IsString()
+  username?: string;
+
+  @IsOptional()
+  @IsEmail()
+  email?: string;
+
+  @IsOptional()
+  @IsString()
+  mobile?: string;
+}

package/src/dtos/update-user.dto.ts

@@ -38,12 +38,12 @@ export class UpdateUserDto {
     @IsOptional()
     @IsBoolean()
     @ApiProperty()
-    forcePasswordChange: boolean = true;
+    forcePasswordChange: boolean;
     @IsNotEmpty()
     @IsOptional()
     @IsString()
     @ApiProperty()
-    lastLoginProvider: string = "local";
+    lastLoginProvider: string;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -64,11 +64,11 @@ export class UpdateUserDto {
     @IsOptional()
     @IsBoolean()
     @ApiProperty()
-    active: boolean = true;
+    active: boolean;
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    forgotPasswordConfirmedAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    forgotPasswordConfirmedAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -76,11 +76,11 @@ export class UpdateUserDto {
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    verificationTokenOnForgotPasswordExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    verificationTokenOnForgotPasswordExpiresAt: Date;
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    emailVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    emailVerifiedOnRegistrationAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -88,11 +88,11 @@ export class UpdateUserDto {
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    emailVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    emailVerificationTokenOnRegistrationExpiresAt: Date;
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    mobileVerifiedOnRegistrationAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    mobileVerifiedOnRegistrationAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -100,11 +100,11 @@ export class UpdateUserDto {
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    mobileVerificationTokenOnRegistrationExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    mobileVerificationTokenOnRegistrationExpiresAt: Date;
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    emailVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    emailVerifiedOnLoginAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -112,11 +112,11 @@ export class UpdateUserDto {
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    emailVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    emailVerificationTokenOnLoginExpiresAt: Date;
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    mobileVerifiedOnLoginAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    mobileVerifiedOnLoginAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()
@@ -124,7 +124,7 @@ export class UpdateUserDto {
     @IsOptional()
     @IsDate()
     @ApiProperty()
-    mobileVerificationTokenOnLoginExpiresAt: Date = new Date("1970-01-01T00:00:00.000Z");
+    mobileVerificationTokenOnLoginExpiresAt: Date;
     @IsOptional()
     @IsString()
     @ApiProperty()

package/src/entities/setting.entity.ts

@@ -1,5 +1,6 @@
 import { CommonEntity } from 'src/entities/common.entity'
-import {Entity, Column, Index} from 'typeorm'
+import { Entity, Column, Index, JoinColumn, ManyToOne } from 'typeorm';
+import { User } from 'src/entities/user.entity'
 
 @Entity("ss_setting")
 export class Setting extends CommonEntity {
@@ -8,4 +9,9 @@ export class Setting extends CommonEntity {
     key: string;
     @Column({ type: "varchar", nullable: true })
     value: string;
+    @Column({ name: "type", type: "varchar", nullable: true })
+    type: string;
+    @ManyToOne(() => User, { onDelete: "CASCADE", nullable: true })
+    @JoinColumn()
+    user: User;
 }

package/src/entities/user-activity-history.entity.ts

@@ -0,0 +1,21 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import {Entity, JoinColumn, ManyToOne, Column, Index} from 'typeorm';
+import { User } from 'src/entities/user.entity'
+@Entity("ss_user_activity_history")
+export class UserActivityHistory extends CommonEntity{
+@ManyToOne(() => User, { onDelete: "CASCADE", nullable: true })
+@JoinColumn()
+user: User;
+
+@Index()
+@Column({ type: "varchar", nullable: true })
+event: string;
+
+@Index()
+@Column({ type: "varchar", nullable: true })
+ipAddress: string;
+
+@Index()
+@Column({ type: "varchar", nullable: true })
+userAgent: string;
+}

package/src/guards/authentication.guard.ts

@@ -10,6 +10,7 @@ import { AuthType } from '../enums/auth-type.enum';
 import { AccessTokenGuard } from './access-token.guard';
 import { IS_PUBLIC_KEY } from '../decorators/public.decorator';
 import { PermissionMetadataService } from '../services/permission-metadata.service';
+import { ClsService } from 'nestjs-cls';
 
 @Injectable()
 export class AuthenticationGuard implements CanActivate {
@@ -24,7 +25,8 @@ export class AuthenticationGuard implements CanActivate {
   constructor(
     private readonly reflector: Reflector,
     private readonly accessTokenGuard: AccessTokenGuard,
-    private readonly permissionService: PermissionMetadataService
+    private readonly permissionService: PermissionMetadataService,
+    private readonly cls: ClsService,
   ) { }
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -33,6 +35,15 @@ export class AuthenticationGuard implements CanActivate {
     const request = context.switchToHttp().getRequest();
     request['isListedInPublicRole'] = false;
 
+    // Set IP and User-Agent into CLS context
+    const rawIp = request.headers['x-forwarded-for'] || request.socket?.remoteAddress || request.ip;
+    const ip = Array.isArray(rawIp) ? rawIp[0] :
+      typeof rawIp === 'string' ? rawIp.split(',')[0].trim() : '';
+    const userAgent = request.headers['user-agent'] || '';
+
+    this.cls.set('ipAddress', ip);
+    this.cls.set('userAgent', userAgent);
+
     const isPublic = this.reflector.get(IS_PUBLIC_KEY, context.getHandler());
     if (isPublic) {
       return true;

package/src/index.ts

@@ -86,6 +86,9 @@ export * from './dtos/update-security-rule.dto'
 export * from './dtos/update-chatter-message.dto'
 export * from './dtos/update-chatter-message-details.dto'
 export * from './dtos/update-locale.dto'
+export * from './dtos/create-user-activity-history.dto'
+export * from './dtos/update-user-activity-history.dto'
+
 export * from './entities/action-metadata.entity'
 export * from './entities/common.entity'
 export * from './entities/email-attachment.entity'
@@ -117,6 +120,8 @@ export * from './entities/export-transaction.entity'
 export * from './entities/import-transaction.entity'
 export * from './entities/import-transaction-error-log.entity'
 export * from './entities/locale.entity'
+export * from './entities/user-activity-history.entity'
+
 export * from './enums/auth-type.enum'
 
 export * from './filters/http-exception.filter'
@@ -234,6 +239,8 @@ export * from './services/request-context.service'
 export * from './services/chatter-message.service'
 export * from './services/chatter-message-details.service'
 export * from './services/locale.service'
+export * from './services/user-activity-history.service'
+
 // Repositories
 export * from './repository/solid-base.repository'
 export * from './repository/security-rule.repository'