rez_core 1.0.95 → 1.0.96

package/package.json

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

package/src/module/auth/auth.module.ts

@@ -18,11 +18,19 @@ import { RolesGuard } from './guards/role.guard';
     JwtModule.registerAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => ({
-        secret:  configService.get('SECRET_KEY'),
-        signOptions: { expiresIn: '1800s' },
-      }),
+      useFactory: async (configService: ConfigService) => {
+        const expiryInHours = parseFloat(
+          configService.get('TOKEN_EXPIRY') || '1',
+        );
+        const expiryInSeconds = expiryInHours * 60 * 60;
+
+        return {
+          secret: configService.get('SECRET_KEY'),
+          signOptions: { expiresIn: expiryInSeconds },
+        };
+      },
     }),
+
     TypeOrmModule.forFeature([UserSession]),
   ],
   providers: [

package/src/module/meta/entity/entity-table-column.entity.ts

@@ -39,6 +39,17 @@ export class EntityTableColumn extends BaseEntity {
   @Column({ name: 'data_type', nullable: true })
   data_type: string;
 
+  @Column({
+    name: 'data_source_type',
+    type: 'varchar',
+    nullable: true,
+    length: 50,
+  })
+  data_source_type: string;
+
+  @Column({ name: 'datasource_list', type: 'varchar', nullable: true })
+  datasource_list: string;
+
   @Column({ name: 'visible', nullable: true })
   visible: string;
 }

package/src/module/user/service/user-session.service.ts

@@ -2,7 +2,8 @@ import { UserSession } from '../entity/user-session.entity';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import { Injectable } from '@nestjs/common';
 import { UserSessionRepository } from '../repository/userSession.repository';
-import { JwtAuthService } from '../../../module/auth/services/jwt.service';
+import { JwtAuthService } from 'src/module/auth/services/jwt.service';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class UserSessionService {
@@ -10,6 +11,7 @@ export class UserSessionService {
     private readonly userSessionRepository: UserSessionRepository,
     private readonly jwtAuthService: JwtAuthService,
     private readonly clockIDGenService: ClockIDGenService,
+    private configService: ConfigService,
   ) {}
   async createSession(user) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
@@ -19,7 +21,10 @@ export class UserSessionService {
     userSession.session_key = sessionToken;
     userSession.is_session_loggedout = 0;
     userSession.login_time = new Date();
-    userSession.expiry_date = new Date(Date.now() + 60 * 60 * 1000); // 1-hour expiry
+    const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
+    userSession.expiry_date = new Date(
+      Date.now() + expiryTokenInHours * 60 * 60 * 1000,
+    );
 
     await this.userSessionRepository.saveSession(userSession);
 
@@ -29,7 +34,7 @@ export class UserSessionService {
     userSession.access_token = accessToken;
     await this.userSessionRepository.saveSession(userSession);
 
-    return  accessToken ;
+    return accessToken;
   }
 
   async findBySessionKey(sessionKey: string): Promise<UserSession | null> {

package/src/resources/dev.properties.yaml

@@ -14,3 +14,10 @@ OTP_EXPIRY: "10"
 OTP_LENGTH: "6"
 VERIFY_OTP: "false"
 DEFAULT_OTP: "123456"
+TOKEN_EXPIRY: 1
+# AWS:
+#   S3:
+#     AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
+#     AWS_SECRET_KEY: "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"
+#     AWS_REGION: "ap-south-1"
+#     BUCKET_NAME: "testether"

package/src/resources/uat.properties.yaml

@@ -12,4 +12,5 @@ CALLBACK_URL: "http://localhost:3000/auth/google/callback"
 OTP_EXPIRY: "10"
 OTP_LENGTH: "6"
 VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
+DEFAULT_OTP: "123456"
+TOKEN_EXPIRY: 1