Skip to content

Commit

Permalink
merge: develop to qa (#873)
Browse files Browse the repository at this point in the history 
* fix: create organisation changes and added geo-location attribute in response

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix: send email verification issue (#823)

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refactor: bulk issuance template list response changes (#824)

* refactor: updated schema response for get API

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: schema already exist logic

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: schema attribute while w3c schema creation

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: batch bulk issunace (#826)

* feat: batch bulk issuance

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* stoped queue to remove issuance data

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: added delay for 1 min

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: changed batch config

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: changed delay time for batch

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: added batch for retry

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: added common constant in libs

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: removed duplicate value from schema DTO

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: constant issue for bulk issunace (#827)

* feat: batch bulk issuance

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* stoped queue to remove issuance data

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: added delay for 1 min

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: changed batch config

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: changed delay time for batch

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: added batch for retry

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: added common constant in libs

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: removed duplicate value from schema DTO

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: constent issue

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* refactor: schema endorsement flow (#828)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs (#829)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* feature:added schema details in file_upload data and fix minor changes

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* feature:added schema details in file_upload data,fix minor exception changes and resovle PR conflict

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* feat: added schema details in  table

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* refactor: endorsement flow for key and web method (#831)

* refactor: endorsement flow for key and web method

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refactor: send email for issuance

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: prisma model issue and refactored file_upload model

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix: prisma migration issue

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix: prisma migration issue (#835)

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix: prisma migration issue

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix: parameter and response related bugs (#837)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: create organization bug

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix:rollback statistics changes

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* Fix/bugs (#839)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: create organization bug

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: imageurl issue for verification process (#840)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: create organization bug

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: made reuqest Id parameter optional (#841)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: create organization bug

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refactor: added temaplateId column in file_upload table (#842)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: create organization bug

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: pagination issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* refactor: interface types

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

---------

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>

* feat: changed issuance email template for EDUCRED

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix:refactored preview uploaded file api changed query Param to path param

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* added-logger statement

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix:Minor fixes

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* fix:removed all console logs

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* feat:refactored  api to add dynamic support to email template

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>

* feat: added holder guard

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: error message changes in user dto

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: create cloud wallet (#852)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: add validation in the user role guard (#854)

* fix: add validation in the user role guard

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* fix: modify validation in the user role guard

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* fix: modify validation and error message changes in the user role guard

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

---------

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* refactor: store holder role in user role mapping table

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: configure cloud base wallet

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* fix: remove holder guard for base wallet configure API

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: implement proof presentation for holder (#860)

* feat: accept proof request by holder API

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: holder get proof presentation and get proof presentation by id

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* refactor: changes in accept proof request and get proof request

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

---------

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* feat: Added DID creation method for cloud wallet (#861)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* resolve conflicts

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* Resolve sonar cloud issue

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: create connection for holder (#863)

* feat: connection invitaion creation

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* Merge branch 'develop' of https://github.com/credebl/platform into feat/connection-holder

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

---------

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* added cloud-wallet Dockerfile

Signed-off-by: sahil.kamble@ayanworks.com <sahil.kamble@ayanworks.com>

* feat: implement credential APIs for cloud wallet (#865)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* resolve conflicts

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: credential APIs for cloud-wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed create DID route

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed create DID route

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: Added basic message on cloud wallet (#868)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* resolve conflicts

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: credential APIs for cloud-wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed create DID route

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: changed create DID route

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* feat: added baisc message implementation in cloud wallet

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

---------

Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>

* fix: client id and client secret encrypt and decrypt

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

* fix: dcrypted the clientId and client secret

Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>

---------

Signed-off-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>
Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com>
Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>
Signed-off-by: sahil.kamble@ayanworks.com <sahil.kamble@ayanworks.com>
Signed-off-by: pranalidhanavade <pranali.dhanavade@ayanworks.com>
Co-authored-by: Ganesh Nawle <ganesh.nawle@ayanworks.com>
Co-authored-by: ganesh_nawle <155989339+ganeshawle25@users.noreply.github.com>
Co-authored-by: bhavanakarwade <137506897+bhavanakarwade@users.noreply.github.com>
Co-authored-by: tipusinghaw <126460794+tipusinghaw@users.noreply.github.com>
Co-authored-by: shitrerohit <37360542+shitrerohit@users.noreply.github.com>
Co-authored-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>
Co-authored-by: Shashank Kulkarni <44693969+KulkarniShashank@users.noreply.github.com>
Co-authored-by: sahil.kamble@ayanworks.com <sahil.kamble@ayanworks.com>
Co-authored-by: KambleSahil3 <157386770+KambleSahil3@users.noreply.github.com>
Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>
  • Loading branch information
@pranalidhanavade @ganeshawle25
@bhavanakarwade @tipusinghaw @shitrerohit @KulkarniShashank @KambleSahil3
10 people committed Sep 11, 2024
1 parent b63565d commit 52f23f3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion apps/user/src/user.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export class UserService {
throw new NotFoundException(ResponseMessages.user.error.redirectUrlNotFound);
}

sendVerificationMail = await this.sendEmailForVerification(email, verifyCode, redirectUrl, clientId, brandLogoUrl, platformName);
sendVerificationMail = await this.sendEmailForVerification(email, verifyCode, redirectUrl, decryptClientId, brandLogoUrl, platformName);
} catch (error) {
throw new InternalServerErrorException(ResponseMessages.user.error.emailSend);
}
Expand Down
3 changes: 2 additions & 1 deletion libs/common/src/response-messages/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,4 +548,5 @@ export const ResponseMessages = {
walletRecordNotFound: 'Wallet record not found.'
}
}
};
};

2 changes: 1 addition & 1 deletion libs/prisma-service/prisma/schema.prisma
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ model file_upload {
organisation organisation? @relation(fields: [orgId], references: [id])
orgId String? @db.Uuid
credential_type String?
templateId String? @db.VarChar
templateId String? @db.VarChar
}

model file_data {
Expand Down

0 comments on commit 52f23f3

Please sign in to comment.