commit 6495de896a3d949eff7df2c6e0596ba865940563
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Fri Apr 19 13:49:24 2019 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Fri Apr 19 13:49:24 2019 -0400
tree a3b3a9795d5affa67d36eb4ea2c464fb64956204
parent c8c7abc6b664da9fc30400f961277c5ae2b816d8

account: register username

Ask for password when register username.

Change-Id: I898f616a9f7c6a3596c3eb1384cdee79d8a65339

src/RegisterNameWC.h

diff --git a/src/RegisterNameWC.h b/src/RegisterNameWC.h
index 1179fc9..e2543a1 100644
--- a/src/RegisterNameWC.h
+++ b/src/RegisterNameWC.h
@@ -41,6 +41,10 @@
  */
 @property (assign)BOOL isUserNameAvailable;
 
+@property (assign)BOOL couldRegister;
+
+@property (assign)NSString* passwordString;
+
 @property std::string selectedAccountID;
 
 @end

src/RegisterNameWC.mm

diff --git a/src/RegisterNameWC.mm b/src/RegisterNameWC.mm
index 7f8ec64..e598b4d 100644
--- a/src/RegisterNameWC.mm
+++ b/src/RegisterNameWC.mm
@@ -30,6 +30,9 @@
 @implementation RegisterNameWC
 {
     __unsafe_unretained IBOutlet NSTextField* registeredNameField;
+    __unsafe_unretained IBOutlet NSSecureTextField* passwordField;
+    __unsafe_unretained IBOutlet NSTextField* passwordLabel;
+    __unsafe_unretained IBOutlet NSLayoutConstraint* passwordTopConstraint;
     __unsafe_unretained IBOutlet NSImageView* ivLookupResult;
     __unsafe_unretained IBOutlet NSProgressIndicator* indicatorLookupResult;
 
@@ -39,10 +42,12 @@
     QMetaObject::Connection registeredNameFound;
 
     BOOL lookupQueued;
+    BOOL needPassword;
     NSString* usernameWaitingForLookupResult;
 }
 
 NSInteger const BLOCKCHAIN_NAME_TAG             = 2;
+NSInteger const PASSWORD_TAG             = 3;
 
 @synthesize accountModel;
 
@@ -59,6 +64,11 @@
 {
     [super windowDidLoad];
     auto accounts = self.accountModel->getAccountList();
+    lrc::api::account::ConfProperties_t accountProperties = self.accountModel->getAccountConfig(self.selectedAccountID);
+    needPassword = accountProperties.archiveHasPassword;
+    [passwordField setHidden: !needPassword];
+    [passwordLabel setHidden: !needPassword];
+    passwordTopConstraint.constant = needPassword ? 20.0 : -20.0;
     [registeredNameField setTag:BLOCKCHAIN_NAME_TAG];
     [ivLookupResult setHidden:YES];
     [indicatorLookupResult setHidden:YES];
@@ -81,6 +91,10 @@
 - (void)onUsernameAvailabilityChangedWithNewAvailability:(BOOL)newAvailability
 {
     self.isUserNameAvailable = newAvailability;
+
+    self.couldRegister = needPassword ?
+    self.isUserNameAvailable && [self.passwordString length] > 0 :
+    self.isUserNameAvailable;
 }
 
 - (void)hideLookupSpinner
@@ -162,15 +176,18 @@
 - (void)controlTextDidChange:(NSNotification *)notif
 {
     NSTextField* textField = [notif object];
-    if (textField.tag != BLOCKCHAIN_NAME_TAG) {
-        return;
-    }
-    NSString* alias = textField.stringValue;
+    if (textField.tag == BLOCKCHAIN_NAME_TAG) {
+        NSString* alias = textField.stringValue;
 
-    [self showLookupSpinner];
-    [self onUsernameAvailabilityChangedWithNewAvailability:NO];
-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
-    [self performSelector:@selector(lookUp:) withObject:alias afterDelay:0.5];
+        [self showLookupSpinner];
+        [self onUsernameAvailabilityChangedWithNewAvailability:NO];
+        [NSObject cancelPreviousPerformRequestsWithTarget:self];
+        [self performSelector:@selector(lookUp:) withObject:alias afterDelay:0.5];
+    } else if (textField.tag == PASSWORD_TAG) {
+        self.couldRegister = needPassword ?
+        self.isUserNameAvailable && [self.passwordString length] > 0 :
+        self.isUserNameAvailable;
+    }
 }
 
 - (void) lookUp:(NSString*) name
@@ -186,11 +203,17 @@
 
 - (IBAction)registerUsername:(id)sender
 {
+    NSString *password = passwordField.stringValue;
+    if((!password || [password length] == 0) && needPassword) {
+        return;
+    }
     [registrationProgress startAnimation:nil];
     [self showLoading];
     [self setCallback];
 
-    self.isUserNameAvailable = self.accountModel->registerName(self.selectedAccountID, "", [registeredNameField.stringValue UTF8String]);
+    self.isUserNameAvailable = self.accountModel->registerName(self.selectedAccountID,
+                                                               [password UTF8String],
+                                                               [registeredNameField.stringValue UTF8String]);
     if (!self.isUserNameAvailable) {
         NSLog(@"Could not initialize registerName operation");
         QObject::disconnect(registrationEnded);