Skip to content

Commit

Permalink
Merge pull request #16703 from mozilla/FXA-7909
Browse files Browse the repository at this point in the history
feat(content): Add feature flag for password reset with code
  • Loading branch information
vpomerleau authored Apr 11, 2024
2 parents bcdaa7f + 5739ff6 commit 486c63f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/fxa-content-server/server/config/local.json-dist
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"signInRoutes": true
},
"featureFlags": {
"sendFxAStatusOnSettings": true
"sendFxAStatusOnSettings": true,
"resetPasswordWithCode": false
}
}
1 change: 1 addition & 0 deletions packages/fxa-content-server/server/lib/beta-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const settingsConfig = {
},
featureFlags: {
keyStretchV2: config.get('featureFlags.keyStretchV2'),
resetPasswordWithCode: config.get('featureFlags.resetPasswordWithCode'),
},
};

Expand Down
6 changes: 6 additions & 0 deletions packages/fxa-content-server/server/lib/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,12 @@ const conf = (module.exports = convict({
format: Boolean,
env: 'FEATURE_FLAGS_KEY_STRETCH_V2',
},
resetPasswordWithCode: {
default: false,
doc: 'Enables using confirmation codes instead of links for password reset',
format: Boolean,
env: 'FEATURE_FLAGS_RESET_PWD_WITH_CODE',
},
},
showReactApp: {
simpleRoutes: {
Expand Down
4 changes: 4 additions & 0 deletions packages/fxa-settings/src/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export interface Config {
};
featureFlags?: {
keyStretchV2?: boolean;
resetPasswordWithCode?: boolean;
};
}

Expand Down Expand Up @@ -161,6 +162,9 @@ export function getDefault() {
signUpRoutes: false,
signInRoutes: false,
},
featureFlags: {
resetPasswordWithCode: false,
},
} as Config;
}

Expand Down

0 comments on commit 486c63f

Please sign in to comment.