-
Notifications
You must be signed in to change notification settings - Fork 6
Refactor to allow gracefully failing if no env file provided #205
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // src/utils/env.js | ||
|
|
||
| // This utility checks for required env vars and provides fallbacks for local dev | ||
|
|
||
| const REQUIRED_ENV_VARS = [ | ||
| 'AUTHORITY', | ||
| 'CLIENT_ID', | ||
| 'REDIRECT_URI', | ||
| 'OAUTH_REDIRECT_SIGN_RESPONSE_TYPE', | ||
| 'SCOPE', | ||
| 'REGION', | ||
| 'USER_POOL_ID', | ||
| 'USER_POOL_WEB_CLIENT_ID', | ||
| 'OAUTH_DOMAIN', | ||
| 'OAUTH_REDIRECT_SIGN_OUT', | ||
| 'ENV', | ||
| ]; | ||
|
|
||
| function isEnvLocalLoaded() { | ||
| // If any required env var is missing, assume .env.local is not loaded | ||
| return REQUIRED_ENV_VARS.every((key) => typeof process.env[key] === 'string' && process.env[key] !== ''); | ||
| } | ||
|
|
||
| function getEnvVar(key, fallback = undefined) { | ||
| if (typeof process.env[key] === 'string' && process.env[key] !== '') { | ||
| return process.env[key]; | ||
| } | ||
| // Fallback for local dev | ||
| if (fallback !== undefined) return fallback; | ||
| // Some defaults for local dev | ||
| if (key === 'ENV') return 'localhost'; | ||
| return undefined; | ||
| } | ||
|
|
||
| export { isEnvLocalLoaded, getEnvVar }; |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -11,9 +11,13 @@ import { | |
| LOGOUT_BUTTON, | ||
| LOGOUT_PATH, | ||
| } from "./constants"; | ||
| import { isEnvLocalLoaded } from './env'; | ||
|
|
||
| export function useNavbarItemsMobile() { | ||
| // const { route } = useAuthenticator((context) => [context.route]); | ||
| if (!isEnvLocalLoaded()) { | ||
| // If .env.local is missing, do not render auth-related navbar items | ||
| return useThemeConfig().navbar.items; | ||
| } | ||
|
Comment on lines
16
to
+20
|
||
| const auth = useAuth(); | ||
|
|
||
| let authElement; | ||
|
|
@@ -61,7 +65,10 @@ export function useNavbarItemsMobile() { | |
| } | ||
|
|
||
| export function useNavbarItemsDesktop() { | ||
| // const { route } = useAuthenticator((context) => [context.route]); | ||
| if (!isEnvLocalLoaded()) { | ||
| // If .env.local is missing, do not render auth-related navbar items | ||
| return useThemeConfig().navbar.items; | ||
| } | ||
| const auth = useAuth(); | ||
|
|
||
| let authElement; | ||
|
|
||
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.
For consistency with the rest of the codebase, consider using getEnvVar to access 'OAUTH_REDIRECT_SIGN_OUT' instead of directly accessing process.env.