Skip to content

Display the secret for 2FA - #14128 #14154

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 4 commits into from
May 3, 2018
Merged

Display the secret for 2FA - #14128 #14154

merged 4 commits into from
May 3, 2018

Conversation

ramantehlan
Copy link
Contributor

@ramantehlan 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

Signed-off-by: ramantehlan <ramantehlan@gmail.com>
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
Copy link
Member

@MauricioFauth MauricioFauth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is duplicate, could you remove it?

@MauricioFauth MauricioFauth merged commit 8dbae11 into phpmyadmin:master May 3, 2018
@MauricioFauth
Copy link
Member

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 pushed a commit that referenced this pull request May 3, 2018
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants