@solidxai/core 0.1.9-beta.8 → 0.1.10-beta.0

package/src/services/user.service.ts

@@ -1,37 +1,68 @@
-import { BadRequestException, forwardRef, Inject, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  forwardRef,
+  Inject,
+  Injectable,
+} from "@nestjs/common";
 import { ModuleRef } from "@nestjs/core";
-import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-import { CRUDService } from 'src/services/crud.service';
-import { EntityManager, Repository } from 'typeorm';
+import { InjectEntityManager, InjectRepository } from "@nestjs/typeorm";
+import { CRUDService } from "src/services/crud.service";
+import { EntityManager, Repository } from "typeorm";
 import type { SolidCoreSetting } from "src/services/settings/default-settings-provider.service";
 
-
-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 { ERROR_MESSAGES } from 'src/constants/error-messages';
-import { UserRepository } from 'src/repository/user.repository';
-import { RoleMetadataRepository } from 'src/repository/role-metadata.repository';
-import { HashingService } from './hashing.service';
+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 { ERROR_MESSAGES } from "src/constants/error-messages";
+import { UserRepository } from "src/repository/user.repository";
+import { RoleMetadataRepository } from "src/repository/role-metadata.repository";
+import { HashingService } from "./hashing.service";
 
 @Injectable()
 export class UserService extends CRUDService<User> {
+  private buildFacebookUsernameBase(name?: string): string {
+    const normalized = (name || "")
+      .trim()
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "_")
+      .replace(/^_+|_+$/g, "");
+    return normalized || "facebook_user";
+  }
+
+  private async resolveUniqueUsername(
+    preferredUsername: string,
+    // fallbackUsername: string,
+  ): Promise<string> {
+    let candidate = preferredUsername;
+    let suffix = 0;
+
+    while (await this.repo.findOne({ where: { username: candidate } })) {
+      suffix += 1;
+      candidate = `${preferredUsername}_${suffix}`;
+    }
+
+    if (candidate) {
+      return candidate;
+    }
+
+    // return fallbackUsername;
+  }
+
   constructor(
     readonly hashingService: HashingService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     // @InjectRepository(User, 'default')
     readonly repo: UserRepository,
-    @InjectRepository(User, 'default')
+    @InjectRepository(User, "default")
     readonly nonSecurityRuleAwareRepo: Repository<User>,
     // @InjectRepository(RoleMetadata)
     // private readonly roleRepository: Repository<RoleMetadata>,
     private readonly roleRepository: RoleMetadataRepository,
     readonly moduleRef: ModuleRef,
-
   ) {
-    super(entityManager, repo, 'user', 'solid-core', moduleRef);
+    super(entityManager, repo, "user", "solid-core", moduleRef);
   }
 
   override async delete(id: number, solidRequestContext: any = {}) {
@@ -44,13 +75,19 @@ export class UserService extends CRUDService<User> {
     return super.delete(id, solidRequestContext);
   }
 
-  override async deleteMany(ids: number[], solidRequestContext: any = {}): Promise<any> {
+  override async deleteMany(
+    ids: number[],
+    solidRequestContext: any = {},
+  ): Promise<any> {
     if (!ids || ids.length === 0) {
       throw new Error(ERROR_MESSAGES.DELETE_IDS_REQUIRED);
     }
 
     // ❌ If the active user is trying to delete themselves
-    if (solidRequestContext?.activeUser?.sub && ids.includes(solidRequestContext.activeUser.id)) {
+    if (
+      solidRequestContext?.activeUser?.sub &&
+      ids.includes(solidRequestContext.activeUser.id)
+    ) {
       throw new BadRequestException(ERROR_MESSAGES.DELETE_SELF_NOT_ALLOWED);
     }
 
@@ -60,9 +97,9 @@ export class UserService extends CRUDService<User> {
   async findOneByEmail(email: string): Promise<User> {
     return await this.repo.findOne({
       where: {
-        email: email
+        email: email,
       },
-      relations: {}
+      relations: {},
     });
     // if (!entity) {
     //     throw new NotFoundException(`user with email #${email} not found`);
@@ -73,18 +110,18 @@ export class UserService extends CRUDService<User> {
   async findOneByAccessCode(accessCode: string): Promise<User> {
     return await this.repo.findOne({
       where: {
-        accessCode: accessCode
+        accessCode: accessCode,
       },
-      relations: {}
+      relations: {},
     });
   }
 
   async findOneByUsername(username: string): Promise<User> {
     return await this.repo.findOne({
       where: {
-        username: username
+        username: username,
       },
-      relations: {}
+      relations: {},
     });
     // if (!entity) {
     //     throw new NotFoundException(`user with username ${username} not found`);
@@ -96,8 +133,8 @@ export class UserService extends CRUDService<User> {
     const user = await this.repo.findOne({
       where: { id: id },
       relations: {
-        roles: true
-      }
+        roles: true,
+      },
     });
     if (!user) {
       throw new Error(ERROR_MESSAGES.USER_NOT_FOUND);
@@ -113,21 +150,22 @@ export class UserService extends CRUDService<User> {
     const user = await this.repo.findOne({
       where: { username: username },
       relations: {
-        roles: true
-      }
+        roles: true,
+      },
     });
     if (!user) {
       throw new Error(ERROR_MESSAGES.USER_NOT_FOUND_BY_USERNAME(username));
     }
-    const role = await this.roleRepository.findOne({ where: { name: roleName } });
+    const role = await this.roleRepository.findOne({
+      where: { name: roleName },
+    });
     if (!role) {
       throw new Error(ERROR_MESSAGES.ROLE_NOT_FOUND(roleName));
     }
 
     if (user.roles && user.roles.length > 0) {
       user.roles.push(role);
-    }
-    else {
+    } else {
       user.roles = [role];
     }
 
@@ -137,7 +175,7 @@ export class UserService extends CRUDService<User> {
   async addRolesToUser(username: string, roleNames: string[]): Promise<User> {
     const user = await this.nonSecurityRuleAwareRepo.findOne({
       where: { username: username },
-      relations: { roles: true }
+      relations: { roles: true },
     });
 
     if (!user) {
@@ -145,43 +183,47 @@ export class UserService extends CRUDService<User> {
     }
 
     const roles = await this.roleRepository.find({
-      where: roleNames.map(roleName => ({ name: roleName }))
+      where: roleNames.map((roleName) => ({ name: roleName })),
     });
 
     if (roles.length !== roleNames.length) {
-      const foundRoleNames = roles.map(role => role.name);
-      const missingRoles = roleNames.filter(roleName => !foundRoleNames.includes(roleName));
+      const foundRoleNames = roles.map((role) => role.name);
+      const missingRoles = roleNames.filter(
+        (roleName) => !foundRoleNames.includes(roleName),
+      );
       throw new Error(ERROR_MESSAGES.ROLES_NOT_FOUND(missingRoles));
     }
 
-    const currentRoles = user.roles.map(role => role.name);
+    const currentRoles = user.roles.map((role) => role.name);
 
-    const rolesToAdd = roles.filter(role => !currentRoles.includes(role.name));
+    const rolesToAdd = roles.filter(
+      (role) => !currentRoles.includes(role.name),
+    );
 
-    const rolesToRemove = user.roles.filter(role => !roleNames.includes(role.name));
+    const rolesToRemove = user.roles.filter(
+      (role) => !roleNames.includes(role.name),
+    );
 
     if (rolesToAdd.length > 0) {
       user.roles.push(...rolesToAdd);
     }
 
     if (rolesToRemove.length > 0) {
-      user.roles = user.roles.filter(role => !rolesToRemove.includes(role));
+      user.roles = user.roles.filter((role) => !rolesToRemove.includes(role));
     }
 
     return await this.nonSecurityRuleAwareRepo.save(user);
   }
 
-
   async removeRoleFromUser(username: string, roleName: string): Promise<User> {
-
     // load the role with the respective permissions.
     const user = await this.repo.findOne({
       where: {
-        username: username
+        username: username,
       },
       relations: {
-        roles: true
-      }
+        roles: true,
+      },
     });
 
     if (!user) {
@@ -189,7 +231,7 @@ export class UserService extends CRUDService<User> {
     }
 
     // modify the permissions array.
-    user.roles = user.roles.filter(role => role.name !== roleName);
+    user.roles = user.roles.filter((role) => role.name !== roleName);
 
     return await this.repo.save(user);
   }
@@ -201,11 +243,11 @@ export class UserService extends CRUDService<User> {
         email: oauthUserDto.email,
       },
       relations: {
-        roles: true
-      }
+        roles: true,
+      },
     });
 
-    // if we are unable to find a user then we need to create one. 
+    // if we are unable to find a user then we need to create one.
     if (!user) {
       const user = new User();
       user.username = oauthUserDto.email;
@@ -220,9 +262,12 @@ export class UserService extends CRUDService<User> {
       const savedUser = await this.repo.save(user);
 
       // Initialize the user roles
-      await this.initializeRolesForNewUser([this.settingService.getConfigValue<SolidCoreSetting>('defaultRole')], savedUser);
+      await this.initializeRolesForNewUser(
+        [this.settingService.getConfigValue<SolidCoreSetting>("defaultRole")],
+        savedUser,
+      );
     }
-    // else we update the user and store the generated code & access token. 
+    // else we update the user and store the generated code & access token.
     else {
       const entity = await this.repo.preload({
         id: user.id,
@@ -240,19 +285,48 @@ export class UserService extends CRUDService<User> {
   }
 
   async resolveUserOnOauthFacebook(oauthUserDto: OauthUserDto): Promise<User> {
-    const user = await this.repo.findOne({
-      where: {
-        email: oauthUserDto.email,
-      },
-      relations: {
-        roles: true,
-      },
-    });
+    const normalizedEmail = oauthUserDto.email?.trim().toLowerCase() || null;
+    let user: User | null = null;
+
+    if (oauthUserDto.providerId) {
+      user = await this.repo.findOne({
+        where: {
+          facebookId: oauthUserDto.providerId,
+        },
+        relations: {
+          roles: true,
+        },
+      });
+    }
 
     if (!user) {
+      const facebookProviderFallback = `facebook_${oauthUserDto.providerId}`;
+      const facebookNameUsername = this.buildFacebookUsernameBase(
+        oauthUserDto.name,
+      );
+      // let username = normalizedEmail || facebookNameUsername;
+      let username = facebookNameUsername;
+
+      let email = normalizedEmail;
+
+      // Avoid clashing with local users that already own the same email/username.
+      if (normalizedEmail) {
+        const existingByEmail = await this.repo.findOne({
+          where: { email: normalizedEmail },
+        });
+        if (existingByEmail) {
+          username = facebookNameUsername;
+          email = null;
+        }
+      }
+      username = await this.resolveUniqueUsername(
+        username,
+        // facebookProviderFallback,
+      );
+
       const newUser = new User();
-      newUser.username = oauthUserDto.email;
-      newUser.email = oauthUserDto.email;
+      newUser.username = username;
+      newUser.email = email;
       newUser.fullName = oauthUserDto.name;
       newUser.lastLoginProvider = oauthUserDto.provider;
       newUser.accessCode = oauthUserDto.accessCode;
@@ -263,7 +337,7 @@ export class UserService extends CRUDService<User> {
       const savedUser = await this.repo.save(newUser);
 
       await this.initializeRolesForNewUser(
-        [this.settingService.getConfigValue<SolidCoreSetting>('defaultRole')],
+        [this.settingService.getConfigValue<SolidCoreSetting>("defaultRole")],
         savedUser,
       );
       return savedUser;
@@ -276,13 +350,11 @@ export class UserService extends CRUDService<User> {
         facebookId: oauthUserDto.providerId,
         facebookProfilePicture: oauthUserDto.picture,
       });
-
       await this.repo.save(entity);
       return entity;
     }
   }
 
-
   async resolveUserOnOauthMicrosoft(oauthUserDto: OauthUserDto): Promise<User> {
     const user = await this.repo.findOne({
       where: {
@@ -307,10 +379,9 @@ export class UserService extends CRUDService<User> {
       const savedUser = await this.repo.save(newUser);
 
       await this.initializeRolesForNewUser(
-        [this.settingService.getConfigValue<SolidCoreSetting>('defaultRole')],
+        [this.settingService.getConfigValue<SolidCoreSetting>("defaultRole")],
         savedUser,
       );
-      return savedUser;
     } else {
       const entity = await this.repo.preload({
         id: user.id,
@@ -322,25 +393,29 @@ export class UserService extends CRUDService<User> {
       });
 
       await this.repo.save(entity);
-      return entity;
     }
+    return user;
   }
 
-  async findUsersByRole(roleName: string, relations: any = {}): Promise<User[]> {
+  async findUsersByRole(
+    roleName: string,
+    relations: any = {},
+  ): Promise<User[]> {
     return await this.repo.find({
       where: {
         roles: {
-          name: roleName
-        }
+          name: roleName,
+        },
       },
-      relations: relations
+      relations: relations,
     });
   }
 
   async checkIfPermissionExists(query: any, activeUser: ActiveUserData) {
-
-    const matchingPermssions = activeUser.permissions.filter((p) => query.permissionNames.includes(p));
-    return matchingPermssions
+    const matchingPermssions = activeUser.permissions.filter((p) =>
+      query.permissionNames.includes(p),
+    );
+    return matchingPermssions;
   }
 
   async initializeRolesForNewUser(roles: string[], user: User) {
@@ -348,7 +423,7 @@ export class UserService extends CRUDService<User> {
       throw new BadRequestException(ERROR_MESSAGES.USER_MISSING_ID);
     }
     let userRoles = [];
-    // Default Internal user role assigned 
+    // Default Internal user role assigned
     userRoles.push("Internal User");
     if (roles) {
       userRoles = [...userRoles, ...roles];
@@ -372,7 +447,4 @@ export class UserService extends CRUDService<User> {
       passwordSchemeVersion: this.hashingService.currentVersion(),
     };
   }
-
-
 }
-

package/dev-grooming-docs/ozzy-prompts.txt

@@ -1,70 +0,0 @@
-Hi Ozzy, 
-Can you give me instructions to create a new model in the fees portal module, you can call it address-master. 
-This model needs to have the following fields. 
-1. address1 - shortText 
-2. address2 - shortText 
-3. addressType - selectionStatic with values - home, office & other. 
-4. city - many2one with the city model
-5. state - many2one with the state model
-6. pincode - many2one with the state model. 
-
-After I add this model I want to start storing student address. 
-
-To do this if you can also give me instructions on how to add a relation field to the student model, you can call this field studentAddress.
-
-
-
-
-
-
-Can you now create a new computed field provider. 
-- You can call this provider: StateTotalCitiesComputedFieldProvider
-- This will be a post computation provider and will depend on the city model being inserted, deleted, updated. 
-- The implementation simply needs to take a count of cities that belong to the same state as the city being mutated and update the state totalCities field.
-
-
-Can you now create a new computed field provider. 
-- You can call this provider: StateTotalPopulationComputedFieldProvider
-- This will be a post computation provider and will depend on the city model being inserted, deleted, updated. 
-- The implementation simply needs to take a sum of population of each city that belong to the same state as the city being mutated and update the state totalPopulation field.
-
-
-Can you now create a new computed field provider. 
-- You can call this provider: StateTotalGdpComputedFieldProvider
-- This will be a post computation provider and will depend on the city model being inserted, deleted, updated. 
-- The implementation simply needs to take a sum of gdp of each city that belong to the same state as the city being mutated and update the state totalGdp field.
-- I will add the totalGdp field to the state model after I have the computed provider TS code. 
-
-
-# Testing prompt sequence
-
-## Create Module 
-Can you create a new module called address-master. This will be used to store address master data. 
-
-## Add Model - Country 
-Can you add a new model to the address-master module called country. 
-This will have name, description (richText), countryCode. You can assume name & countryCode to be unique. But only name will be used as a userkey. 
-Also enable audit tracking on the model and all its fields.
-Make sure the table name is properly prefixed with the module name snake case. 
-
-## Add Model - Language
-Can you add a new model to the address-master module called language. 
-This will have language, languageIsoCode. You can assume language to be unique. 
-Also for the languageIsoCode, can you create a field with type staticSelection add a bunch (20 odd, include at-least 7-8 indian languages also) of commonly spoken languages with their respective language codes as values.
-Also enable audit tracking on the model and all its fields.
-Make sure the table name is properly prefixed with the module name snake case. 
-
-## Add Model - Country Language 
-
-Can you now add a new model called CountrySpokenLanguages, this model will have 2 many-to-one fields. 
-1. country - many-to-one with the country model. 
-2. spokenLanguage - many-to-one with the language model. 
-3. spokenBy - int field storing data representing how many people speak that language.
-Also enable audit tracking on the model and all its fields.
-Make sure the table name is properly prefixed with the module name snake case. 
-
-## Add Model - Country Population Trend 
-Can you add a model called CountryPopulationTrend, this model has the following fields. 
-1. country - many-to-one with the country model. 
-2. entryDate - date field. 
-3. populationAsOnDate - int field storing the population of that country as on that date.