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

Staging #486

Merged
merged 123 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
fd3d2f1
user service documentation
adithyadinesh0412 Feb 20, 2024
dbe7425
user service documentation - correction
adithyadinesh0412 Feb 20, 2024
5f2a56e
event issue in updating the extensions of the users
adithyadinesh0412 Feb 26, 2024
7629a2e
removed documentation related changes
adithyadinesh0412 Feb 26, 2024
91a2dfa
Merge branch 'develop' of https://github.com/ELEVATE-Project/user int…
adithyadinesh0412 Feb 27, 2024
9c9f479
event issue in updating the extensions of the users
adithyadinesh0412 Mar 11, 2024
7ad1ae2
fixed an issue with index.js
nevil-mathew Mar 13, 2024
cb75f8d
review comments
adithyadinesh0412 Mar 13, 2024
ac85fd2
Merge pull request #436 from adithyadinesh0412/working-branch
joffinjoy Mar 14, 2024
66fe8b6
related organization fix
adithyadinesh0412 Mar 15, 2024
76ca18c
Merge pull request #439 from adithyadinesh0412/working-branch
joffinjoy Mar 15, 2024
05f40f0
2.5 Setup Docs Added
joffinjoy Mar 15, 2024
802c556
Added Setup Guide To README
joffinjoy Mar 15, 2024
c5d2255
Username Enumeration - generateOtp
adithyadinesh0412 Mar 18, 2024
57b1079
story-1155 security fix
VISHNUDAS-tunerlabs Mar 18, 2024
0bc40b1
Merge pull request #442 from adithyadinesh0412/security_fixes
aks30 Mar 18, 2024
ba97360
Merge pull request #443 from ELEVATE-Project/story-1155
aks30 Mar 19, 2024
195eb24
Audit Bug - 1148 , 1152 , 1153
sumanvpacewisdom Mar 19, 2024
c53e62b
Merge pull request #440 from ELEVATE-Project/doc-2.5
joffinjoy Mar 19, 2024
861c2a0
1142 -security fix, downloadableUrl API
VISHNUDAS-tunerlabs Mar 19, 2024
0e825a0
package version updated
VISHNUDAS-tunerlabs Mar 19, 2024
b9fb488
Merge branch 'staging' into develop
VISHNUDAS-tunerlabs Mar 19, 2024
cf1f1e6
Merge pull request #446 from ELEVATE-Project/develop
rakeshSgr Mar 19, 2024
cfe344d
blacklisting update
adithyadinesh0412 Mar 19, 2024
5817165
Comment Changes regarding the password
sumanvpacewisdom Mar 20, 2024
817a0b9
Merge branch 'security_fixes' of https://github.com/ELEVATE-Project/u…
nevil-mathew Mar 20, 2024
22e3b95
Merge pull request #447 from adithyadinesh0412/security_fixes
nevil-mathew Mar 20, 2024
e786767
updated validators
nevil-mathew Mar 21, 2024
cf85092
updated blackList
nevil-mathew Mar 21, 2024
a607cb4
user update blacklist updated
adithyadinesh0412 Mar 21, 2024
43c466c
Merge branch 'develop' into security-1142
VISHNUDAS-tunerlabs Mar 21, 2024
c633acb
user update blacklist updated - Added roles
adithyadinesh0412 Mar 21, 2024
88c6a89
updated blacklist
nevil-mathew Mar 21, 2024
8e16452
Merge pull request #445 from ELEVATE-Project/security-1142
rakeshSgr Mar 21, 2024
8fe8f01
Merge pull request #437 from ELEVATE-Project/Code-Injection-fix
rakeshSgr Mar 21, 2024
182188c
added cloud-services to valid list
nevil-mathew Mar 21, 2024
3110061
Merge pull request #450 from ELEVATE-Project/controller-update-index
rakeshSgr Mar 21, 2024
2e1bd00
Merge branch 'develop' into audit_changes
sumanvpacewisdom Mar 22, 2024
49e3c40
Merge pull request #448 from ELEVATE-Project/validation-fix
rakeshSgr Mar 22, 2024
c2c314e
Merge pull request #444 from sumanvpacewisdom/audit_changes
rakeshSgr Mar 22, 2024
69e120f
Merge branch 'develop' of https://github.com/ELEVATE-Project/user int…
adithyadinesh0412 Mar 22, 2024
e180323
user update blacklist updated - changes
adithyadinesh0412 Mar 22, 2024
c7241ba
user update blacklist updated - changes
adithyadinesh0412 Mar 22, 2024
6858820
Merge pull request #451 from adithyadinesh0412/security_fixes
rakeshSgr Mar 22, 2024
353b1bb
Default variable changes for regex in env
sumanvpacewisdom Mar 22, 2024
d036755
Merge branch 'audit_changes' of https://github.com/sumanvpacewisdom/u…
sumanvpacewisdom Mar 22, 2024
05abd46
Merge remote-tracking branch 'upstream/develop' into audit_changes
sumanvpacewisdom Mar 22, 2024
0e1b923
Merge pull request #453 from sumanvpacewisdom/audit_changes
rakeshSgr Mar 22, 2024
03de8c7
bulk upload internal process failure fix
VISHNUDAS-tunerlabs Mar 22, 2024
d621e31
Merge pull request #454 from ELEVATE-Project/userInviteFix
rakeshSgr Mar 22, 2024
655b935
envVariables chnages
sumanvpacewisdom Mar 22, 2024
3f7a29c
Merge pull request #455 from sumanvpacewisdom/audit_changes
rakeshSgr Mar 22, 2024
d23c25b
fixed an issue with refresh token update
nevil-mathew Mar 22, 2024
fb9dfcb
Merge pull request #456 from ELEVATE-Project/refresh-token-fix
rakeshSgr Mar 22, 2024
36a8513
Merge pull request #457 from ELEVATE-Project/develop
rakeshSgr Mar 22, 2024
c8f0962
Change Password API
sumanvpacewisdom Mar 26, 2024
c259ef1
google recaptcha
adithyadinesh0412 Mar 26, 2024
45d2f94
Comment changes
sumanvpacewisdom Mar 26, 2024
fbfb5df
comment changes
sumanvpacewisdom Mar 26, 2024
ccc857d
Merge pull request #458 from sumanvpacewisdom/change_password
rakeshSgr Mar 26, 2024
16dfe70
validators for changePassword
sumanvpacewisdom Mar 26, 2024
44a1eb7
Merge branch 'ELEVATE-Project:master' into change_password
sumanvpacewisdom Mar 26, 2024
3585156
Merge pull request #460 from sumanvpacewisdom/change_password
rakeshSgr Mar 26, 2024
4806aff
removed interface apis
adithyadinesh0412 Mar 26, 2024
decdc02
updated signed URL expiry to be dynamic
nevil-mathew Mar 26, 2024
55ef991
Merge pull request #461 from ELEVATE-Project/signed-url-expiry
rakeshSgr Mar 26, 2024
a7c0a76
Merge pull request #462 from ELEVATE-Project/develop
rakeshSgr Mar 26, 2024
5c618fc
review comments
adithyadinesh0412 Mar 26, 2024
2a71765
Merge branch 'develop' of https://github.com/ELEVATE-Project/user int…
adithyadinesh0412 Mar 26, 2024
a24b42b
user-sessions table added to user service
VISHNUDAS-tunerlabs Mar 26, 2024
9f1814f
review comments
adithyadinesh0412 Mar 27, 2024
37a781b
Merge pull request #459 from adithyadinesh0412/develop
joffinjoy Mar 27, 2024
12db6ce
user sessions
VISHNUDAS-tunerlabs Mar 27, 2024
672e3b8
envVariables and message changes
sumanvpacewisdom Mar 27, 2024
0c51649
Merge branch 'develop' into change_password
sumanvpacewisdom Mar 27, 2024
ed8cc76
Merge pull request #463 from sumanvpacewisdom/change_password
rakeshSgr Mar 27, 2024
1137e24
frontend requested change for recaptcha
adithyadinesh0412 Mar 27, 2024
1809dc7
Merge pull request #464 from adithyadinesh0412/develop
joffinjoy Mar 27, 2024
62c9550
frontend requested change for recaptcha
adithyadinesh0412 Mar 27, 2024
881fbf4
Merge pull request #465 from adithyadinesh0412/develop
joffinjoy Mar 27, 2024
567a4c7
recaptcha issue fix
adithyadinesh0412 Mar 27, 2024
1d2a4f7
Merge pull request #467 from adithyadinesh0412/develop
joffinjoy Mar 27, 2024
508834b
Merge pull request #468 from ELEVATE-Project/develop
rakeshSgr Mar 28, 2024
230d3ad
Adding new APIs to captcha
adithyadinesh0412 Mar 28, 2024
f78b051
captcha token variable updated
adithyadinesh0412 Mar 28, 2024
8558d0a
Merge pull request #469 from adithyadinesh0412/develop
joffinjoy Mar 28, 2024
b11acb2
changes pushed for internal api testing. code clean up and optimisati…
VISHNUDAS-tunerlabs Mar 28, 2024
ad59c98
change password - logout condition
sumanvpacewisdom Mar 28, 2024
b7bb2c3
removing commented lines
sumanvpacewisdom Mar 28, 2024
d2cfa8e
space
sumanvpacewisdom Mar 28, 2024
8114f1c
local merge check
VISHNUDAS-tunerlabs Mar 28, 2024
ec6523e
Merge pull request #472 from ELEVATE-Project/develop
rakeshSgr Mar 28, 2024
1d73640
code clean up before merge
VISHNUDAS-tunerlabs Mar 28, 2024
741614b
internal url updated
VISHNUDAS-tunerlabs Mar 28, 2024
2ab1c31
develop branch merged and conflicts addressed
VISHNUDAS-tunerlabs Mar 28, 2024
a9ae2e7
user table and related api changes
VISHNUDAS-tunerlabs Mar 29, 2024
49497e1
configurable active session check added
VISHNUDAS-tunerlabs Mar 29, 2024
3663260
parse device info
VISHNUDAS-tunerlabs Mar 30, 2024
ff92666
device info
VISHNUDAS-tunerlabs Mar 30, 2024
7aa0e77
Merge pull request #473 from ELEVATE-Project/1172_user_sessions_backu…
rakeshSgr Apr 1, 2024
d75e009
remove unwanted keys
VISHNUDAS-tunerlabs Apr 1, 2024
6111eb1
Merge pull request #471 from sumanvpacewisdom/change_password
rakeshSgr Apr 1, 2024
7d1da43
Merge pull request #474 from ELEVATE-Project/1172_user_sessions_backu…
rakeshSgr Apr 1, 2024
fe1b3c3
updated validation regex
nevil-mathew Apr 1, 2024
dc5d7f6
added whitespace
nevil-mathew Apr 1, 2024
7aa8e3b
Merge pull request #475 from ELEVATE-Project/regex-update
rakeshSgr Apr 1, 2024
31c9d9d
update TTL if idle time is provided
VISHNUDAS-tunerlabs Apr 1, 2024
d6b5918
Merge pull request #476 from ELEVATE-Project/1172_user_sessions_backu…
rakeshSgr Apr 1, 2024
71b8ba4
DC issue fix
VISHNUDAS-tunerlabs Apr 1, 2024
6f61580
Merge pull request #477 from ELEVATE-Project/1172_user_sessions_backu…
rakeshSgr Apr 1, 2024
68e5e4f
Merge pull request #478 from ELEVATE-Project/develop
rakeshSgr Apr 1, 2024
f98a1cc
1310 fix sending correct error message
VISHNUDAS-tunerlabs Apr 3, 2024
80e88bb
Merge pull request #479 from ELEVATE-Project/1310_login_activity_expiry
rakeshSgr Apr 3, 2024
ddd4c1f
Captcha and otp security changes
adithyadinesh0412 Apr 3, 2024
504b68a
Merge pull request #481 from adithyadinesh0412/develop
rakeshSgr Apr 3, 2024
6712670
changes added to keep current session on top of first page
VISHNUDAS-tunerlabs Apr 4, 2024
ef218ce
add period filter
VISHNUDAS-tunerlabs Apr 4, 2024
7c658ea
Merge pull request #482 from ELEVATE-Project/1310_login_activity_expiry
rakeshSgr Apr 4, 2024
79f4986
Merge pull request #483 from ELEVATE-Project/develop
joffinjoy Apr 4, 2024
7afcdd8
added additional validation in /requestOrgRole
nevil-mathew Apr 5, 2024
5048552
Merge pull request #484 from ELEVATE-Project/validation-update-reqOrg…
rakeshSgr Apr 5, 2024
aace795
Merge pull request #485 from ELEVATE-Project/develop
rakeshSgr Apr 5, 2024
7b7a070
Merge branch 'master' into staging
rakeshSgr Apr 8, 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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16
FROM node:20

