Skip to content
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

Display the secret for 2FA - #14128 #14154

Merged
merged 4 commits into from May 3, 2018

Conversation

Projects
None yet
2 participants
@ramantehlan
Copy link
Contributor

ramantehlan commented Apr 3, 2018

After this commit, users will be able to see secret/key for 2FA, in case they can't scan QR code. #14128

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on its own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests

ramantehlan added some commits Apr 3, 2018

2FA Secret added
Signed-off-by: ramantehlan <ramantehlan@gmail.com>
2FA Secret Displayed
Signed-off-by: ramantehlan <ramantehlan@gmail.com>

@ramantehlan ramantehlan changed the title Addressing the request of secret for 2FA - #14128 Display the secret for 2FA - #14128 Apr 3, 2018

@mauriciofauth
Copy link
Member

mauriciofauth left a comment

Hi, @ramantehlan. Thanks for your contribution.
I just reviewed your pull request.

@@ -6,5 +6,9 @@
<img src="{{ image }}" />
</p>
<p>
{% trans "Secret/key:" %} <b>{{ secret }}</b>

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 24, 2018

Member

Could you replace the b tag with the strong tag?

@@ -97,6 +97,7 @@ public function setup()
);
return Template::get('login/twofactor/application_configure')->render([
'image' => $inlineUrl,
'secret' => $_SESSION['2fa_application_key']

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 24, 2018

Member

Wouldn't it be better to use $this->_twofactor->config['settings']['secret'] here?

{% trans "Secret/key:" %} <b>{{ secret }}</b>
</p>
<p>
<label>{% trans "Authentication code:" %} <input type="text" name="2fa_code" /></label>

This comment has been minimized.

@mauriciofauth

mauriciofauth Apr 24, 2018

Member

This line is duplicate, could you remove it?

@mauriciofauth mauriciofauth merged commit 8dbae11 into phpmyadmin:master May 3, 2018

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
Codacy/PR Quality Review Good work! A positive pull request.
Details
DCO All commits have a DCO sign-off from the author
Scrutinizer Analysis: No new issues – Tests: passed
Details
@mauriciofauth

This comment has been minimized.

Copy link
Member

mauriciofauth commented May 3, 2018

Merged, thanks for your contribution!

@mauriciofauth mauriciofauth added this to the 4.8.1 milestone May 3, 2018

@mauriciofauth mauriciofauth self-assigned this May 3, 2018

mauriciofauth added a commit that referenced this pull request May 3, 2018

Display the secret for 2FA - #14128 (#14154)
* 2FA Secret added
* 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 8dbae11)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.