rez_core 5.0.230 → 5.0.232

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.230",
+  "version": "5.0.232",
   "description": "",
   "author": "",
   "private": false,

package/src/module/integration/service/integration.service.ts

@@ -1486,6 +1486,7 @@ export class IntegrationService {
         'https://www.googleapis.com/auth/gmail.send',
         'https://www.googleapis.com/auth/gmail.readonly',
         'https://www.googleapis.com/auth/userinfo.email',
+        'https://www.googleapis.com/auth/userinfo.profile',
         'https://www.googleapis.com/auth/calendar',
       ];
 
@@ -1613,6 +1614,7 @@ export class IntegrationService {
     accessToken: string,
     refreshToken: string,
     state: string,
+    name?: { displayName?: string; givenName?: string; familyName?: string },
   ): Promise<GmailSSOResult> {
     try {
       const oauthState = this.gmailOAuthStates.get(state);
@@ -1640,9 +1642,17 @@ export class IntegrationService {
         'gmail',
       );
 
+      const displayName =
+        name?.displayName ||
+        (name?.givenName && name?.familyName
+          ? `${name?.givenName} ${name?.familyName}`
+          : undefined) ||
+        email;
+
       // Pure SSO configuration - no client credentials stored per user
       const gmailConfig = {
         email: email,
+        fromName: displayName,
         accessToken: accessToken,
         refreshToken: refreshToken,
         authMethod: 'GOOGLE_SSO',

package/src/module/integration/service/oauth.service.ts

@@ -19,6 +19,8 @@ export class OAuthService {
   private readonly gmailScopes = [
     'https://www.googleapis.com/auth/gmail.send',
     'https://www.googleapis.com/auth/gmail.readonly',
+    'https://www.googleapis.com/auth/userinfo.profile',
+    'https://www.googleapis.com/auth/userinfo.email',
   ];
 
   generateGmailAuthUrl(state: string): string {

package/src/module/meta/service/entity-dynamic.service.ts

@@ -17,8 +17,7 @@ export class EntityDynamicService {
     private readonly entityMasterRepo: EntityMasterRepository,
     private readonly reflectionHelper: ReflectionHelper,
     private readonly configService: ConfigService,
-  ) {
-  }
+  ) {}
 
   schema = this.configService.get('DB_SCHEMA');
 
@@ -77,7 +76,11 @@ export class EntityDynamicService {
     // -------------------------------------------------------
     // AUTO-CODE GENERATION (POSTGRES SAFE)
     // -------------------------------------------------------
-    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.enterprise_id);
+    const entityMaster =
+      await this.entityMasterRepo.getEntityByMappedEntityType(
+        entityType,
+        loggedInUser.enterprise_id,
+      );
 
     if (!entityData.code && entityData.entity_type && entityMaster) {
       // Extract integer suffix
@@ -146,7 +149,6 @@ export class EntityDynamicService {
     const colList = columns.map((c) => `"${c}"`).join(', ');
     const placeholderList = placeholders.join(', ');
 
-
     const sql = `
         INSERT INTO ${this.schema}.${tableName} (${colList})
         VALUES (${placeholderList}) RETURNING id
@@ -550,7 +552,7 @@ export class EntityDynamicService {
       .map((attr) => `${attr.attribute_key}`)
       .join(', ');
     const selectQuery = `SELECT ${columns}
-                         FROM ${dataSource}
+                         FROM ${this.schema}.${dataSource}
                          WHERE id = $1`;
 
     const result = await this.entityManager.query(selectQuery, [id]);
@@ -572,9 +574,9 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-              Number(row[attr.attribute_key]),
-              loggedInUser,
-            )
+                Number(row[attr.attribute_key]),
+                loggedInUser,
+              )
             : null;
       }
     }
@@ -591,7 +593,11 @@ export class EntityDynamicService {
   ): Promise<any> {
     const enterprise_id = loggedInUser.enterprise_id;
 
-    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, enterprise_id);
+    const entityMaster =
+      await this.entityMasterRepo.getEntityByMappedEntityType(
+        entityType,
+        enterprise_id,
+      );
     if (!entityMaster) return null;
 
     const validAttributes = await this.getAttributeCodes(
@@ -601,7 +607,7 @@ export class EntityDynamicService {
 
     // const entityRepo = this.reflectionHelper.getRepoService(entityMaster?.entity_data_class);
 
-    const columns = validAttributes.map(attr => `t.${attr.attribute_key}`);
+    const columns = validAttributes.map((attr) => `t.${attr.attribute_key}`);
 
     // const result = await entityRepo.find({
     //   where: {
@@ -632,9 +638,9 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-              Number(row[attr.attribute_key]),
-              loggedInUser,
-            )
+                Number(row[attr.attribute_key]),
+                loggedInUser,
+              )
             : null;
       }
     }
@@ -732,14 +738,19 @@ export class EntityDynamicService {
     loggedInUser: any,
     appcode?: string,
   ): Promise<any> {
-
-    const entityMasters = await this.entityMasterRepo.findByEnterpriseIdAndAppCode(loggedInUser.enterprise_id, appcode);
+    const entityMasters =
+      await this.entityMasterRepo.findByEnterpriseIdAndAppCode(
+        loggedInUser.enterprise_id,
+        appcode,
+      );
 
     let dropdown = [] as any;
-    entityMasters.map(entityMaster => dropdown.push({
-      label: entityMaster.name,
-      value: entityMaster.mapped_entity_type,
-    }));
+    entityMasters.map((entityMaster) =>
+      dropdown.push({
+        label: entityMaster.name,
+        value: entityMaster.mapped_entity_type,
+      }),
+    );
 
     return dropdown;
   }

package/src/module/meta/service/resolver.service.ts

@@ -160,7 +160,7 @@ export class ResolverService {
           const statusItem = options.find(
             (opt) => opt.value == uploadData.review_status,
           );
-          uploadData.review_status_label =
+          uploadData.review_status =
             statusItem?.label || uploadData.review_status;
         }
 

package/src/module/user/controller/login.controller.ts

@@ -91,6 +91,7 @@ export class LoginController {
           googleAccessToken,
           googleRefreshToken,
           actualState,
+          name,
         );
 
         return res.send(