Skip to content

Auth file change #120

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.

Sign up for GitHub

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

Merged
borkarsaish65 merged 4 commits into from
May 7, 2025
Merged

Auth file change #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8987c7d
savepoint
borkarsaish65 May 1, 2025
73c6f79
Merge branch 'develop' of https://github.com/ELEVATE-Project/entity-m…
borkarsaish65 May 2, 2025
c50fa60
Merge branch 'develop' of https://github.com/ELEVATE-Project/entity-m…
borkarsaish65 May 7, 2025
127dbd4
savepoint
borkarsaish65 May 7, 2025
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: 2 additions & 0 deletions src/generics/constants/api-responses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,6 @@ module.exports = {
KEYS_INDEXED_SUCCESSFULL: 'KEYS_INDEXED_SUCCESSFULL',
KEYS_ALREADY_INDEXED_SUCCESSFULL: 'KEYS_ALREADY_INDEXED_SUCCESSFULL',
NOT_VALID_ID_AND_EXTERNALID: 'NOT_VALID_ID_AND_EXTERNALID',
TENANT_ID_MISSING_CODE: 'ERR_TENANT_ID_MISSING',
TENANT_ID_MISSING_MESSAGE: 'Require tenantId in body',
}
22 changes: 10 additions & 12 deletions src/generics/middleware/authenticator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ module.exports = async function (req, res, next, token = '') {
})
)

if (guestAccess == true && !req.body['tenantId']) {
rspObj.errCode = CONSTANTS.apiResponses.TENANT_ID_MISSING_CODE
rspObj.errMsg = CONSTANTS.apiResponses.TENANT_ID_MISSING_MESSAGE
rspObj.responseCode = HTTP_STATUS_CODE['unauthorized'].status
return res.status(HTTP_STATUS_CODE['unauthorized'].status).send(respUtil(rspObj))
}

if (guestAccess == true && !token) {
next()
return
Expand Down Expand Up @@ -340,19 +347,13 @@ module.exports = async function (req, res, next, token = '') {
// Check if orgIdFromHeader is provided and valid
if (orgIdFromHeader && orgIdFromHeader != '') {
if (!orgIdArr.includes(orgIdFromHeader)) {
rspObj.errCode = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
rspObj.errMsg = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_MESSAGE
rspObj.responseCode = HTTP_STATUS_CODE['bad_request'].status
return res.status(HTTP_STATUS_CODE['bad_request'].status).send(respUtil(rspObj))
throw CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
}

let validateOrgsResult = await validateIfOrgsBelongsToTenant(tenantId, orgIdFromHeader)

if (!validateOrgsResult.success) {
rspObj.errCode = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
rspObj.errMsg = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_MESSAGE
rspObj.responseCode = HTTP_STATUS_CODE['bad_request'].status
return res.status(HTTP_STATUS_CODE['bad_request'].status).send(respUtil(rspObj))
throw CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
}

return { success: true, orgId: orgIdFromHeader }
Expand All @@ -364,10 +365,7 @@ module.exports = async function (req, res, next, token = '') {
}

// If no orgId is found, throw error
rspObj.errCode = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
rspObj.errMsg = CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_MESSAGE
rspObj.responseCode = HTTP_STATUS_CODE['bad_request'].status
return res.status(HTTP_STATUS_CODE['bad_request'].status).send(respUtil(rspObj))
throw CONSTANTS.apiResponses.TENANTID_AND_ORGID_REQUIRED_IN_TOKEN_CODE
} catch (err) {
// Handle error when no valid orgId is found
if (orgIdArr.length > 0) {
Expand Down