@solidstarters/solid-core 1.2.58 → 1.2.60

package/src/services/setting.service.ts

@@ -38,31 +38,88 @@ export class SettingService extends CRUDService<Setting> {
     );
   }
 
-  async wrapSettings(): Promise<Record<string, any>> {
-    const settingsArray: any[] = await this.repo.find();
+  async seedDefaultSettings(): Promise<void> {
+    const settingsSeederData = {
+      allowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
+      iamPasswordRegistrationEnabled: this.iamConfiguration.iamPasswordRegistrationEnabled,
+      passwordlessRegistration: this.iamConfiguration.passwordlessRegistration,
+      activateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
+      iamGoogleOAuthEnabled: false,
+      authPagesLayout: "center",
+      authPagesTheme: "light",
+      appTitle: process.env.SOLID_APP_NAME || "Solid App",
+      appLogo: "",
+      appDescription: "",
+      appTnc: "",
+      appPrivacyPolicy: "",
+      defaultRole: this.iamConfiguration.defaultRole,
+      shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
+      shouldQueueSms: this.commonConfiguration.shouldQueueSms
+    };
 
-    if (!settingsArray || settingsArray.length === 0) {
-      return this.getDefaultSettings();
+    const existingSettings = await this.repo.find();
+    const existingKeys = new Set(existingSettings.map(s => s.key));
+
+    const settingsToInsert: Setting[] = [];
+    for (const [key, value] of Object.entries(settingsSeederData)) {
+      if (!existingKeys.has(key)) {
+        const setting = new Setting();
+        setting.key = key;
+        setting.value = typeof value === 'boolean' ? value.toString() : 
+                        Array.isArray(value) ? value.join(',') : 
+                        value === null || value === undefined ? '' : String(value);
+        settingsToInsert.push(setting);
+      }
     }
 
-    const settings = settingsArray[0];
+    if (settingsToInsert.length > 0) {
+      await this.repo.save(settingsToInsert);
+    }
+  }
 
+  async wrapSettings(): Promise<Record<string, any>> {
+    const settingsArray: Setting[] = await this.repo.find();
+    
+    if (!settingsArray || settingsArray.length === 0) {
+      return this.getDefaultSettings();
+    }
+    
+    const settingsMap: Record<string, any> = {};
+    for (const setting of settingsArray) {
+      if (setting.key && setting.value !== undefined && setting.value !== null) {
+        let value = setting.value;
+        
+        if (value === 'true' || value === 'false') {
+          settingsMap[setting.key] = value === 'true';
+        }
+        else if (!isNaN(Number(value)) && value.trim() !== '') {
+          settingsMap[setting.key] = Number(value);
+        }
+        else if (value.includes(',')) {
+          settingsMap[setting.key] = value.split(',').map(item => item.trim());
+        }
+        else {
+          settingsMap[setting.key] = value;
+        }
+      }
+    }
+    
     const defaultSettings = this.getDefaultSettings();
-
+    
     const mergedSettings = Object.keys(defaultSettings).reduce((acc, key) => {
-      acc[key] = settings[key] !== null && settings[key] !== undefined ? settings[key] : defaultSettings[key];
+      acc[key] = settingsMap[key] !== undefined ? settingsMap[key] : defaultSettings[key];
       return acc;
     }, {} as Record<string, any>);
-
+    
     return mergedSettings;
   }
-
+  
   private getDefaultSettings(): Record<string, any> {
     return {
-      iamAllowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
-      iamPasswordRegistrationEnabled: false,
-      iamPasswordLessRegistrationEnabled: this.iamConfiguration.passwordlessRegistration,
-      iamActivateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
+      allowPublicRegistration: this.iamConfiguration.allowPublicRegistration,
+      iamPasswordRegistrationEnabled: this.iamConfiguration.iamPasswordRegistrationEnabled,
+      passwordlessRegistration: this.iamConfiguration.passwordlessRegistration,
+      activateUserOnRegistration: this.iamConfiguration.activateUserOnRegistration,
       iamGoogleOAuthEnabled: false,
       authPagesLayout: "center",
       authPagesTheme: "light",
@@ -71,10 +128,102 @@ export class SettingService extends CRUDService<Setting> {
       appDescription: "",
       appTnc: "",
       appPrivacyPolicy: "",
-      iamDefaultRole: this.iamConfiguration.defaultRole,
+      defaultRole: this.iamConfiguration.defaultRole,
       shouldQueueEmails: this.commonConfiguration.shouldQueueEmails,
       shouldQueueSms: this.commonConfiguration.shouldQueueSms
     };
   }
 
+  async getConfigValue(settingKey: string) {
+    try {
+        const settingsArray: Setting[] = await this.repo.find();
+        const settingEntry = settingsArray.find(setting => setting.key === settingKey);
+        
+        if (settingEntry && settingEntry.value !== null && settingEntry.value !== undefined) {
+            const value = settingEntry.value;
+            
+            if (value === 'true' || value === 'false') {
+                return value === 'true';
+            }
+            else if (!isNaN(Number(value)) && value.trim() !== '') {
+                return Number(value);
+            }
+            else if (value.includes(',')) {
+                return value.split(',').map(item => item.trim());
+            }
+            else {
+                return value;
+            }
+        }
+        
+        const defaultSettings = this.getDefaultSettings();
+        return defaultSettings[settingKey];
+    } catch (error) {
+        const defaultSettings = this.getDefaultSettings();
+        return defaultSettings[settingKey];
+    }
+  }
+
+  async updateSettings(settings: Record<string, any>): Promise<Setting[]> {
+    const existingSettings = await this.repo.find();
+    const existingKeys = new Set(existingSettings.map(s => s.key));
+    
+    const settingsToUpdate: Setting[] = [];
+    const settingsToCreate: Setting[] = [];
+    
+    for (const [key, value] of Object.entries(settings)) {
+      const stringValue = typeof value === 'boolean' ? value.toString() : 
+                         Array.isArray(value) ? value.join(',') : 
+                         value === null || value === undefined ? '' : String(value);
+
+      if (existingKeys.has(key)) {
+        const existingSetting = existingSettings.find(s => s.key === key);
+        if (existingSetting) {
+          existingSetting.value = stringValue;
+          settingsToUpdate.push(existingSetting);
+        }
+      } else {
+        const newSetting = new Setting();
+        newSetting.key = key;
+        newSetting.value = stringValue;
+        settingsToCreate.push(newSetting);
+      }
+    }
+    
+    if (settingsToUpdate.length > 0) {
+      await this.repo.save(settingsToUpdate);
+    }
+    
+    if (settingsToCreate.length > 0) {
+      await this.repo.save(settingsToCreate);
+    }
+    
+    return [...settingsToUpdate, ...settingsToCreate];
+  }
+
+  async getAllSettings(): Promise<Record<string, any>> {
+    const settingsArray = await this.repo.find();
+    const settingsMap: Record<string, any> = {};
+    
+    for (const setting of settingsArray) {
+      if (setting.key && setting.value !== undefined && setting.value !== null) {
+        const value = setting.value;
+        
+        if (value === 'true' || value === 'false') {
+          settingsMap[setting.key] = value === 'true';
+        }
+        else if (!isNaN(Number(value)) && value.trim() !== '') {
+          settingsMap[setting.key] = Number(value);
+        }
+        else if (value.includes(',')) {
+          settingsMap[setting.key] = value.split(',').map(item => item.trim());
+        }
+        else {
+          settingsMap[setting.key] = value;
+        }
+      }
+    }
+    
+    return settingsMap;
+  }
 }

package/src/services/user.service.ts

@@ -1,5 +1,5 @@
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { ConfigService, ConfigType } from '@nestjs/config';
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
 import { CrudHelperService } from "src/services/crud-helper.service";
@@ -14,6 +14,7 @@ import { OauthUserDto } from '../dtos/oauth-user-dto';
 import { RoleMetadata } from '../entities/role-metadata.entity';
 import { User } from '../entities/user.entity';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
+import { iamConfig } from 'src/config/iam.config';
 
 @Injectable()
 export class UserService extends CRUDService<User> {
@@ -30,8 +31,10 @@ export class UserService extends CRUDService<User> {
     readonly repo: Repository<User>,
     @InjectRepository(RoleMetadata)
     private readonly roleRepository: Repository<RoleMetadata>,
-    readonly moduleRef: ModuleRef
-
+    readonly moduleRef: ModuleRef,
+    @Inject(iamConfig.KEY)
+    private readonly iamConfiguration: ConfigType<typeof iamConfig>,
+    
   ) {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'user', 'solid-core', moduleRef);
   }
@@ -195,7 +198,10 @@ export class UserService extends CRUDService<User> {
       user.googleId = oauthUserDto.providerId;
       user.googleProfilePicture = oauthUserDto.picture;
 
-      return await this.repo.save(user);
+      const savedUser = await this.repo.save(user);
+
+      // Initialize the user roles
+      this.initializeRolesForNewUser([this.iamConfiguration.defaultRole], savedUser);
     }
     // else we update the user and store the generated code & access token. 
     else {
@@ -230,4 +236,21 @@ export class UserService extends CRUDService<User> {
     const matchingPermssions = activeUser.permissions.filter((p) => query.permissionNames.includes(p));
     return matchingPermssions
   }
+
+  initializeRolesForNewUser(roles: string[], user: User) {
+    if (!user.id) {
+        throw new BadRequestException('User must exist before initializing roles');
+    }
+    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.addRolesToUser(user.username, userRoles);
+    }
+ }
+
 }