@solidstarters/solid-core 1.2.59 → 1.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.59",
+  "version": "1.2.61",
   "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/commands/refresh-model.command.ts

@@ -33,7 +33,7 @@ export class RefreshModelCommand extends CommandRunner {
       modelUserKey: options.name,
       dryRun: options.dryRun,
     };
-    await this.modelMetadataService.generateCode(codeGenerationOptions);
+    await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
   }
 
   @Option({

package/src/controllers/model-metadata.controller.ts

@@ -69,7 +69,7 @@ export class ModelMetadataController {
     @ApiBearerAuth("jwt")
     @Post(':id/generate-code')
     generateCode(@Param('id', ParseIntPipe) id: number) {
-        return this.modelMetadataService.generateCode({ modelId: id});
+        return this.modelMetadataService.handleGenerateCode({ modelId: id});
     }
 
 

package/src/services/authentication.service.ts

@@ -187,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;
@@ -210,6 +201,7 @@ export class AuthenticationService {
         }
     }
 
+
     generatePassword(length: number = 8): string {
         const upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         const lowerCase = "abcdefghijklmnopqrstuvwxyz";

package/src/services/model-metadata.service.ts

@@ -717,21 +717,22 @@ export class ModelMetadataService {
     return this.modelMetadataRepo.remove(entity);
   }
 
-  async generateCode(options: CodeGenerationOptions): Promise<string> {
-    const query = {
-      populate: ["module", "fields"]
-    };
-
-    const model = options.modelId
-      ? await this.findOne(options.modelId, query)
-      : await this.findOneByUserKey(options.modelUserKey, query.populate);
-
-    options.fieldIdsForRemoval = model.fields
-      .filter(field => field.isMarkedForRemoval)
-      .map(field => field.id);
-
-    const refreshModelCodeOutput = await this.generateModelCode(options);
-    const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+  async handleGenerateCode(options: CodeGenerationOptions): Promise<string> {
+    const { model, removeFieldCodeOuput, refreshModelCodeOutput } = await this.generateCode(options);
+
+    // Generate the code for models which are linked to fields having an inverse relation
+    const coModelSingularNames = model.fields.
+                          filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
+                          .map(field => field.relationCoModelSingularName);
+
+    for (const singularName of coModelSingularNames) {
+      const coModel = await this.findOneBySingularName(singularName);
+      const inverseOptions: CodeGenerationOptions = {
+        modelId: coModel.id,
+        dryRun: options.dryRun
+      };
+      await this.generateCode(inverseOptions);
+    }                      
 
     const jsonFieldsList = model.fields.filter((field: FieldMetadata) => field.isSystem !== true);
 
@@ -876,6 +877,24 @@ export class ModelMetadataService {
     return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
   }
 
+  private async generateCode(options: CodeGenerationOptions) {
+    const query = {
+      populate: ["module", "fields"]
+    };
+
+    const model = options.modelId
+      ? await this.findOne(options.modelId, query)
+      : await this.findOneByUserKey(options.modelUserKey, query.populate);
+
+    options.fieldIdsForRemoval = model.fields
+      .filter(field => field.isMarkedForRemoval)
+      .map(field => field.id);
+
+    const refreshModelCodeOutput = await this.generateModelCode(options);
+    const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+    return { model, removeFieldCodeOuput, refreshModelCodeOutput };
+  }
+
   async generateRemoveFieldsCode(options: CodeGenerationOptions): Promise<string> {
     if (!options.modelId && !options.modelUserKey) {
       throw new BadRequestException('Model ID or Model Name is required for generating code');

package/src/services/module-metadata.service.ts

@@ -375,7 +375,7 @@ export class ModuleMetadataService {
         modelId: model.id,
         dryRun: options.dryRun,
       };
-      const output = await this.modelMetadataService.generateCode(codeGenerationOptions);
+      const output = await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
       this.logger.debug(`Schematic output : ${output}`);
       outputLines.push(output)
     }

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);
+    }
+ }
+
 }