Merge pull request #81 from hypersign-protocol/develop

Develop

Author: varsha766

.deploy/deployment.yaml

@@ -99,6 +99,14 @@ spec:
           value: "__REDIS_HOST__"
         - name: KYC_VERIFIER_APP_BASE_URL
           value: "__KYC_VERIFIER_APP_BASE_URL__"        
+        - name: OTP_COOLDOWN_MINUTES
+          value: '__OTP_COOLDOWN_MINUTES__'
+        - name: OTP_HOURLY_LIMIT
+          value: '__OTP_HOURLY_LIMIT__'  
+        - name: OTP_EXPIRY_MINUTES
+          value: '__OTP_EXPIRY_MINUTES__'  
+        - name: MAX_RETRY_ATTEMPT
+          value: '__MAX_RETRY_ATTEMPT__'          
         volumeMounts:
         - name: mongo
           mountPath: "/data"

.github/workflows/pipeline.yaml

@@ -139,5 +139,13 @@ jobs:
       run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__GEOLOCATION_DB_PATH__#${{ secrets.GEOLOCATION_DB_PATH }}#" {} \;
     - name: "Replace Secrets"
       run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__NODE_ENV__#${{ secrets.NODE_ENV }}#" {} \;
+    - name: "Replace Secrets"
+      run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__OTP_COOLDOWN_MINUTES__#${{ secrets.OTP_COOLDOWN_MINUTES }}#" {} \;
+    - name: "Replace Secrets"
+      run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__OTP_HOURLY_LIMIT__#${{ secrets.OTP_HOURLY_LIMIT }}#" {} \;
+    - name: "Replace Secrets"
+      run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__OTP_EXPIRY_MINUTES__#${{ secrets.OTP_EXPIRY_MINUTES }}#" {} \;
+    - name: "Replace Secrets"
+      run: find .deploy/deployment.yaml -type f -exec sed  -i -e "s#__MAX_RETRY_ATTEMPT__#${{ secrets.MAX_RETRY_ATTEMPT }}#" {} \;
     - name: "Deploy to GKE"
       run: kubectl apply -f .deploy/deployment.yaml

dev.env.sample

@@ -18,7 +18,10 @@ GOOGLE_CLIENT_SECRET=
 GOOGLE_AUTH_BASE_URL=
 REDIS_HOST='localhost'
 KYC_VERIFIER_APP_BASE_URL=
-
+OTP_COOLDOWN_MINUTES=1
+OTP_HOURLY_LIMIT=10
+OTP_EXPIRY_MINUTES=5
+MAX_RETRY_ATTEMPT=3
 NODE_ENV=development
 
 

src/app-auth/app-auth.module.ts

