Clarify local development login flow #2540
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,9 @@ const agencies = require('./agencies'); | |
| const roles = require('./roles'); | ||
| const tenants = require('./tenants'); | ||
|
|
||
| const adminRole = roles.find(({ name }) => name === 'admin'); | ||
| const staffRole = roles.find(({ name }) => name === 'staff'); | ||
|
|
||
| const usdrAgency = agencies.find((a) => a.abbreviation === 'USDR'); | ||
| const usdrSubAgency = agencies.find((a) => a.abbreviation === 'TSDR'); | ||
| const nevadaAgency = agencies.find((a) => a.abbreviation === 'NV'); | ||
|
|
@@ -21,127 +24,143 @@ module.exports = [ | |
| email: 'alex@usdigitalresponse.org', | ||
| name: 'Alex Allain', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 2, | ||
| email: 'mindy@usdigitalresponse.org', // fake email for testing | ||
| name: 'Mindy Huang', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 3, | ||
| email: 'joecomeau01@gmail.com', | ||
| name: 'Joe Comeau', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 4, | ||
| email: 'asridhar@usdigitalresponse.org', | ||
| name: 'Aditya Sridhar', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 5, | ||
| email: 'thendrickson@usdigitalresponse.org', | ||
| name: 'Tyler Hendrickson', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 6, | ||
| email: 'user1@nv.gov', // fake email for testing | ||
| name: 'nv.gov User 1', | ||
| agency_id: nevadaAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: nevadaenant.id, | ||
| }, | ||
| { | ||
| id: 7, | ||
| email: 'user2@nv.gov', // fake email for testing | ||
| name: 'nv.gov User 2', | ||
| agency_id: nevadaAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: nevadaenant.id, | ||
| }, | ||
| { | ||
| id: 8, | ||
| email: 'user3@nv.gov', // fake email for testing | ||
| name: 'nv.gov User 3', | ||
| agency_id: nevadaAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: nevadaenant.id, | ||
| }, | ||
| { | ||
| id: 9, | ||
| email: 'user1@npo.nv.gov', // fake email for testing | ||
| name: 'npo.nv.gov User 1', | ||
| agency_id: procurementAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: procurementTenant.id, | ||
| }, | ||
| { | ||
| id: 10, | ||
| email: 'user2@npo.nv.gov', // fake email for testing | ||
| name: 'npo.nv.gov User 2', | ||
| agency_id: procurementAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: procurementTenant.id, | ||
| }, | ||
| { | ||
| id: 11, | ||
| email: 'user3@npo.nv.gov', // fake email for testing | ||
| name: 'npo.nv.gov User 3', | ||
| agency_id: procurementAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: procurementTenant.id, | ||
| }, | ||
| { | ||
| id: 12, | ||
| email: 'user1@dallas.gov', // fake email for testing | ||
| name: 'dallas.gov User 1', | ||
| agency_id: dallasAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: dallasTenant.id, | ||
| }, | ||
| { | ||
| id: 13, | ||
| email: 'admin1@nv.gov', // fake email for testing | ||
| name: 'nv.gov Admin User 1', | ||
| agency_id: nevadaAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: nevadaenant.id, | ||
| }, | ||
| { | ||
| id: 14, | ||
| email: 'mindy+testsub@usdigitalresponse.org', | ||
| name: 'USDR tenant sub agency user', | ||
| agency_id: usdrSubAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 15, | ||
| email: 'nat.hillard.usdr@gmail.com', | ||
| name: 'Nat Hillard', | ||
| agency_id: usdrSubAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 16, | ||
| email: 'admin1@usdigitalresponse.org', | ||
| name: 'USDR tenant sub agency admin', | ||
| agency_id: usdrSubAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 17, | ||
| email: 'admin@example.com', | ||
| name: 'USDR Admin', | ||
| agency_id: usdrAgency.id, | ||
| role_id: adminRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| { | ||
| id: 18, | ||
| email: 'staff@example.com', | ||
| name: 'USDR Staff', | ||
| agency_id: usdrAgency.id, | ||
| role_id: staffRole.id, | ||
| tenant_id: usdrTenant.id, | ||
| }, | ||
| ]; | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,7 +77,11 @@ function sendPassCode(email, passcode, httpOrigin, redirectTo) { | |
| ); | ||
|
|
||
| if (process.env.DEV_LOGIN_LINK && process.env.NODE_ENV === 'development') { | ||
| const BLUE = '\x1b[34m'; | ||
|
There was a problem hiding this comment. I wasn't sure if the preference was for something like this vs using a library like chalk. We seem to have chalk installed but only as a dev dependency, so I didn't want to rely on it here, but I'm happy to update if that feels cleaner. There was a problem hiding this comment. 🤔 Given that this execution path is specific to dev workflows, is there a way to use chalk without declaring it as a production dependency? In general, my preference for logging is to slowly migrate over to structured logging (we currently use There was a problem hiding this comment. It's possible to use chalk here from devDependencies, but I think it ends up more messy than worth it. You run into a few issues you have to skirt:
Here's basically what that code would look like: if (process.env.DEV_LOGIN_LINK && process.env.NODE_ENV === 'development') {
// eslint-disable-next-line import/no-extraneous-dependencies
import('chalk').then((chalkModule) => {
const chalk = chalkModule.default;
const message = `| Login link generated: ${href} |`;
console.log(chalk.blue('-'.repeat(message.length)));
console.log(chalk.blue(message));
console.log(chalk.blue('-'.repeat(message.length)));
});
}Personally, I don't think it's a particular improvement. It also has the small danger of someone copy-pasting code that relies on chalk outside of the If this is the only instance of wanting color output for now, I'd be inclined to leave it as-is. If we start needing this a few places, I'd probably consider promoting chalk to a full dependency. Since this is server-side code, we shouldn't be as worried about bundle size, etc. Thoughts? There was a problem hiding this comment. Agree with the above – let's leave as-is unless/until there are any compelling use-cases for production. |
||
| const message = `| Login link generated: ${href} |`; | ||
| console.log(`${BLUE}${'-'.repeat(message.length)}`); | ||
| console.log(`${BLUE}${message}`); | ||
| console.log(`${BLUE}${'-'.repeat(message.length)}`); | ||
| } | ||
| return module.exports.deliverEmail({ | ||
| toAddress: email, | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️