#Set working directory
WORKDIR /var/src/
Expand Down
15 changes: 15 additions & 0 deletions src/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,20 @@ EVENT_ENABLE_ORG_EVENTS=true
#Generic Email template for new users
GENERIC_INVITATION_EMAIL_TEMPLATE_CODE=generic_invite

# Allowed host by CORS
ALLOWED_HOST = "http://examplDomain.com"

# Downloadabale url exipres after
DOWNLOAD_URL_EXPIRATION_DURATION = 120000

#database url
DATABASE_URL=postgres://postgres:postgres@localhost:5432/elevate-user

#allowed idle time
ALLOWED_IDLE_TIME=300000

# Expiry time for the signed urls
SIGNED_URL_EXPIRY_IN_MILLISECONDS = 120000

# Allowed active sessions
ALLOWED_ACTIVE_SESSIONS = 5
47 changes: 47 additions & 0 deletions src/api-doc/MentorED-Users.postman_collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,53 @@
}
]
},

{
"name": "Change Password",
"request": {
"method": "POST",
"header": [
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"body": {
"mode": "urlencoded",
"urlencoded": [
{
"key": "oldPassword",
"value": "password",
"type": "text"
},
{
"key": "newPassword",
"value": "Password@123",
"type": "text"
}
]
},
"url": {
"raw": "{{UserDevBaseUrl}}user/v1/account/changePassword",
"host": ["{{UserDevBaseUrl}}user"],
"path": ["v1", "account", "changePassword"],
"query": [
{
"key": "oldPassword",
"value": "password",
"disabled": true
},
{
"key": "newPassword",
"value": "Password@123",
"disabled": true
}
]
}
},
"response": []
},
{
"name": "User",
"item": [
Expand Down
Loading