Commit d1f6607a authored by Imre Farkas's avatar Imre Farkas

Merge branch '290113-feature-flag-rollout-of-vue_2fa_recovery_codes' into 'master'

Enable `vue_2fa_recovery_codes` feature flag by default

See merge request gitlab-org/gitlab!49493
parents caedf9de 0b5fbd0e
- show_success_alert = local_assigns.fetch(:show_success_alert, nil)
- if Feature.enabled?(:vue_2fa_recovery_codes, current_user)
- if Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true)
.js-2fa-recovery-codes{ data: { codes: @codes.to_json, profile_account_path: profile_account_path(two_factor_auth_enabled_successfully: show_success_alert) } }
- else
%p.slead
......
- page_title _('Two-factor Authentication'), _('Account')
- add_page_specific_style 'page_bundles/profile_two_factor_auth'
- unless Feature.enabled?(:vue_2fa_recovery_codes, current_user)
- unless Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true)
.gl-alert.gl-alert-success.gl-mb-5
= _('Congratulations! You have enabled Two-factor Authentication!')
......
---
title: Require users to copy, download, or print 2FA recovery codes
merge_request: 49493
author:
type: changed
......@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113
milestone: '13.7'
type: development
group: group::access
default_enabled: false
default_enabled: true
......@@ -29,7 +29,6 @@ module QA
end
before do
Runtime::Feature.enable('vue_2fa_recovery_codes', user: developer_user)
group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
end
......@@ -58,7 +57,6 @@ module QA
end
after do
Runtime::Feature.disable('vue_2fa_recovery_codes', user: developer_user)
group.set_require_two_factor_authentication(value: 'false')
group.remove_via_api!
sandbox_group.remove_via_api!
......
......@@ -16,7 +16,6 @@ module QA
end
before do
Runtime::Feature.enable('vue_2fa_recovery_codes', user: user)
enable_2fa_for_user(user)
end
......@@ -47,10 +46,6 @@ module QA
expect(page).to have_text('Invalid two-factor code')
end
after do
Runtime::Feature.disable('vue_2fa_recovery_codes', user: user)
end
def enable_2fa_for_user(user)
Flow::Login.while_signed_in(as: user) do
Page::Main::Menu.perform(&:click_settings_link)
......
......@@ -31,7 +31,6 @@ module QA
let(:two_fa_expected_text) { /The group settings for.*require you to enable Two-Factor Authentication for your account.*You need to do this before/ }
before do
Runtime::Feature.enable('vue_2fa_recovery_codes', user: developer_user)
group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
end
......@@ -58,7 +57,6 @@ module QA
end
after do
Runtime::Feature.disable('vue_2fa_recovery_codes', user: developer_user)
group.set_require_two_factor_authentication(value: 'false')
group.remove_via_api! do |resource|
resource.api_client = admin_api_client
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment