@solidstarters/solid-core 1.2.58 → 1.2.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.58",
+  "version": "1.2.60",
   "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

@@ -3,6 +3,7 @@ import { registerAs } from '@nestjs/config';
 export const iamConfig = registerAs('iam', () => {
     return {
         passwordlessRegistration: (process.env.IAM_PASSWORD_LESS_REGISTRATION ?? 'false') === 'true',
+        iamPasswordRegistrationEnabled: (process.env.IAM_PASSWORD_REGISTRATION_ENABLED ?? 'true') === 'true',
         passwordlessRegistrationValidateWhat: (process.env.IAM_PASSWORD_LESS_REGISTRATION_VALIDATE_WHAT ?? 'email').split(',').map((item) => item.trim()),
         allowPublicRegistration: (process.env.IAM_ALLOW_PUBLIC_REGISTRATION ?? 'true') === 'true',
         activateUserOnRegistration: (process.env.IAM_ACTIVATE_USER_ON_REGISTRATION ?? 'true') === 'true',

package/src/controllers/setting.controller.ts

@@ -6,6 +6,7 @@ import { CreateSettingDto } from '../dtos/create-setting.dto';
 import { UpdateSettingDto } from '../dtos/update-setting.dto';
 import { SolidRequestContextDecorator } from 'src/decorators/solid-request-context.decorator';
 import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
+import { UpdateSettingsDto } from 'src/dtos/update-settings.dto';
 
 @ApiTags('Solid') 
 @Controller('setting') //FIXME: Change this to the model plural name 
@@ -45,7 +46,12 @@ export class SettingController {
   @Get('/wrapped')
   async wrapSettings() {
       return this.service.wrapSettings();
-  }  
+  }
+
+  @Get()
+  async getAllSettings() {
+    return this.service.getAllSettings();
+  }
     
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
@@ -79,4 +85,10 @@ export class SettingController {
   async delete(@Param('id') id: number,@SolidRequestContextDecorator() solidRequestContext:SolidRequestContextDto) {
     return this.service.delete(id,solidRequestContext);
   }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-update')
+  async updateSettings(@Body() updateSettingsDto: UpdateSettingsDto) {
+    return this.service.updateSettings(updateSettingsDto.settings);
+  }
 }

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

@@ -1,63 +1,14 @@
 import { IsString } from 'class-validator';
 import { IsOptional, IsBoolean } from 'class-validator';
-export class CreateSettingDto {
-@IsOptional()
-@IsString()
-authPagesLayout: string;
-
-@IsOptional()
-@IsString()
-authPagesTheme: string;
-
-@IsOptional()
-@IsString()
-appTitle: string;
-
-@IsOptional()
-@IsString()
-appLogo: string;
-
-@IsOptional()
-@IsString()
-appDescription: string;
-
-@IsOptional()
-@IsString()
-appTnc: string;
-
-@IsOptional()
-@IsString()
-appPrivacyPolicy: string;
-
-@IsOptional()
-@IsBoolean()
-iamAllowPublicRegistration: boolean = false;
+import { ApiProperty } from '@nestjs/swagger';
 
-@IsOptional()
-@IsBoolean()
-iamPasswordRegistrationEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-iamPasswordLessRegistrationEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-iamActivateUserOnRegistration: boolean = false;
-
-@IsOptional()
-@IsString()
-iamDefaultRole: string;
-
-@IsOptional()
-@IsBoolean()
-iamGoogleOAuthEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-shouldQueueEmails: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-shouldQueueSms: boolean = false;
+export class CreateSettingDto {
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    key: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    value: string;
 }

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

@@ -1,66 +1,16 @@
 import { IsInt,IsOptional, IsString, IsBoolean } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
 export class UpdateSettingDto {
     @IsOptional()
     @IsInt()
     id: number;
-
-@IsOptional()
-@IsString()
-authPagesLayout: string;
-
-@IsOptional()
-@IsString()
-authPagesTheme: string;
-
-@IsOptional()
-@IsString()
-appTitle: string;
-
-@IsOptional()
-@IsString()
-appLogo: string;
-
-@IsOptional()
-@IsString()
-appDescription: string;
-
-@IsOptional()
-@IsString()
-appTnc: string;
-
-@IsOptional()
-@IsString()
-appPrivacyPolicy: string;
-
-@IsOptional()
-@IsBoolean()
-iamAllowPublicRegistration: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-iamPasswordRegistrationEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-iamPasswordLessRegistrationEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-iamActivateUserOnRegistration: boolean = false;
-
-@IsOptional()
-@IsString()
-iamDefaultRole: string;
-
-@IsOptional()
-@IsBoolean()
-iamGoogleOAuthEnabled: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-shouldQueueEmails: boolean = false;
-
-@IsOptional()
-@IsBoolean()
-shouldQueueSms: boolean = false;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    key: string;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    value: string;
 }

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

@@ -0,0 +1,7 @@
+import { IsNotEmpty, IsObject } from 'class-validator';
+
+export class UpdateSettingsDto {
+    @IsObject()
+    @IsNotEmpty()
+    settings: Record<string, any>;
+} 

package/src/entities/setting.entity.ts

@@ -1,49 +1,11 @@
 import { CommonEntity } from 'src/entities/common.entity'
-import {Entity, Column} from 'typeorm'
-@Entity("ss_setting")
-export class Setting extends CommonEntity{
-@Column({ type: "varchar", nullable: true })
-authPagesLayout: string;
-
-@Column({ type: "varchar", nullable: true })
-authPagesTheme: string;
-
-@Column({ type: "varchar", nullable: true })
-appTitle: string;
-
-@Column({ type: "varchar", nullable: true })
-appLogo: string;
-
-@Column({ type: "varchar", nullable: true })
-appDescription: string;
-
-@Column({ type: "varchar", nullable: true })
-appTnc: string;
-
-@Column({ type: "varchar", nullable: true })
-appPrivacyPolicy: string;
-
-@Column({ type: "boolean", nullable: true, default: false })
-iamAllowPublicRegistration: boolean = false;
+import {Entity, Column, Index} from 'typeorm'
 
-@Column({ type: "boolean", nullable: true, default: false })
-iamPasswordRegistrationEnabled: boolean = false;
-
-@Column({ type: "boolean", nullable: true, default: false })
-iamPasswordLessRegistrationEnabled: boolean = false;
-
-@Column({ type: "boolean", nullable: true, default: false })
-iamActivateUserOnRegistration: boolean = false;
-
-@Column({ type: "varchar", nullable: true })
-iamDefaultRole: string;
-
-@Column({ type: "boolean", nullable: true, default: false })
-iamGoogleOAuthEnabled: boolean = false;
-
-@Column({ type: "boolean", nullable: true, default: false })
-shouldQueueEmails: boolean = false;
-
-@Column({ type: "boolean", nullable: true, default: false })
-shouldQueueSms: boolean = false;
+@Entity("ss_setting")
+export class Setting extends CommonEntity {
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
+    key: string;
+    @Column({ type: "varchar", nullable: true })
+    value: string;
 }

package/src/seeders/module-metadata-seeder.service.ts

@@ -74,24 +74,6 @@ export class ModuleMetadataSeederService {
 
         const typedSolidCoreMetadata: any = solidCoreMetadata;
 
-        const settingsSeederData: any = {
-            iamAllowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
-            iamPasswordRegistrationEnabled: true,
-            iamPasswordLessRegistrationEnabled: this.iamConfiguration.passwordlessRegistration,
-            iamActivateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
-            iamGoogleOAuthEnabled: false,
-            authPagesLayout: "center",
-            authPagesTheme: "light",
-            appTitle: process.env.SOLID_APP_NAME || "Solid App",
-            appLogo: "",
-            appDescription: "",
-            appTnc: "",
-            appPrivacyPolicy: "",
-            iamDefaultRole: this.iamConfiguration.defaultRole,
-            shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
-            shouldQueueSms: this.commonConfiguration.shouldQueueSms
-        }
-
         // Run the permissions seeder. 
         // await this.permissionsSeederService.seed();
         this.logger.log(`Seeding permissions`);
@@ -198,7 +180,7 @@ export class ModuleMetadataSeederService {
 
             // Settings
             this.logger.debug(`[Start] Processing settings for ${moduleMetadata.name}`);
-            await this.seedSettings(settingsSeederData);
+            await this.seetingService.seedDefaultSettings();
             this.logger.debug(`[End] Processing settings for ${moduleMetadata.name}`);
 
             // Security rules

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

@@ -2380,191 +2380,24 @@
         "userKeyFieldUserKey": "username",
         "fields": [
           {
-            "name": "authPagesLayout",
-            "displayName": "Auth Pages Layout",
-            "type": "selectionStatic",
-            "ormType": "varchar",
-            "length": 128,
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true,
-            "selectionStaticValues": [
-              "left:Left",
-              "center:Center",
-              "right:Right"
-            ]
-          },
-          {
-            "name": "authPagesTheme",
-            "displayName": "Auth Pages Theme",
-            "type": "selectionStatic",
-            "ormType": "varchar",
-            "length": 128,
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true,
-            "selectionStaticValues": [
-              "dark:Dark",
-              "light:Light"
-            ]
-          },
-          {
-            "name": "appTitle",
-            "displayName": "App Title",
+            "name": "key",
+            "displayName": "Key",
             "type": "shortText",
             "ormType": "varchar",
-            "length": 512,
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "appLogo",
-            "displayName": "App Logo",
-            "type": "mediaSingle",
-            "mediaStorageProviderUserKey": "default-filesystem",
+            "length": 128,
             "required": false,
-            "unique": false,
+            "unique": true,
             "index": false,
             "private": false,
             "encrypt": false,
             "isSystem": true
           },
           {
-            "name": "appDescription",
-            "displayName": "App Description",
+            "name": "value",
+            "displayName": "Value",
             "type": "longText",
             "ormType": "varchar",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "appTnc",
-            "displayName": "App TNC",
-            "type": "richText",
-            "ormType": "varchar",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "appPrivacyPolicy",
-            "displayName": "App Privacy Policy",
-            "type": "richText",
-            "ormType": "varchar",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamAllowPublicRegistration",
-            "displayName": "Iam Allow Public Registration",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamPasswordRegistrationEnabled",
-            "displayName": "Iam Password Registration Enabled",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamPasswordLessRegistrationEnabled",
-            "displayName": "Iam Password Less Registration enabled",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamActivateUserOnRegistration",
-            "displayName": "Iam Activate User On Registration",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamDefaultRole",
-            "displayName": "Iam Default Role",
-            "type": "shortText",
-            "ormType": "varchar",
-            "length": 512,
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "iamGoogleOAuthEnabled",
-            "displayName": "Iam Google OAuth Enabled",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "shouldQueueEmails",
-            "displayName": "Should Queue Emails",
-            "type": "boolean",
-            "ormType": "boolean",
-            "required": false,
-            "unique": false,
-            "index": false,
-            "private": false,
-            "encrypt": false,
-            "isSystem": true
-          },
-          {
-            "name": "shouldQueueSms",
-            "displayName": "Should Queue SMS",
-            "type": "boolean",
-            "ormType": "boolean",
+            "length": 128,
             "required": false,
             "unique": false,
             "index": false,

package/src/services/authentication.service.ts

@@ -39,6 +39,7 @@ import {
     RegistrationValidationSource,
     TransactionalRegistrationValidationSource
 } from "../constants";
+import { SettingService } from './setting.service';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
 
 enum LoginProvider {
@@ -71,6 +72,7 @@ export class AuthenticationService {
         private readonly mailService: SMTPEMailService,
         private readonly smsService: Msg91OTPService,
         private readonly eventEmitter: EventEmitter2,
+        private readonly settingService: SettingService,
     ) { }
 
     async resolveUser(username: string, email: string) {
@@ -108,7 +110,7 @@ export class AuthenticationService {
 
     async signUp(signUpDto: SignUpDto, activeUser: ActiveUserData = null): Promise<User> {
         // If public registrations are disabled and no activeUser is present when invoking signUp then we throw an exception.
-        if (!this.iamConfiguration.allowPublicRegistration && !activeUser) {
+        if (!(await this.settingService.getConfigValue('allowPublicRegistration')) && !activeUser) {
             throw new BadRequestException('Public registrations are disabled.');
         }
 
@@ -185,16 +187,7 @@ export class AuthenticationService {
     }
 
     private async handlePostSignup(user: User, roles: string[]=[], pwd: string, autoGeneratedPwd: string) {
-        let userRoles = [];
-        // Default Internal user role assigned 
-        userRoles.push("Internal User");
-        if (roles) {
-            userRoles = [...userRoles, ...roles];
-        }
-        userRoles = Array.from(new Set([...userRoles]));
-        if (userRoles.length > 0) {
-            this.userService.addRolesToUser(user.username, userRoles);
-        }
+        this.userService.initializeRolesForNewUser(roles, user);
         // Tanay: Adding user password to history table
         const userPasswordHistory = new UserPasswordHistory();
         userPasswordHistory.passwordHash = pwd;
@@ -208,6 +201,7 @@ export class AuthenticationService {
         }
     }
 
+
     generatePassword(length: number = 8): string {
         const upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         const lowerCase = "abcdefghijklmnopqrstuvwxyz";
@@ -278,7 +272,7 @@ export class AuthenticationService {
                 user = this.createUser(signUpDto);
                 this.populateVerificationTokens(finalRegistrationVerificationSources, user);
                 await this.userRepository.save(user);
-                await this.userService.addRoleToUser(user.username, this.iamConfiguration.defaultRole);
+                await this.userService.addRoleToUser(user.username, await this.settingService.getConfigValue('defaultRole'));
             }
             else {
                 this.populateVerificationTokens(finalRegistrationVerificationSources, user);
@@ -397,7 +391,7 @@ export class AuthenticationService {
             user.emailVerifiedOnRegistrationAt = new Date();
             user.emailVerificationTokenOnRegistration = null;
             user.emailVerificationTokenOnRegistrationExpiresAt = null;
-            user.active = this.iamConfiguration.activateUserOnRegistration && this.areRegistrationValidationSourcesVerified(user);
+            user.active = await this.settingService.getConfigValue('activateUserOnRegistration') && this.areRegistrationValidationSourcesVerified(user);
             const savedUser: User = await this.userRepository.save(user);
             this.triggerRegistrationEvent(savedUser);
             return { active: savedUser.active, message: `User registration verified for ${confirmSignUpDto.type}` }
@@ -419,7 +413,7 @@ export class AuthenticationService {
             user.mobileVerifiedOnRegistrationAt = new Date();
             user.mobileVerificationTokenOnRegistration = null;
             user.mobileVerificationTokenOnRegistrationExpiresAt = null;
-            user.active = this.iamConfiguration.activateUserOnRegistration && this.areRegistrationValidationSourcesVerified(user);
+            user.active = await this.settingService.getConfigValue('activateUserOnRegistration') && this.areRegistrationValidationSourcesVerified(user);
             const savedUser: User = await this.userRepository.save(user);
             this.triggerRegistrationEvent(savedUser);
             return { active: savedUser.active, message: `User registration verified for ${confirmSignUpDto.type}` }
@@ -976,8 +970,8 @@ export class AuthenticationService {
 
     }
 
-    private isPasswordlessRegistrationEnabled() {
-        return this.iamConfiguration.passwordlessRegistration;
+    private async isPasswordlessRegistrationEnabled() {
+        return this.settingService.getConfigValue('passwordlessRegistration');
     }
 
     //FIXME - Pending implementation