RN-1105: Use separate .env vars for api-clients in local/dev/prod #5310
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rohan-bes
reviewed
Dec 22, 2023
|
|
||
| await builder.initialiseApiClient([ | ||
| {entityCode: 'DL', permissionGroupName: 'Admin'}, | ||
| ], true); |
There was a problem hiding this comment.
We might want to rely on the public countries list rather than giving public access to all countries
…CT_APP_MOCK_API flag" This reverts commit bc6d9f1.
rohan-bes
force-pushed
the
rn-1105-local-env-vars
branch
from
d37effa
to
6e9b51a
Compare
rohan-bes
changed the title
rohan-bes
reviewed
Jan 9, 2024
Comment on lines
77
to
93
| { entityCode: 'DL', permissionGroupName: 'Public' }, // Demo Land | ||
| { entityCode: 'FJ', permissionGroupName: 'Public' }, // Fiji | ||
| { entityCode: 'CK', permissionGroupName: 'Public' }, // Cook Islands | ||
| { entityCode: 'PG', permissionGroupName: 'Public' }, // Papua New Guinea | ||
| { entityCode: 'SB', permissionGroupName: 'Public' }, // Solomon Islands | ||
| { entityCode: 'TK', permissionGroupName: 'Public' }, // Tokelau | ||
| { entityCode: 'VE', permissionGroupName: 'Public' }, // Venezuela | ||
| { entityCode: 'WS', permissionGroupName: 'Public' }, // Samoa | ||
| { entityCode: 'KI', permissionGroupName: 'Public' }, // Kiribati | ||
| { entityCode: 'TO', permissionGroupName: 'Public' }, // Tonga | ||
| { entityCode: 'NG', permissionGroupName: 'Public' }, // Nigeria | ||
| { entityCode: 'VU', permissionGroupName: 'Public' }, // Vanuatu | ||
| { entityCode: 'AU', permissionGroupName: 'Public' }, // Australia | ||
| { entityCode: 'PW', permissionGroupName: 'Public' }, // Palau | ||
| { entityCode: 'TL', permissionGroupName: 'Public' }, // Timor-Leste | ||
| { entityCode: 'NU', permissionGroupName: 'Public' }, // Niue | ||
| { entityCode: 'TV', permissionGroupName: 'Public' }, // Tuvalu |
There was a problem hiding this comment.
This list is copied across and used in a few different places (tupaia-web-server, web-config-server, datatrak-web-server). I'm inclined to keep it as is because:
- I like having something like a public access list be explicit
- It's possible that we'd like these apps to deviate (not so much tuapia-web and web-config-server, but datatrak-web it does make sense)
- There doesn't seem to be a comfortable place to put this (perhaps in
utilswe coud add aconstantsmodule?)
alexd-bes
reviewed
Jan 9, 2024
| { entityCode: 'VU', permissionGroupName: 'Public' }, // Vanuatu | ||
| { entityCode: 'AU', permissionGroupName: 'Public' }, // Australia | ||
| { entityCode: 'PW', permissionGroupName: 'Public' }, // Palau | ||
| { entityCode: 'TL', permissionGroupName: 'Public' }, // Timor-Leste |
There was a problem hiding this comment.
We do have some hardcoded logic in web-config-server somewhere that 'turns off' TL for users, which gets carried through to datatrak-web and tupaia-web as a result - not sure if we should remove TL from this list, just so that it isn't confusing for developers down the line?
There was a problem hiding this comment.
Ahh good catch! Will remove this
| })), | ||
| ); | ||
|
|
||
| await models.userEntityPermission.createMany( |
There was a problem hiding this comment.
I might be being a bit dense here, but is this the same as above?
| @@ -0,0 +1,170 @@ | |||
| /* | |||
| * Tupaia | |||
| * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd | |
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd |
| { entityCode: 'VU', permissionGroupName: 'Public' }, // Vanuatu | ||
| { entityCode: 'AU', permissionGroupName: 'Public' }, // Australia | ||
| { entityCode: 'PW', permissionGroupName: 'Public' }, // Palau | ||
| { entityCode: 'TL', permissionGroupName: 'Public' }, // Timor-Leste |
There was a problem hiding this comment.
Same here, with TL perhaps?
| @@ -13,13 +13,20 @@ import { bindUserSessions } from './authSession'; | |||
| import { modelClasses } from './models'; | |||
| import { handleError, logApiRequest } from './utils'; | |||
| import './log'; | |||
| import { initialiseApiClient } from '@tupaia/server-boilerplate'; | |||
There was a problem hiding this comment.
Just need to reorder these imports
alexd-bes
approved these changes
Jan 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #: RN-1105
This change is to allow for different passwords for the api-client users between different environments. Because those api-client users are stored in the database, they get copied with the overnight clone. So in order for them to be different between enviroments, we need to automatically change their credentials somehow.
The solution we came up with is to initialise the api-client user whenever we instantiate one of the orchestration servers. Think of it as the orchestration server 'registering' itself with Tupaia.
Merge tasks:
API_CLIENT_PASSWORDvalues in devAPI_CLIENT_PASSWORDvalues to local