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

Fixes #659 Adds a show password options for login #679

Merged
merged 1 commit into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions securedrop_client/gui/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,43 @@ def clear_message(self):
self.hide()


class PasswordEdit(QLineEdit):
"""
A LineEdit with icons to show/hide password entries
"""
CSS = '''QLineEdit {
border-radius: 0px;
height: 30px;
margin: 0px 0px 0px 0px;
}
'''

def __init__(self, parent):
self.parent = parent
super().__init__(self.parent)

# Set styles
self.setStyleSheet(self.CSS)

self.visibleIcon = load_icon("eye_visible.svg")
self.hiddenIcon = load_icon("eye_hidden.svg")

self.setEchoMode(QLineEdit.Password)
self.togglepasswordAction = self.addAction(self.visibleIcon, QLineEdit.TrailingPosition)
self.togglepasswordAction.triggered.connect(self.on_toggle_password_Action)
self.password_shown = False

def on_toggle_password_Action(self):
if not self.password_shown:
self.setEchoMode(QLineEdit.Normal)
self.password_shown = True
self.togglepasswordAction.setIcon(self.hiddenIcon)
else:
self.setEchoMode(QLineEdit.Password)
self.password_shown = False
self.togglepasswordAction.setIcon(self.visibleIcon)


class LoginDialog(QDialog):
"""
A dialog to display the login form.
Expand All @@ -1319,7 +1356,7 @@ class LoginDialog(QDialog):
#login_form QLineEdit {
border-radius: 0px;
height: 30px;
margin: 0px 0px 10px 0px;
margin: 0px 0px 0px 0px;
}
'''

Expand Down Expand Up @@ -1371,8 +1408,7 @@ def __init__(self, parent):
self.username_field = QLineEdit()

self.password_label = QLabel(_('Passphrase'))
self.password_field = QLineEdit()
self.password_field.setEchoMode(QLineEdit.Password)
self.password_field = PasswordEdit(self)

self.tfa_label = QLabel(_('Two-Factor Code'))
self.tfa_field = QLineEdit()
Expand All @@ -1390,8 +1426,10 @@ def __init__(self, parent):

form_layout.addWidget(self.username_label)
form_layout.addWidget(self.username_field)
form_layout.addWidget(QWidget(self))
form_layout.addWidget(self.password_label)
form_layout.addWidget(self.password_field)
form_layout.addWidget(QWidget(self))
form_layout.addWidget(self.tfa_label)
form_layout.addWidget(self.tfa_field)
form_layout.addWidget(buttons)
Expand Down
23 changes: 23 additions & 0 deletions securedrop_client/resources/images/eye_hidden.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions securedrop_client/resources/images/eye_visible.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 12 additions & 2 deletions tests/gui/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

from PyQt5.QtCore import Qt, QEvent
from PyQt5.QtGui import QFocusEvent
from PyQt5.QtWidgets import QWidget, QApplication, QVBoxLayout, QMessageBox, QMainWindow
from PyQt5.QtWidgets import QWidget, QApplication, QVBoxLayout, QMessageBox, QMainWindow, \
QLineEdit
from sqlalchemy.orm import scoped_session, sessionmaker

from securedrop_client import db, logic
Expand All @@ -16,7 +17,7 @@
DeleteSourceMessageBox, DeleteSourceAction, SourceMenu, TopPane, LeftPane, RefreshButton, \
ErrorStatusBar, ActivityStatusBar, UserProfile, UserButton, UserMenu, LoginButton, \
ReplyBoxWidget, ReplyTextEdit, SourceConversationWrapper, StarToggleButton, LoginOfflineLink, \
LoginErrorBar, EmptyConversationView, ExportDialog, PrintDialog
LoginErrorBar, EmptyConversationView, ExportDialog, PrintDialog, PasswordEdit
from tests import factory


Expand Down Expand Up @@ -2322,6 +2323,15 @@ def test_DeleteSourceAction_init(mocker):
)


def test_PasswordEdit(mocker):
passwordline = PasswordEdit(None)
passwordline.togglepasswordAction.trigger()

assert passwordline.echoMode() == QLineEdit.Normal
passwordline.togglepasswordAction.trigger()
assert passwordline.echoMode() == QLineEdit.Password


def test_DeleteSourceAction_trigger(mocker):
mock_controller = mocker.MagicMock()
mock_source = mocker.MagicMock()
Expand Down