rez_core 2.2.218 → 2.2.220

package/package.json

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

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

@@ -14,7 +14,6 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
         'openid',
         'email',
         'profile',
-        'https://www.googleapis.com/auth/gmail.send',
       ],
       accessType: 'offline', // good: gets refresh_token on first consent
       includeGrantedScopes: true, // optional, keeps prior grants

package/src/module/enterprise/entity/organization.entity.ts

@@ -87,6 +87,6 @@ export class OrganizationData {
   @Column({ name: 'wbs_code', nullable: true })
   wbs_code: string;
 
-  @Column({ name: 'subdomain', nullable: true })
-  subdomain: string;
+  @Column({ name: 'slug', nullable: true })
+  slug: string;
 }

package/src/module/enterprise/repository/organization.repository.ts

@@ -20,7 +20,7 @@ export class OrganizationRepository {
     subdomain: string,
   ): Promise<OrganizationData | null> {
     return await this.organizationRepository.findOne({
-      where: { subdomain },
+      where: { slug: subdomain },
     });
   }
 }

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

@@ -72,4 +72,7 @@ export class EntityMaster extends BaseEntity {
 
   @Column({ name: 'data_source', nullable: true })
   data_source: string;
+
+  @Column({ name: 'show_workflow', nullable: true })
+  show_workflow: boolean;
 }

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

@@ -158,7 +158,7 @@ export class LoginController {
     const { accessToken, appcode } = data;
     if (profile && profile === 'dev') {
       return res.redirect(
-        `${this.configService.get('FE_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
+        `${this.configService.get('DOMAIN_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
       );
     } else {
       if (data.slug) {
@@ -169,7 +169,7 @@ export class LoginController {
     }
 
     return res.redirect(
-      `${this.configService.get('BASE_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
+      `${this.configService.get('DOMAIN_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
     );
   }
 

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

@@ -186,7 +186,7 @@ export class LoginService {
     );
     let slug: string;
     if (org) {
-      slug = org.subdomain;
+      slug = org.slug;
     } else {
       throw new BadRequestException();
     }

package/src/resources/dev.properties.yaml

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