Skip to content

GitLab

J
jami-client-macos
Commit 1f70f720 authored by Anthony Léonard's avatar Anthony Léonard Committed by Kateryna Kostiuk
Browse files
Options

account: add password change modal in settings 

A button is added in the Ring account setting panel which trigger a
sliding modal enabling a user to change the password used to encrypt
the master key archive (its Ring “account”).

To prevent mistakes, the old password is not required if we know that
there isn't any. The new password is also asked twice for confirmation.

Change-Id: Ibbc0a87f1d108b7fdb66382e8f8f491461eeaccf
Reviewed-by: Kateryna Kostiuk's avatarKateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
parent 7f56bdeb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 28 deletions
CMakeLists.txt
View file @ 1f70f720
......@@ -170,6 +170,8 @@ SET(ringclient_CONTROLLERS
src/AccBannedContactsVC.mm
src/MessagesVC.h
src/MessagesVC.mm
src/PasswordChangeWC.h
src/PasswordChangeWC.mm
)
SET(ringclient_BACKENDS
......@@ -262,6 +264,7 @@ SET(ringclient_XIBS
ContactRequestList
ContactRequest
AccBannedContacts
PasswordChange
)
# Icons
......
src/AccRingVC.mm
View file @ 1f70f720
......@@ -22,6 +22,7 @@
#import <qitemselectionmodel.h>
#import "RegisterNameWC.h"
#import "PasswordChangeWC.h"
@interface AccRingVC () <RegisterNameDelegate>
......@@ -41,6 +42,7 @@
@property (unsafe_unretained) IBOutlet NSButton *allowContacts;
@property AbstractLoadingWC* accountModal;
@property PasswordChangeWC* passwordModal;
@end
......@@ -133,6 +135,21 @@ typedef NS_ENUM(NSInteger, TagViews) {
self.accountModal = registerWC;
}
- (IBAction)changePassword:(id)sender
{
auto passwordWC = [[PasswordChangeWC alloc] initWithAccount:AccountModel::instance().selectedAccount()];
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_9
[self.view.window beginSheet:passwordWC.window completionHandler:nil];
#else
[NSApp beginSheet: passwordWC.window
modalForWindow: self.view.window
modalDelegate: self
didEndSelector: nil
contextInfo: nil];
#endif
self.passwordModal = passwordWC;
}
- (IBAction)toggleUpnp:(NSButton *)sender {
AccountModel::instance().selectedAccount()->setUpnpEnabled([sender state] == NSOnState);
}
......
src/PasswordChangeWC.h 0 → 100644
View file @ 1f70f720
/*
* Copyright (C) 2017 Savoir-faire Linux Inc.
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#import <Cocoa/Cocoa.h>
#import <account.h>
@interface PasswordChangeWC : NSWindowController <NSTextFieldDelegate>
-(id)initWithAccount:(Account*)acc;
@end
src/PasswordChangeWC.mm 0 → 100644
View file @ 1f70f720
/*
* Copyright (C) 2017 Savoir-faire Linux Inc.
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#import "PasswordChangeWC.h"
#import <accountmodel.h>
@implementation PasswordChangeWC
{
Account* account;
__unsafe_unretained IBOutlet NSSecureTextField *oldPassword;
__unsafe_unretained IBOutlet NSSecureTextField *newPassword;
__unsafe_unretained IBOutlet NSSecureTextField *repeatedPassword;
__unsafe_unretained IBOutlet NSImageView *repeatPasswordValid;
__unsafe_unretained IBOutlet NSButton *acceptButton;
IBOutlet NSPopover *wrongPasswordPopover;
}
-(id)initWithAccount:(Account*)acc
{
account = acc;
return [super initWithWindowNibName:@"PasswordChange"];
}
-(void)windowDidLoad
{
[super windowDidLoad];
if (account != nullptr) {
const auto hasPassword = account->archiveHasPassword();
[oldPassword setEnabled:hasPassword];
[oldPassword setPlaceholderString:(hasPassword)?@"":NSLocalizedString(@"Account has no password", @"No password on this account text field placeholder")];
}
}
-(IBAction)accept:(id)sender
{
if (account->changePassword(QString::fromNSString([oldPassword stringValue]), QString::fromNSString([newPassword stringValue])))
{
AccountModel::instance().save();
[self close];
} else {
[oldPassword setStringValue:@""];
[wrongPasswordPopover showRelativeToRect:oldPassword.visibleRect ofView:oldPassword preferredEdge:NSMinYEdge];
}
}
-(IBAction)cancel:(id)sender
{
[self close];
}
#pragma mark - NSTextFieldDelegate methods
-(void)controlTextDidChange:(NSNotification *)obj
{
if ([[newPassword stringValue] isEqualToString: [repeatedPassword stringValue]]) {
[repeatPasswordValid setHidden:NO];
[acceptButton setEnabled:YES];
} else {
[repeatPasswordValid setHidden:YES];
[acceptButton setEnabled:NO];
}
}
@end
ui/Base.lproj/AccRing.xib
View file @ 1f70f720
This diff is collapsed.
ui/Base.lproj/Localizable.strings
View file @ 1f70f720
......@@ -160,4 +160,5 @@
/* Contextual menu alert remove contact {Name} */
"Are you sure you want to delete contact \"%@\"" = "Are you sure you want to delete contact \"%@\"";
/* No password on this account text field placeholder */
"Account has no password" = "Account has no password";
ui/Base.lproj/PasswordChange.strings 0 → 100644
View file @ 1f70f720
/* Class = "NSTextFieldCell"; title = "Repeat"; ObjectID = "8KO-IO-ykP"; */
"8KO-IO-ykP.title" = "Repeat";
/* Class = "NSButtonCell"; title = "Accept"; ObjectID = "Ggu-EQ-cqC"; */
"Ggu-EQ-cqC.title" = "Accept";
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "MZw-ep-8aW"; */
"MZw-ep-8aW.title" = "Cancel";
/* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
"WyU-Dx-U1u.title" = "Password is incorrect";
/* Class = "NSTextFieldCell"; title = "Enter your old password"; ObjectID = "gPw-Jf-0M7"; */
"gPw-Jf-0M7.title" = "Enter your old password";
/* Class = "NSTextFieldCell"; title = "Chose a new password"; ObjectID = "pZe-DO-jWp"; */
"pZe-DO-jWp.title" = "Chose a new password";
ui/Base.lproj/PasswordChange.xib 0 → 100644
View file @ 1f70f720
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PasswordChangeWC">
<connections>
<outlet property="acceptButton" destination="seS-xB-tV5" id="4kc-f1-OeT"/>
<outlet property="newPassword" destination="PqU-pv-omA" id="jSb-2F-QX4"/>
<outlet property="oldPassword" destination="9cq-HX-es7" id="EhQ-3P-6tD"/>
<outlet property="repeatPasswordValid" destination="MDW-YB-UdP" id="eKc-Tz-wbe"/>
<outlet property="repeatedPassword" destination="rsK-Ce-Yjg" id="ULJ-P0-CFc"/>
<outlet property="window" destination="QvC-M9-y7g" id="t2o-0F-5GV"/>
<outlet property="wrongPasswordPopover" destination="dXH-gj-YS1" id="Zg2-bx-IsO"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="196" y="240" width="360" height="270"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1200"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="360" height="270"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WzW-UV-89z">
<rect key="frame" x="105" y="233" width="151" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Enter your old password" id="gPw-Jf-0M7">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9cq-HX-es7">
<rect key="frame" x="80" y="203" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="8Hg-Hs-5ut"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="Kwp-mD-Y94">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<allowedInputSourceLocales>
<string>NSAllRomanInputSourcesLocaleIdentifier</string>
</allowedInputSourceLocales>
</secureTextFieldCell>
<connections>
<outlet property="nextKeyView" destination="PqU-pv-omA" id="y8K-HL-XAh"/>
</connections>
</secureTextField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Im-C5-CMq">
<rect key="frame" x="108" y="178" width="144" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Chose a new password" id="pZe-DO-jWp">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PqU-pv-omA">
<rect key="frame" x="80" y="148" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="IXh-m8-u8G"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="4aD-Xd-zHS">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<allowedInputSourceLocales>
<string>NSAllRomanInputSourcesLocaleIdentifier</string>
</allowedInputSourceLocales>
</secureTextFieldCell>
<connections>
<outlet property="delegate" destination="-2" id="oYh-t6-XBl"/>
<outlet property="nextKeyView" destination="rsK-Ce-Yjg" id="8pk-u9-e4k"/>
</connections>
</secureTextField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5ia-te-vKr">
<rect key="frame" x="157" y="123" width="47" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Repeat" id="8KO-IO-ykP">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rsK-Ce-Yjg">
<rect key="frame" x="80" y="93" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="OW4-Ma-jVD"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="1Bs-Te-34p">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<allowedInputSourceLocales>
<string>NSAllRomanInputSourcesLocaleIdentifier</string>
</allowedInputSourceLocales>
</secureTextFieldCell>
<connections>
<outlet property="delegate" destination="-2" id="rf5-D9-FDQ"/>
<outlet property="nextKeyView" destination="seS-xB-tV5" id="CcB-mp-G2l"/>
</connections>
</secureTextField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="seS-xB-tV5">
<rect key="frame" x="263" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Accept" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ggu-EQ-cqC">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
<connections>
<action selector="accept:" target="-2" id="NoD-C6-WkZ"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JhZ-ld-LcB" userLabel="Cancel Button">
<rect key="frame" x="14" y="13" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="MZw-ep-8aW">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<connections>
<action selector="cancel:" target="-2" id="DeK-Yo-ovh"/>
</connections>
</button>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="MDW-YB-UdP" userLabel="Repeat Password Valid">
<rect key="frame" x="290" y="94" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="hgH-sU-wSP"/>
<constraint firstAttribute="width" constant="20" id="zM6-JX-AC4"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_action_accept" id="ey0-z1-4gC"/>
</imageView>
</subviews>
<constraints>
<constraint firstItem="WzW-UV-89z" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="03C-xA-OdE"/>
<constraint firstItem="WzW-UV-89z" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="3vF-t1-zk8"/>
<constraint firstItem="MDW-YB-UdP" firstAttribute="leading" secondItem="rsK-Ce-Yjg" secondAttribute="trailing" constant="10" id="4VK-G7-FAk"/>
<constraint firstItem="JhZ-ld-LcB" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="5af-Ju-GWp"/>
<constraint firstAttribute="bottom" secondItem="JhZ-ld-LcB" secondAttribute="bottom" constant="20" symbolic="YES" id="D0g-5h-y7K"/>
<constraint firstItem="MDW-YB-UdP" firstAttribute="centerY" secondItem="rsK-Ce-Yjg" secondAttribute="centerY" id="EuF-uO-iSK"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="FFe-hI-kjr"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="J5J-bS-nzy"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="top" secondItem="3Im-C5-CMq" secondAttribute="bottom" constant="8" symbolic="YES" id="LYL-rT-XNB"/>
<constraint firstAttribute="trailing" secondItem="seS-xB-tV5" secondAttribute="trailing" constant="20" symbolic="YES" id="Xpb-aW-EKc"/>
<constraint firstAttribute="bottom" secondItem="seS-xB-tV5" secondAttribute="bottom" constant="20" symbolic="YES" id="bZM-wc-8f8"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="ceT-Yt-7Mh"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="top" secondItem="WzW-UV-89z" secondAttribute="bottom" constant="8" symbolic="YES" id="dyC-hJ-zVI"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="top" secondItem="9cq-HX-es7" secondAttribute="bottom" constant="8" symbolic="YES" id="nOP-xn-dkD"/>
<constraint firstItem="seS-xB-tV5" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="JhZ-ld-LcB" secondAttribute="trailing" constant="10" id="rL7-Qc-5sG"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="top" secondItem="PqU-pv-omA" secondAttribute="bottom" constant="8" symbolic="YES" id="sX1-Ud-AtO"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="top" secondItem="5ia-te-vKr" secondAttribute="bottom" constant="8" symbolic="YES" id="u4a-Ck-I3E"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="vYP-fY-5gW"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="zg9-xz-cwh"/>
</constraints>
</view>
<connections>
<outlet property="delegate" destination="-2" id="GRg-mb-WK3"/>
</connections>
<point key="canvasLocation" x="79" y="161"/>
</window>
<customView id="HcU-ok-7c8">
<rect key="frame" x="0.0" y="0.0" width="350" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TKu-5d-a6L">
<rect key="frame" x="0.0" y="14" width="350" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Password is incorrect" id="WyU-Dx-U1u">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<point key="canvasLocation" x="-66" y="488.5"/>
</customView>
<viewController id="iMn-VI-hGx" userLabel="Wrong Password Popover View Controller">
<connections>
<outlet property="view" destination="HcU-ok-7c8" id="V0d-mp-g7d"/>
</connections>
</viewController>
<popover behavior="t" id="dXH-gj-YS1" userLabel="Wrong Password Popover">
<connections>
<outlet property="contentViewController" destination="iMn-VI-hGx" id="oBf-69-xtE"/>
</connections>
</popover>
</objects>
<resources>
<image name="ic_action_accept" width="72" height="72"/>
</resources>
</document>
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