Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qa to main #659

Merged
merged 380 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
380 commits
Select commit Hold shift + click to select a range
51f25a7
Merge branch 'develop' of https://github.com/credebl/platform into ke…
nishad-ayanworks Feb 28, 2024
246adf8
Added flag name
GHkrishna Feb 28, 2024
655cf1b
Remove console log
GHkrishna Feb 28, 2024
037fe30
Remove console log
GHkrishna Feb 28, 2024
d64d01d
fix: solved issue for the ledgerId restriction as a string of array
Feb 28, 2024
a0a6c8e
Merge pull request #530 from credebl/456-spinning-up-an-agent-with-do…
Sheetal-ayanworks Feb 28, 2024
bf5a752
Merge pull request #552 from credebl/fix/shared-wallet-payload
nishad-ayanworks Feb 28, 2024
8bdf391
Merge branch 'develop' of https://github.com/credebl/platform into qa
Feb 28, 2024
1c5034d
Add uuid in aws
GHkrishna Feb 28, 2024
0ba61cc
WIP register org to keycloak and map owner
nishad-ayanworks Feb 28, 2024
4a5f48e
removed unnecessary comments from client service
nishad-ayanworks Feb 28, 2024
a5c0fe7
removed unnecessary comments from common service
nishad-ayanworks Feb 28, 2024
152c470
Merge pull request #553 from credebl/refactor-common-service
KulkarniShashank Feb 28, 2024
8719985
Removed logs
GHkrishna Feb 28, 2024
c488b73
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Feb 28, 2024
07f006b
Added sortenUrl to connection
GHkrishna Feb 28, 2024
a4dd14a
fix: shorten url changes
shitrerohit Feb 28, 2024
3c1ba10
fix: reset ports in start_agent script
GHkrishna Feb 29, 2024
62d76ea
fix: uncommented helmet
GHkrishna Feb 29, 2024
aa01c00
Removed comments from connection service
GHkrishna Feb 29, 2024
cc56c0c
fix: datatype for invitation variable in connection service
GHkrishna Feb 29, 2024
2d81937
fix: remove comments from interface
GHkrishna Feb 29, 2024
f1e3ec5
fix: minute fixes in connection service
GHkrishna Feb 29, 2024
0da8a39
fix: remove unused Interface
GHkrishna Feb 29, 2024
0ce9da5
fix: logging error correctly using contructor object
GHkrishna Feb 29, 2024
3c14fca
fix: logging error correctly using contructor object
GHkrishna Feb 29, 2024
245b0fb
fix: updated object storing in verification
GHkrishna Feb 29, 2024
724e85d
fix: remove unnecessary interfaces
GHkrishna Feb 29, 2024
a31523c
fix: remove unnecessary interfaces
GHkrishna Feb 29, 2024
202dd75
fix: minor fixes in verification service
GHkrishna Feb 29, 2024
bb2c4b9
added the dockerfile for the notification service
Feb 29, 2024
7f6b6af
added the notification nkey on the main and notification module
Feb 29, 2024
e08c787
fix sonar cloud issues on the notification dockerfile
Feb 29, 2024
b37e4c8
Merge pull request #556 from credebl/fix/notification-dockerfile
nishad-ayanworks Feb 29, 2024
d8ee72f
Update: success message after storing object
GHkrishna Feb 29, 2024
4737b19
Update: Dto update
GHkrishna Feb 29, 2024
d2e0de9
fix:ecosystem error messages for endorsement flow
pranalidhanavade Feb 29, 2024
3b623b6
Merge branch 'develop' of https://github.com/credebl/platform into ec…
pranalidhanavade Feb 29, 2024
9d8d4cb
Update: function name for sonar linting issue
GHkrishna Feb 29, 2024
4bad987
Merge pull request #557 from credebl/ecosystem-error-handling-from-ap…
KulkarniShashank Feb 29, 2024
92dcd3a
fix: dto comments
GHkrishna Feb 29, 2024
7e36041
feat: add W3C credential issuance (#555)
pallavighule Feb 29, 2024
1d0ccc4
Merge branch 'develop' of https://github.com/credebl/platform into de…
bhavanakarwade Feb 29, 2024
6f29f91
Merge branch 'develop' of https://github.com/credebl/platform into fe…
shitrerohit Feb 29, 2024
7dce1a4
Merge branch 'feat/url-shortening' of https://github.com/credebl/plat…
shitrerohit Feb 29, 2024
97cbddf
Merge pull request #558 from credebl/develop
KulkarniShashank Feb 29, 2024
d14a8f5
refactored role guard, worked on the API to register clients and map …
nishad-ayanworks Feb 29, 2024
1169733
Merge branch 'develop' of https://github.com/credebl/platform into ke…
nishad-ayanworks Feb 29, 2024
a60ed63
fix: resolved ecosystem invitation self accepted by ecosystem lead bug
bhavanakarwade Feb 29, 2024
2192458
Merge pull request #560 from credebl/ecosystem-role-access
vivekayanworks Feb 29, 2024
e246cb5
fix: shorten url changes for issue cred OOB on send email- WIP
shitrerohit Feb 29, 2024
04b7943
Merge branch 'develop' of https://github.com/credebl/platform into fe…
shitrerohit Feb 29, 2024
10e8385
fix:resolved isRequired issue
shitrerohit Mar 1, 2024
6f7ba0f
refactor register user for org roles in DB
nishad-ayanworks Mar 1, 2024
19f9dcc
fix: ledger id validations
bhavanakarwade Mar 1, 2024
4f20455
Merge pull request #561 from credebl/agent-ledger-id
KulkarniShashank Mar 1, 2024
2b2ae72
fixed the forgot password for old supabase user
nishad-ayanworks Mar 1, 2024
025645d
Merge branch 'develop' of https://github.com/credebl/platform into qa
bhavanakarwade Mar 1, 2024
adb13a0
Merge pull request #563 from credebl/fix-forgot-password-supauser
nishad-ayanworks Mar 1, 2024
37dad8f
Merge branch 'develop' of https://github.com/credebl/platform into qa
bhavanakarwade Mar 1, 2024
e5f7289
fix: solved the bulk issuance flow and function separation in bulk is…
Mar 4, 2024
3b04d61
Added the bin bash in shell script
Mar 4, 2024
2dc813c
feat:added presentationExchange proof verification format (#564)
pallavighule Mar 4, 2024
24897e2
fix:removed multiple promise all from issuance flow.
shitrerohit Mar 4, 2024
2c8f73b
Merge branch 'develop' of https://github.com/credebl/platform into fi…
shitrerohit Mar 4, 2024
bcb42b4
Merge pull request #565 from credebl/fix/bulk-issuance
KulkarniShashank Mar 5, 2024
214dd2b
worked on the client & user login credential message, worked on the e…
nishad-ayanworks Mar 5, 2024
70a7526
Merge branch 'develop' of https://github.com/credebl/platform into de…
nishad-ayanworks Mar 5, 2024
407b081
Initial changes to send email
GHkrishna Mar 5, 2024
d4189d3
Initial changes to send email
GHkrishna Mar 5, 2024
e2d0ebb
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 5, 2024
8beae7e
fix imageurl field bug
bhavanakarwade Mar 5, 2024
b85a5ad
refactor API endpoint name
nishad-ayanworks Mar 5, 2024
103bc39
Merge pull request #568 from credebl/fix-org-service-issues
nishad-ayanworks Mar 5, 2024
ce256bc
resolved comments
bhavanakarwade Mar 5, 2024
5211ac3
Merge branch 'develop' of https://github.com/credebl/platform into fi…
bhavanakarwade Mar 5, 2024
4cb0edf
refactor and fix the issuance return data on the OOB functionality
Mar 5, 2024
1a5b090
veriable name changes on the oob function
Mar 5, 2024
e3146df
Merge pull request #570 from credebl/fix/bulk-oob-issuance
KulkarniShashank Mar 5, 2024
cc687de
feat:env variable changes for platform white labeling task
pranalidhanavade Mar 5, 2024
f2719bd
Merge branch 'develop' of https://github.com/credebl/platform into 56…
pranalidhanavade Mar 5, 2024
75b631d
feat:env variable changes for platform white labeling task
pranalidhanavade Mar 5, 2024
584198b
Merge branch 'develop' of https://github.com/credebl/platform into ke…
nishad-ayanworks Mar 6, 2024
e399881
develop to qa
Mar 6, 2024
9726f6c
feat:changes in platform to get dynamic values from .env file
pranalidhanavade Mar 6, 2024
23a926b
feat: email functionality via oob email
GHkrishna Mar 6, 2024
3188500
Merge pull request #576 from credebl/develop-to-qa
KulkarniShashank Mar 6, 2024
3cc2e4a
remove logs
GHkrishna Mar 6, 2024
198103c
fix: logging
GHkrishna Mar 6, 2024
110029a
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 6, 2024
2689d80
feat:changes in env sample file
pranalidhanavade Mar 6, 2024
b666d97
renamed the variable in organization repository
nishad-ayanworks Mar 6, 2024
9422d15
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 6, 2024
f9df244
Merge pull request #559 from credebl/keycloak-user-role-org-map
vivekayanworks Mar 6, 2024
3a021f8
feat:changes in common constant file for white labeling
pranalidhanavade Mar 6, 2024
74a73fa
Merge branch 'develop' of https://github.com/credebl/platform into 56…
pranalidhanavade Mar 6, 2024
ca301a6
Merge pull request #571 from credebl/566-make-credebl-white-label-bac…
vivekayanworks Mar 6, 2024
c804839
Merge pull request #569 from credebl/fix/oob-verification-imageurl
bhavanakarwade Mar 7, 2024
82749cf
feat:change sin env sample file for white labelling changes
pranalidhanavade Mar 7, 2024
5900804
Merge branch 'develop' of https://github.com/credebl/platform into 56…
pranalidhanavade Mar 7, 2024
661b3fd
Minor changes to issuance and verification for shortening url
GHkrishna Mar 7, 2024
a293e7c
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 7, 2024
7f0f0e0
Change default version for w3c credential to v2
GHkrishna Mar 7, 2024
7f3458c
fix: protocol versionining
GHkrishna Mar 7, 2024
28e6b62
fix: linting issues
GHkrishna Mar 7, 2024
0f1bced
fix: solved the endosement credential definition
Mar 7, 2024
0a366e9
fix: sonar lint issue of code repeatibility
GHkrishna Mar 7, 2024
dd074f1
fix: sonar lint issue of code repeatibility in Issuance
GHkrishna Mar 7, 2024
e240ecb
Replace the findFirst to findUnique query on the ecosystem
Mar 7, 2024
878cb50
fix: remove comments & unused code
GHkrishna Mar 7, 2024
67ef599
Solved the organization name updation on the email issuance
Mar 7, 2024
f340df1
Merge pull request #581 from credebl/fix/endorsement-cred-def
KulkarniShashank Mar 7, 2024
ea17250
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 7, 2024
13ed45b
fixed the schema cred def for the user id
nishad-ayanworks Mar 7, 2024
36ee7c9
Merge pull request #582 from credebl/fix-schema-credef
vivekayanworks Mar 7, 2024
7451448
fix: connection list from agent (#578)
tipusinghaw Mar 8, 2024
b4378a0
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 8, 2024
e865efe
fix: spelling mistake
GHkrishna Mar 8, 2024
e36d3c7
fix: error handling
GHkrishna Mar 8, 2024
881b7e4
Merge pull request #580 from credebl/feat/url-shortening
GHkrishna Mar 8, 2024
d9388e0
fix: remove unnecessary logs
GHkrishna Mar 8, 2024
d58e060
Merge pull request #583 from credebl/fix/remove-logs
KulkarniShashank Mar 8, 2024
4d4d9e6
Merge pull request #579 from credebl/566-make-credebl-white-label-bac…
pranalidhanavade Mar 8, 2024
4abc601
handled the resourse access condition in org role guard
nishad-ayanworks Mar 8, 2024
b10cfcf
Included UserAccessGuard to create and get organizations
nishad-ayanworks Mar 8, 2024
cd36a40
cosmetic changes
nishad-ayanworks Mar 8, 2024
faf76e3
Merge pull request #584 from credebl/keycloak-user-role-org-map
nishad-ayanworks Mar 8, 2024
874243c
Merge pull request #585 from credebl/develop
vivekayanworks Mar 8, 2024
52af275
refactor client scopes of keycloak
nishad-ayanworks Mar 11, 2024
5ae9b35
Merge pull request #587 from credebl/refactor-client-scopes
nishad-ayanworks Mar 11, 2024
afc2300
refactor client scopes of keycloak
nishad-ayanworks Mar 11, 2024
52fbd1a
Merge pull request #588 from credebl/refactor-client-scopes
nishad-ayanworks Mar 11, 2024
6172c30
fix: handled csv file exception
pranalidhanavade Mar 12, 2024
e41c2e9
Merge pull request #591 from credebl/issues-from-api-side
pranalidhanavade Mar 12, 2024
814f953
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 12, 2024
d656c91
Merge pull request #590 from credebl/develop
KulkarniShashank Mar 12, 2024
996808e
refactor: agent token encryption
Mar 12, 2024
bbc5757
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 12, 2024
adbb71d
feat: support multiple did methods (#589)
bhavanakarwade Mar 12, 2024
8e8e1cc
Add shortening url for email verification
GHkrishna Mar 12, 2024
1d77762
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 13, 2024
65fff22
fix: refactored tables
bhavanakarwade Mar 13, 2024
c0c0b34
fix: reafctored json data
bhavanakarwade Mar 13, 2024
0bc4525
feat:add reuse connection
pallavighule Mar 13, 2024
b214445
Merge branch 'develop' of https://github.com/credebl/platform into fe…
pallavighule Mar 13, 2024
fc60add
fix: refactored tables (#592)
bhavanakarwade Mar 13, 2024
9d7074e
fix:changed validation message
pallavighule Mar 13, 2024
888b281
Merge branch 'develop' of https://github.com/credebl/platform into fe…
pallavighule Mar 13, 2024
573cb71
worked on the POST API of refresh token
nishad-ayanworks Mar 13, 2024
79d7ae1
Merge pull request #593 from credebl/feat-reuseConnection
pallavighule Mar 13, 2024
8f106ca
fix: an incorrect message appears when delete the ecosystem invitatio…
pranalidhanavade Mar 13, 2024
9005dbe
Merge branch 'develop' of https://github.com/credebl/platform into is…
pranalidhanavade Mar 13, 2024
d2f29eb
fix: added the token validation with encryption on the wallet and DID
Mar 14, 2024
58bbd1f
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 14, 2024
b0c1634
fix: schema id validations
bhavanakarwade Mar 14, 2024
67b2e6a
Merge pull request #597 from credebl/fix/backend-bugs
bhavanakarwade Mar 14, 2024
ad3c673
Merge pull request #595 from credebl/issues-from-api-side
pranalidhanavade Mar 14, 2024
3ffc8e1
Merge branch 'develop' of https://github.com/credebl/platform into fe…
bhavanakarwade Mar 14, 2024
ccf9728
Merge pull request #594 from credebl/auth-refresh-token
nishad-ayanworks Mar 14, 2024
c3e1215
feat: dedicated agent spin up
bhavanakarwade Mar 15, 2024
a5eaab6
Merge branch 'develop' of https://github.com/credebl/platform into fe…
bhavanakarwade Mar 15, 2024
cbcdf55
Merge pull request #598 from credebl/feat/multiple-did-methods
KulkarniShashank Mar 15, 2024
8452098
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 15, 2024
be68d50
fix: solved the platform-admin agent spin-up
Mar 15, 2024
7ecb19b
fix: schema validation
bhavanakarwade Mar 15, 2024
ecfcfce
fix: schema validations
bhavanakarwade Mar 15, 2024
b407154
Merge pull request #599 from credebl/fix/validation-schema
bhavanakarwade Mar 15, 2024
97daf1a
feat: added w3c schema
tipusinghaw Mar 18, 2024
941d63e
Merge branch 'develop' of https://github.com/credebl/platform into W3…
tipusinghaw Mar 18, 2024
143e8d9
feat: added interface
tipusinghaw Mar 18, 2024
a495d9a
fix: schema dto
tipusinghaw Mar 18, 2024
5340e31
fix: sonar cloud issue
tipusinghaw Mar 18, 2024
aa377f7
fix: changed the interface of create schema
tipusinghaw Mar 18, 2024
101a38b
fix: multiple error messages
tipusinghaw Mar 19, 2024
fa4b316
fix: solved the duplication code
Mar 19, 2024
0fd36cd
Develop To QA (#602)
nishad-ayanworks Mar 19, 2024
b7386ec
fix: removed unnecessary import
Mar 19, 2024
ff0f419
fix: removed duplicated code
Mar 19, 2024
9f88539
fix: removed duplicated code
Mar 19, 2024
781bdc1
fix: removed duplicated code
Mar 19, 2024
de4170c
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 19, 2024
fe284a2
feat: implementation of DID document for did web method (#601)
bhavanakarwade Mar 19, 2024
bfddf5a
Merge branch 'develop' of https://github.com/credebl/platform into fe…
GHkrishna Mar 19, 2024
5fbdcfa
make array size dynamic
GHkrishna Mar 19, 2024
09f1b45
Merge pull request #577 from credebl/feat/send-email-oob-verification
GHkrishna Mar 20, 2024
d5588c7
fix: solved the sonar lint issues
Mar 20, 2024
e361cb6
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 20, 2024
3078b86
fix: solved the sonar lint issues
Mar 20, 2024
613c860
Solved verification interface issue
Mar 20, 2024
b352306
restricted client access to update org and create client credentials
nishad-ayanworks Mar 20, 2024
f5492da
fix: bug fixes
bhavanakarwade Mar 20, 2024
6470505
Merge branch 'develop' of https://github.com/credebl/platform into fi…
bhavanakarwade Mar 20, 2024
72dc53a
Merge pull request #605 from credebl/fix-client-access
nishad-ayanworks Mar 20, 2024
e926e5c
fix: resolved sonarlint issues
bhavanakarwade Mar 20, 2024
c440b4a
Merge branch 'develop' of https://github.com/credebl/platform into fi…
bhavanakarwade Mar 20, 2024
16a5571
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 21, 2024
48fce00
Merge pull request #596 from credebl/agent-token-encryption
KulkarniShashank Mar 21, 2024
eee6d2d
Merge branch 'develop' of https://github.com/credebl/platform into ag…
Mar 21, 2024
cb57d11
Added the dotenv config package on the common-service
Mar 21, 2024
c1b7a54
Merge pull request #607 from credebl/agent-token-encryption
KulkarniShashank Mar 21, 2024
dd1de6b
fix: solved issue for oob verification with email
Mar 21, 2024
75acf35
Merge branch 'develop' of https://github.com/credebl/platform into fi…
bhavanakarwade Mar 26, 2024
1059205
Merge pull request #608 from credebl/verification-oob-issue
KulkarniShashank Mar 26, 2024
649415c
fix: modified interface name
bhavanakarwade Mar 26, 2024
0f5c29c
Merge branch 'develop' of https://github.com/credebl/platform into fi…
bhavanakarwade Mar 26, 2024
71fb618
fix: applied validations
bhavanakarwade Mar 27, 2024
0f6b6b8
Merge branch 'feat/multiple-did-methods' of https://github.com/credeb…
bhavanakarwade Mar 27, 2024
c9132be
Merge pull request #606 from credebl/fix/backend-bugs
bhavanakarwade Mar 27, 2024
4954b41
Merge branch 'develop' of https://github.com/credebl/platform into W3…
tipusinghaw Mar 27, 2024
9b1b876
refactor: changed API key fetching logic
tipusinghaw Mar 27, 2024
54ede5e
fix: web didDoc updation in database (#617)
KulkarniShashank Mar 27, 2024
0d5adcc
Merge branch 'develop' of https://github.com/credebl/platform into de…
Mar 27, 2024
2a88d5f
remove space in common service
Mar 27, 2024
48f9f0c
fix: resolved the conflicts
Mar 27, 2024
fa546f0
Develop to qa (#618)
KulkarniShashank Mar 27, 2024
25646c3
feat: adeya app changes for white labelling
pranalidhanavade Mar 27, 2024
d6aa579
feat: play store and app store links from .env file
pranalidhanavade Mar 27, 2024
fb3403f
Merge pull request #619 from credebl/white-labelling-changes-for-adey…
vivekayanworks Mar 27, 2024
3212ad8
fix: logger issue
tipusinghaw Mar 28, 2024
03fccc4
Merge branch 'develop' of https://github.com/credebl/platform into W3…
tipusinghaw Mar 28, 2024
02e9d0f
feat: Added W3C-schema API (#600)
tipusinghaw Mar 28, 2024
4132ad0
fix: private key length validations
bhavanakarwade Mar 28, 2024
88c1476
fix: refactored validate did function
bhavanakarwade Mar 28, 2024
f1eb1f4
Merge pull request #620 from credebl/feat/multiple-did-methods
bhavanakarwade Mar 29, 2024
1eda142
feat: out-of-band connection invitation (#623)
KulkarniShashank Mar 29, 2024
32ae2fa
Merge branch develop of https://github.com/credebl/platform into W3C-…
tipusinghaw Apr 2, 2024
926ccc1
Merge branch 'develop' of https://github.com/credebl/platform into de…
Apr 4, 2024
56f97b7
Merge branch 'qa' of https://github.com/credebl/platform into develop…
Apr 4, 2024
b6e651d
Solved sonarlint issues
Apr 4, 2024
65f9412
Merge pull request #626 from credebl/develop-to-qa
KulkarniShashank Apr 4, 2024
d0d6c1d
feat: W3C schema builder
tipusinghaw Apr 4, 2024
de7c220
fix: import common constants in schema service
Apr 4, 2024
7474a2c
fix: import common constants in schema service (#628)
KulkarniShashank Apr 4, 2024
8668a05
fix: required message
tipusinghaw Apr 5, 2024
f075cf4
refactor: Added error handling for schema builder
tipusinghaw Apr 5, 2024
873e02a
feat: implemented W3C schema builder (#627)
tipusinghaw Apr 5, 2024
b8f09d7
fix: schema name in schema builder
tipusinghaw Apr 5, 2024
55d3d37
Merge branch 'develop' of https://github.com/credebl/platform into W3…
tipusinghaw Apr 5, 2024
99f60a5
fix: change schema name in schema builder (#644)
tipusinghaw Apr 5, 2024
247f503
fix: email template for oob verification
GHkrishna Apr 10, 2024
2478f54
Merge pull request #649 from credebl/fix/oob-verification-email-link
GHkrishna Apr 10, 2024
e8d9d1f
fix: incorrect error message
GHkrishna Apr 11, 2024
a2c704b
Merge branch 'develop' of https://github.com/credebl/platform into W3…
tipusinghaw Apr 11, 2024
5199c86
fix: added example in w3c schema DTO
tipusinghaw Apr 11, 2024
32dbf69
Merge pull request #650 from credebl/W3C-schema
bhavanakarwade Apr 11, 2024
f1582e4
Merge pull request #651 from credebl/bug-fixes
KulkarniShashank Apr 11, 2024
18d9151
Merge branch 'develop' of https://github.com/credebl/platform into de…
bhavanakarwade Apr 11, 2024
b101f4a
Merge branch 'develop-to-qa' of https://github.com/credebl/platform i…
bhavanakarwade Apr 11, 2024
baa1f12
Merge pull request #652 from credebl/develop-to-qa
bhavanakarwade Apr 11, 2024
b2e5e1d
Merge branch 'main' of https://github.com/credebl/platform into qa-to…
tipusinghaw Apr 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
MODE=DEV


SUPABASE_URL= // Please specify your Supabase Url
SUPABASE_URL= // Please specify your Supabase URL
SUPABASE_KEY= // Please specify your Supabase Anon key
SUPABASE_JWT_SECRET= // Please specify your Supabase jwt secret

API_GATEWAY_PROTOCOL=http
API_GATEWAY_HOST='0.0.0.0'
API_GATEWAY_PORT=5000

PLATFORM_NAME=CREDEBL
##
PLATFORM_NAME= // Please specify your paltform name
PUBLIC_PLATFORM_SUPPORT_EMAIL= // Please specify your support email
POWERED_BY= // Please specify your powered by org name
PLATFORM_WEB_URL= // Please specify your platform web URL
POWERED_BY_URL= // Please specify your support URL

PUBLIC_LOCALHOST_URL= // Please specify your localhost URL
PUBLIC_DEV_API_URL= // Please specify your DEV environment api URL
PUBLIC_QA_API_URL= // Please specify your your QA environment api URL
PUBLIC_PRODUCTION_API_URL= // Please specify your PRODUCTION environment api URL
PUBLIC_SANDBOX_API_URL= // Please specify your sandbox environment URL


[email protected] // Please specify your agent host VM and IP address
AWS_ACCOUNT_ID=xxxxx // Please provide your AWS account Id
Expand Down Expand Up @@ -47,8 +58,8 @@ PLATFORM_SEED= // The seed should consist of 32 characters.
PLATFORM_ID=

AFJ_AGENT_ENDPOINT_PATH=/apps/agent-provisioning/AFJ/endpoints/
DATABASE_URL="postgresql://postgres:xxxxxx@localhost:5432/postgres?schema=public" #Provide supabase postgres url and Use the correct user/pwd, IP Address
POOL_DATABASE_URL="" #Provide pooler supabase postgres url
DATABASE_URL="postgresql://postgres:xxxxxx@localhost:5432/postgres?schema=public" #Provide supabase postgres URL and Use the correct user/pwd, IP Address
POOL_DATABASE_URL="" #Provide pooler supabase postgres URL
CLUSTER_NAME="" # ecs cluster
TESKDEFINITION_FAMILY="" # ecs task-definition
AGENT_PROTOCOL=http
Expand All @@ -68,4 +79,11 @@ export DEBUG="prisma:engine"
export DEBUG="prisma:client"

# enable both prisma-client- and engine-level debugging output
export DEBUG="prisma:client,prisma:engine"
export DEBUG="prisma:client,prisma:engine"

KEYCLOAK_DOMAIN=http://localhost:8080/
KEYCLOAK_ADMIN_URL=http://localhost:8080
KEYCLOAK_MASTER_REALM=xxxxxxx
KEYCLOAK_MANAGEMENT_CLIENT_ID=xxxxxxx
KEYCLOAK_MANAGEMENT_CLIENT_SECRET=xxxxxxx
KEYCLOAK_REALM=xxxxxxx
40 changes: 30 additions & 10 deletions Dockerfiles/Dockerfile.agent-provisioning
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,23 @@ USER nonroot


# RUN apk add aws-cli
RUN npm install --ignore-scripts -g pnpm \
&& apk update \
&& apk add openssh-client \
&& apk add aws-cli
RUN set -eux \
&& apk --no-cache add \
openssh-client \
aws-cli \
docker \
docker-compose \
&& npm install -g pnpm --ignore-scripts \
&& export PATH=$PATH:/usr/lib/node_modules/pnpm/bin \
&& rm -rf /var/cache/apk/*

RUN docker --version && \
docker-compose --version

ARG ROOT_PATH
ENV ROOT_PATH ${ROOT_PATH}

RUN echo "ROOT_PATH is set to: $ROOT_PATH"

# Set the working directory
WORKDIR /app
Expand Down Expand Up @@ -39,10 +52,15 @@ RUN addgroup -S nonroot \

USER nonroot
# RUN apk add aws-cli
RUN npm install --ignore-scripts -g pnpm \
&& apk update \
&& apk add openssh-client \
&& apk add aws-cli
RUN set -eux \
&& apk --no-cache add \
openssh-client \
aws-cli \
docker \
docker-compose \
&& npm install -g pnpm --ignore-scripts \
&& export PATH=$PATH:/usr/lib/node_modules/pnpm/bin \
&& rm -rf /var/cache/apk/*

WORKDIR /app

Expand All @@ -51,6 +69,7 @@ RUN mkdir -p ./agent-provisioning/AFJ/agent-config
RUN mkdir -p ./agent-provisioning/AFJ/port-file
RUN mkdir -p ./agent-provisioning/AFJ/token


# Copy the compiled code
COPY --from=build /app/dist/apps/agent-provisioning/ ./dist/apps/agent-provisioning/
COPY --from=build /app/node_modules ./node_modules
Expand All @@ -60,15 +79,16 @@ COPY --from=build /app/apps/agent-provisioning/AFJ/port-file ./agent-provisionin
# Set permissions
RUN chmod +x /app/agent-provisioning/AFJ/scripts/start_agent.sh
RUN chmod +x /app/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
RUN chmod +x /app/agent-provisioning/AFJ/scripts/docker_start_agent.sh
RUN chmod 777 /app/agent-provisioning/AFJ/endpoints
RUN chmod 777 /app/agent-provisioning/AFJ/agent-config
RUN chmod 777 /app/agent-provisioning/AFJ/token

# Copy the libs folder
COPY libs/ ./libs/

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/agent-provisioning/main.js"]

CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/agent-provisioning/main.js $ROOT_PATH"]

# docker build -t agent-provisioning-service -f Dockerfiles/Dockerfile.agent-provisioning .
# docker run -d --env-file .env --name agent-provisioning-service docker.io/library/agent-provisioning-service
25 changes: 16 additions & 9 deletions Dockerfiles/Dockerfile.agent-service
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Stage 1: Build the application
FROM node:18-alpine as build

RUN addgroup -S nonroot \
&& adduser -S nonroot -G nonroot

USER nonroot
RUN npm install --ignore-scripts -g pnpm
RUN npm install -g pnpm --ignore-scripts \
&& apk update \
&& apk add openssh-client \
&& apk add aws-cli \
&& apk add docker \
&& apk add docker-compose

RUN npm install -g pnpm
# Set the working directory
WORKDIR /app

Expand All @@ -25,11 +28,15 @@ RUN pnpm run build agent-service
# Stage 2: Create the final image
FROM node:18-alpine

RUN addgroup -S nonroot \
&& adduser -S nonroot -G nonroot
RUN npm install -g pnpm --ignore-scripts \
&& apk update \
&& apk add openssh-client \
&& apk add aws-cli \
&& apk add docker \
&& apk add docker-compose

USER nonroot
RUN npm install --ignore-scripts -g pnpm
RUN npm install -g pnpm
# Set the working directory
WORKDIR /app

# Copy the compiled code from the build stage
Expand Down
41 changes: 41 additions & 0 deletions Dockerfiles/Dockerfile.notification
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Stage 1: Build the application
FROM node:18-alpine as build
RUN npm install -g pnpm --ignore-scripts
# Set the working directory
WORKDIR /app

# Copy package.json and package-lock.json
COPY package.json ./
#COPY package-lock.json ./

# Install dependencies
RUN pnpm i --ignore-scripts

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate

# Build the notification service
RUN npm run build notification


# Stage 2: Create the final image
FROM node:18-alpine
RUN npm install -g pnpm --ignore-scripts
# Set the working directory
WORKDIR /app

# Copy the compiled code from the build stage
COPY --from=build /app/dist/apps/notification/ ./dist/apps/notification/

# Copy the libs folder from the build stage
COPY --from=build /app/libs/ ./libs/
#COPY --from=build /app/package.json ./
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/notification/main.js"]

# docker build -t notification -f Dockerfiles/Dockerfile.notification .
# docker run -d --env-file .env --name notification docker.io/library/notification
# docker logs -f notification
4 changes: 3 additions & 1 deletion Dockerfiles/Dockerfile.user
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN npm install --ignore-scripts -g pnpm

# We don't need the standalone Chromium
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
ENV PUPPETEER_SKIP_DOWNLOAD true

# Install Google Chrome Stable and fonts
# Note: this installs the necessary libs to make the browser work with Puppeteer.
Expand Down Expand Up @@ -46,6 +47,7 @@ USER nonroot
RUN npm install --ignore-scripts -g pnpm
# We don't need the standalone Chromium
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
ENV PUPPETEER_SKIP_DOWNLOAD true

# Install Google Chrome Stable and fonts
# Note: this installs the necessary libs to make the browser work with Puppeteer.
Expand Down Expand Up @@ -74,4 +76,4 @@ CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx pri

# docker build -t user -f Dockerfiles/Dockerfile.user .
# docker run -d --env-file .env --name user docker.io/library/user
# docker logs -f user
# docker logs -f user
Loading
Loading