Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289249
Change subject: horizon: make the "Totp token" field a little more clear
......................................................................
horizon: make the "Totp token" field a little more clear
TOTP is a technicality most users don't know or should be concerned
about. Having the form's label being called like that is not great for
UX, as it might confuse even the technical users who might not be aware
of the exact mechanics of 2FA.
I personally prefer "2-Step Verification code", but I've renamed it to
"Two-factor authentication code" to make it consistent with what we
expose to Wikitech's userprefs. I'm not feeling strong about any of our
options, as long as it's something not /too/ technical :)
While at it, I cleared up a couple of descriptions under keystoneclient
as well.
Change-Id: I13c0ebaf46d982fa7d850b7fdb6e841dce259dd2
---
M modules/openstack/files/liberty/horizon/forms.py
M modules/openstack/files/liberty/keystoneclient/wmtotp.py
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/289249/1
diff --git a/modules/openstack/files/liberty/horizon/forms.py
b/modules/openstack/files/liberty/horizon/forms.py
index f7197cf..5383ff2 100644
--- a/modules/openstack/files/liberty/horizon/forms.py
+++ b/modules/openstack/files/liberty/horizon/forms.py
@@ -56,10 +56,10 @@
"to log in at wikitech.wikimedia.org.")
password = forms.CharField(label=_("Password"),
widget=forms.PasswordInput(render_value=False))
- totptoken = forms.CharField(label=_("Totp Token"),
+ totptoken = forms.CharField(label=_("Two-factor authentication code"),
widget=forms.TextInput(),
help_text="Login requires two-factor "
- "authentication. To enable 2fa, "
+ "authentication. To enable it, "
"visit Preferences->User "
"Profile in your Wikitech account")
diff --git a/modules/openstack/files/liberty/keystoneclient/wmtotp.py
b/modules/openstack/files/liberty/keystoneclient/wmtotp.py
index cc52f93..bc4f21b 100644
--- a/modules/openstack/files/liberty/keystoneclient/wmtotp.py
+++ b/modules/openstack/files/liberty/keystoneclient/wmtotp.py
@@ -27,7 +27,7 @@
"""Construct a User/Password/totp based authentication method.
:param string password: Password for authentication.
- :param string totp: Totp token for authentication.
+ :param string totp: 2FA (TOTP) token for authentication.
:param string username: Username for authentication.
:param string user_id: User ID for authentication.
:param string user_domain_id: User's domain ID for authentication.
@@ -91,7 +91,7 @@
cfg.StrOpt('user-domain-id', help="User's domain id"),
cfg.StrOpt('user-domain-name', help="User's domain name"),
cfg.StrOpt('password', secret=True, help="User's password"),
- cfg.StrOpt('totp', secret=True, help="Totp token"),
+ cfg.StrOpt('totp', secret=True, help="2FA (TOTP) token"),
])
return options
@@ -104,7 +104,7 @@
if not kwargs.get('totp') and (hasattr(sys.stdin, 'isatty') and
sys.stdin.isatty()):
try:
- kwargs['totp'] = getpass.getpass('Totp token: ')
+ kwargs['totp'] = getpass.getpass('2FA (TOTP) token: ')
except EOFError:
pass
--
To view, visit https://gerrit.wikimedia.org/r/289249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13c0ebaf46d982fa7d850b7fdb6e841dce259dd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
