Restrucutred Settings and extracts Password edit

Introduced custom save palen accessory view to enable save in different formats (unfunctional for now) Started reworking drag and drop of entries and groups
2025-12-14 17:32:17 +00:00 · 2013-08-11 17:58:39 +02:00
parent 116b3b3253
commit 86e97ad767
22 changed files with 2919 additions and 1559 deletions
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -0,0 +1,141 @@
+//
+//  MPPasswordEditWindowController.m
+//  MacPass
+//
+//  Created by Michael Starke on 10.08.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPPasswordEditWindowController.h"
+#import "MPDocument.h"
+
+#import "HNHRoundedSecureTextField.h"
+#import "NSString+Empty.h"
+
+@interface MPPasswordEditWindowController () {
+  MPDocument * __unsafe_unretained _document;
+}
+@property (nonatomic,assign) BOOL showPassword;
+@property (nonatomic,assign) BOOL hasValidPasswordOrKey;
+@property (nonatomic,weak) NSURL *keyURL;
+
+@end
+
+@implementation MPPasswordEditWindowController
+
+- (id)initWithDocument:(MPDocument *)document {
+  self = [super initWithWindowNibName:@"PasswordEditWindow"];
+  if(self){
+    _showPassword = NO;
+    _hasValidPasswordOrKey = NO;
+    _document = document;
+  }
+  return self;
+}
+
+- (void)windowDidLoad {
+  [super windowDidLoad];
+  [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
+}
+
+- (void)updateView {
+  if(!self.isDirty) {
+    return;
+  }
+  self.showPassword = NO;
+  [self.passwordTextField setStringValue:_document.password ? _document.password : @""];
+  [self.passwordRepeatTextField setStringValue:[self.passwordTextField stringValue]];
+  self.keyURL = _document.key;
+  
+  NSDictionary *negateOption = @{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName };
+  [self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
+  [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
+  [self.passwordRepeatTextField bind:NSEnabledBinding toObject:self withKeyPath:@"showPassword" options:negateOption];
+  [self.errorTextField bind:NSHiddenBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
+  [self.changePasswordButton bind:NSEnabledBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
+  [self.keyfilePathControl bind:NSValueBinding toObject:self withKeyPath:@"keyURL" options:nil];
+  
+  [self.passwordRepeatTextField setDelegate:self];
+  [self.passwordTextField setDelegate:self];
+  
+  /* Manually initate the first check */
+  [self _verifyPasswordAndKey];
+  self.isDirty = NO;
+}
+
+- (void)setShowPassword:(BOOL)showPassword {
+  if(_showPassword != showPassword) {
+    _showPassword = showPassword;
+    
+    [self.passwordRepeatTextField setStringValue:@""];
+    [self _verifyPasswordAndKey];
+  }
+}
+- (void)setKeyURL:(NSURL *)keyURL {
+  _keyURL = keyURL;
+  [self _verifyPasswordAndKey];
+}
+
+#pragma mark Actions
+- (IBAction)save:(id)sender {
+  _document.password = [self.passwordTextField stringValue];
+  _document.key = [self.keyfilePathControl URL];
+  [self dismissSheet:NSRunStoppedResponse];
+}
+
+- (IBAction)cancel:(id)sender {
+  [self dismissSheet:NSRunAbortedResponse];
+}
+
+- (IBAction)clearKey:(id)sender {
+  self.keyURL = nil;
+}
+
+- (IBAction)generateKey:(id)sender {
+}
+
+#pragma mark NSTextFieldDelegate
+- (void)controlTextDidChange:(NSNotification *)obj {
+  [self _verifyPasswordAndKey];
+}
+
+- (void)_verifyPasswordAndKey {
+  NSString *password = [self.passwordTextField stringValue];
+  NSString *repeat = [self.passwordRepeatTextField stringValue];
+  BOOL hasKey = (self.keyURL != nil);
+  BOOL keyOk = YES;
+  if(hasKey) {
+    keyOk = [self.keyURL checkResourceIsReachableAndReturnError:nil];
+  }
+  BOOL hasPassword = ![NSString isEmptyString:password];
+  if(!self.showPassword) {
+    hasPassword |= ![NSString isEmptyString:repeat];
+  }
+  BOOL passwordOk = YES;
+  if(hasPassword ) {
+    passwordOk = [password isEqualToString:repeat] || self.showPassword;
+  }
+  BOOL hasPasswordOrKey = (hasKey || hasPassword);
+  keyOk = hasKey ? keyOk : YES;
+  passwordOk = hasPassword ? passwordOk : YES;
+  self.hasValidPasswordOrKey = passwordOk && keyOk;
+  
+  if(!hasPasswordOrKey) {
+    [self.errorTextField setTextColor:[NSColor controlTextColor]];
+    [self.errorTextField setStringValue:NSLocalizedString(@"WARNING_NO_PASSWORD_OR_KEYFILE", "No Key or Password")];
+    return; // alldone
+  }
+  [self.errorTextField setTextColor:[NSColor redColor]];
+  if(!passwordOk && !keyOk ) {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_PASSWORD_MISSMATCH_INVALID_KEYFILE", "Passwords do not match, keyfile is invalid")];
+  }
+  else if(!passwordOk) {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_PASSWORD_MISSMATCH", "Passwords do not match")];
+  }
+  else {
+    [self.errorTextField setStringValue:NSLocalizedString(@"ERROR_INVALID_KEYFILE", "Keyfile not valid")];
+  }
+}
+
+
+@end