rez_core 2.2.151 → 2.2.152

package/package.json

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

package/src/module/auth/strategies/google.strategy.ts

@@ -1,21 +1,31 @@
 import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
   constructor(private configService: ConfigService) {
     super({
-      clientID: configService.get('CLIENT_ID'),
-      clientSecret: configService.get('CLIENT_SECRET'),
-      callbackURL: configService.get('CALLBACK_URL'),
+      clientID: configService.get<string>('CLIENT_ID')!,
+      clientSecret: configService.get<string>('CLIENT_SECRET')!,
+      callbackURL: configService.get<string>('CALLBACK_URL')!,
       scope: ['openid', 'email', 'profile'],
-      accessType: 'offline',
-      prompt: 'consent',
+      accessType: 'offline', // good: gets refresh_token on first consent
+      includeGrantedScopes: true, // optional, keeps prior grants
+      // ⛔️ don't rely on 'prompt' here; add via authorizationParams()
     });
   }
 
+  // ✅ Guarantees account chooser every time
+  authorizationParams(): Record<string, string> {
+    return {
+      prompt: 'select_account', // or 'consent select_account' if you want re-consent too
+      // login_hint: 'user@domain.com',    // optional
+      // hd: 'your-domain.com',            // optional: restrict to a Google Workspace domain
+    };
+  }
+
   async validate(
     accessToken: string,
     refreshToken: string,
@@ -29,7 +39,6 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
       displayName: profile.displayName ?? '',
     };
 
-    // attach what you need; do not persist here if you follow clean patterns
     return done(null, {
       email,
       name,

package/src/module/meta/entity/entity-master.entity.ts

@@ -61,5 +61,9 @@ export class EntityMaster extends BaseEntity {
   @Column({ name: 'storage_type', nullable: true, length: 20 })
   storage_type: string;
 
+  @Column({ name: 'show_in_entity_list', nullable: true, length: 20 })
+  show_in_entity_list: string;
 
+  @Column({ name: 'code_entry', nullable: true, length: 20 })
+  code_entry: string;
 }

package/src/resources/dev.properties.yaml

@@ -7,9 +7,9 @@ DB_NAME: 'package_core'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'
-CLIENT_ID: '324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com'
-CLIENT_SECRET: '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'
-CALLBACK_URL: 'http://localhost:3000/auth/google/callback'
+CLIENT_ID: '819281384645-2tnuvm80sul1n2ahqa4eg6kjd19pnbu9.apps.googleusercontent.com'
+CLIENT_SECRET: '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'
+CALLBACK_URL: 'http://localhost:5001/auth/google/callback'
 OTP_EXPIRY: '10'
 OTP_LENGTH: '6'
 VERIFY_OTP: 'false'