@@ -1,4 +1,5 @@
 import {
+  forwardRef,
   MiddlewareConsumer,
   Module,
   NestModule,
@@ -31,6 +32,7 @@ import {
   AdminPeopleSchema,
 } from 'src/people/schema/people.schema';
 import { RateLimitMiddleware } from 'src/utils/middleware/rate-limit.middleware';
+import { WebpageConfigModule } from 'src/webpage-config/webpage-config.module';
 
 @Module({
   imports: [
@@ -43,6 +45,7 @@ import { RateLimitMiddleware } from 'src/utils/middleware/rate-limit.middleware'
     UserModule,
     JwtModule.register({}),
     CreditModule,
+    forwardRef(() => WebpageConfigModule),
   ],
   providers: [
     AppAuthService,
@@ -56,7 +59,7 @@ import { RateLimitMiddleware } from 'src/utils/middleware/rate-limit.middleware'
   ],
   controllers: [AppAuthController],
 
-  exports: [AppAuthService, AppRepository, AppAuthApiKeyService, AppAuthModule],
+  exports: [AppAuthService, AppRepository, AppAuthApiKeyService],
 })
 export class AppAuthModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {

src/app-auth/controllers/app-auth.controller.ts

@@ -38,6 +38,7 @@ import { AllExceptionsFilter } from '../../utils/utils';
 import { AppError, GetAppList } from '../dtos/fetch-app.dto';
 import { PaginationDto } from 'src/utils/pagination.dto';
 import { TransformResponseInterceptor } from '../interceptors/transformResponse.interseptor';
+import { UserRole } from 'src/user/schema/user.schema';
 @UseFilters(AllExceptionsFilter)
 @ApiTags('Application')
 @Controller('/api/v1/app')
@@ -77,10 +78,12 @@ export class AppAuthController {
     @Query() pageOption: PaginationDto,
   ): Promise<App[]> {
     Logger.log('getApps() method: starts', 'AppAuthController');
+    const userRole = req.user?.role ?? UserRole.ADMIN;
     const userId = req.user.userId;
     const appList: any = await this.appAuthService.getAllApps(
       userId,
       pageOption,
+      userRole,
     );
     if (appList.length === 0) {
       throw new AppNotFoundException();
@@ -198,7 +201,7 @@ export class AppAuthController {
 
     const app = await this.appAuthService.getAppById(appId, userId);
     if (app) {
-      return this.appAuthService.updateAnApp(appId, updateAppDto, userId);
+      return this.appAuthService.updateAnApp(appId, updateAppDto, req.user);
     } else throw new AppNotFoundException();
   }
 

src/app-auth/dtos/create-app.dto.ts

@@ -52,7 +52,7 @@ export class CreateAppDto {
   @IsOptional()
   @IsString()
   @MaxLength(100)
-  description: string;
+  description?: string;
   @ApiProperty({
     description: 'logoUrl',
     example: 'http://image.png',
@@ -61,7 +61,7 @@ export class CreateAppDto {
   @IsOptional()
   @IsString()
   @IsUrlEmpty()
-  logoUrl: string;
+  logoUrl?: string;
   @ApiProperty({
     description: 'services',
     example: [SERVICE_TYPES.SSI_API],
@@ -90,7 +90,7 @@ export class CreateAppDto {
   })
   @IsOptional()
   @IsArray()
-  dependentServices: Array<string>; // ids of dependent services / apps
+  dependentServices?: Array<string>; // ids of dependent services / apps
 
   @ApiProperty({
     description: 'environment',
@@ -112,7 +112,7 @@ export class CreateAppDto {
   })
   @IsOptional()
   @IsString()
-  issuerDid: string;
+  issuerDid?: string;
 
   @ApiProperty({
     description: 'issuerVerificationMethodId',
@@ -121,7 +121,7 @@ export class CreateAppDto {
   })
   @IsOptional()
   @IsString()
-  issuerVerificationMethodId: string;
+  issuerVerificationMethodId?: string;
   @ApiProperty({
     description: 'domain',
     example: 'hypersign.id',
@@ -139,7 +139,7 @@ export class CreateAppDto {
   })
   @IsOptional()
   @IsBoolean()
-  hasDomainVerified: boolean;
+  hasDomainVerified?: boolean;
 }
 
 export class DeleteAppResponse {

src/app-auth/repositories/app.repository.ts

@@ -13,7 +13,7 @@ export class AppRepository {
     private readonly supportedServices: SupportedServiceService,
   ) {}
 
-  private appDataProjectPipelineToReturn() {
+  public appDataProjectPipelineToReturn() {
     return {
       appName: 1,
       appId: 1,

src/app-auth/schemas/app.schema.ts

@@ -13,7 +13,7 @@ import { supportedServiceResponseDto } from 'src/supported-service/dto/create-su
 import { APP_ENVIRONMENT } from 'src/supported-service/services/iServiceList';
 export type AppDocument = App & Document;
 
-@Schema()
+@Schema({ timestamps: true })
 export class App {
   @ApiHideProperty()
   @Prop()
@@ -72,7 +72,7 @@ export class App {
   @IsOptional()
   @IsString()
   @Prop({ required: false })
-  description: string;
+  description?: string;
 
   @ApiProperty({
     description: 'whitelistedCors',
@@ -92,7 +92,7 @@ export class App {
   @IsString()
   @IsUrl()
   @Prop({ required: false })
-  logoUrl: string;
+  logoUrl?: string;
 
   @IsOptional()
   @IsString()
@@ -114,7 +114,7 @@ export class App {
   })
   @IsArray()
   @Prop({ required: false })
-  dependentServices: Array<string>;
+  dependentServices?: Array<string>;
 
   @IsOptional()
   @IsString()
@@ -128,7 +128,7 @@ export class App {
     required: false,
   })
   @Prop({ required: false })
-  issuerDid: string;
+  issuerDid?: string;
 
   @IsOptional()
   @IsString()
@@ -137,7 +137,7 @@ export class App {
     required: false,
   })
   @Prop({ required: false })
-  issuerVerificationMethodId: string;
+  issuerVerificationMethodId?: string;
 
   @IsOptional()
   @IsString()