login process refactored

src/app/boot/app_controller.nim

@@ -42,7 +42,7 @@ proc load*(self: AppController)
 
 # Startup Module Delegate Interface
 proc startupDidLoad*(self: AppController)
-proc accountCreated*(self: AppController)
+proc userLoggedIn*(self: AppController)
 
 # Main Module Delegate Interface
 proc mainDidLoad*(self: AppController)
@@ -114,7 +114,6 @@ proc mainDidLoad*(self: AppController) =
   # self.appService.status.events.emit("loginCompleted", self.accountArgs)
 
 proc start*(self: AppController) =
-  echo "AppStart"
   self.accountsService.init()
   
   self.startupModule.load()
@@ -126,6 +125,5 @@ proc load*(self: AppController) =
   
   self.mainModule.load()
 
-proc accountCreated*(self: AppController) =
-  echo "AppController account created"
+proc userLoggedIn*(self: AppController) =
   self.load()

src/app/modules/startup/controller.nim

@@ -1,29 +1,51 @@
-import Tables
+import Tables, chronicles
 
 import controller_interface
 import io_interface
 
+import status/[signals]
+import ../../../app_service/[main]
 import ../../../app_service/service/accounts/service_interface as accounts_service
 
 export controller_interface
 
+logScope:
+  topics = "startup-controller"
+
 type 
   Controller* = ref object of controller_interface.AccessInterface
     delegate: io_interface.AccessInterface
+    appService: AppService
     accountsService: accounts_service.ServiceInterface
 
 proc newController*(delegate: io_interface.AccessInterface,
+  appService: AppService,
   accountsService: accounts_service.ServiceInterface): 
   Controller =
   result = Controller()
   result.delegate = delegate
+  result.appService = appService
   result.accountsService = accountsService
   
 method delete*(self: Controller) =
   discard
 
 method init*(self: Controller) = 
-  discard
+  self.appService.status.events.on(SignalType.NodeLogin.event) do(e:Args):
+    let signal = NodeSignal(e)
+    if signal.event.error == "":
+      self.delegate.userLoggedIn()
+    else:
+      error "error: ", methodName="init", errDesription = "login error " & signal.event.error
+
+  self.appService.status.events.on(SignalType.NodeStopped.event) do(e:Args):
+    echo "-NEW-EVENT-- NodeStopped: ", repr(e)
+    #self.status.events.emit("nodeStopped", Args())
+    #self.view.onLoggedOut()
+
+  self.appService.status.events.on(SignalType.NodeReady.event) do(e:Args):
+    echo "-NEW-EVENT-- NodeReady: ", repr(e)
+    #self.status.events.emit("nodeReady", Args())
 
 method shouldStartWithOnboardingScreen*(self: Controller): bool =
   return self.accountsService.openedAccounts().len == 0

src/app/modules/startup/io_interface.nim

@@ -16,4 +16,4 @@ include ./private_interfaces/module_login_delegate_interface
 type
   DelegateInterface* = concept c
     c.startupDidLoad()
-    c.accountCreated()
+    c.userLoggedIn()

src/app/modules/startup/login/controller.nim

@@ -29,21 +29,25 @@ method delete*(self: Controller) =
   discard
 
 method init*(self: Controller) = 
-  self.appService.status.events.on(SignalType.NodeStopped.event) do(e:Args):
-    echo "-NEW-LOGIN-- NodeStopped: ", repr(e)
-    #self.status.events.emit("nodeStopped", Args())
-    #self.view.onLoggedOut()
-
-  self.appService.status.events.on(SignalType.NodeReady.event) do(e:Args):
-    echo "-NEW-LOGIN-- NodeReady: ", repr(e)
-    #self.status.events.emit("nodeReady", Args())
-
   self.appService.status.events.on(SignalType.NodeLogin.event) do(e:Args):
-    echo "-NEW-LOGIN-- NodeLogin: ", repr(e)
-    #self.handleNodeLogin(NodeSignal(e))
+    let signal = NodeSignal(e)
+    if signal.event.error != "":
+      self.delegate.loginAccountError(signal.event.error)
 
 method getOpenedAccounts*(self: Controller): seq[AccountDto] =
   return self.accountsService.openedAccounts()
 
 method setSelectedAccountKeyUid*(self: Controller, keyUid: string) =
-  self.selectedAccountKeyUid = keyUid
+  self.selectedAccountKeyUid = keyUid
+
+method login*(self: Controller, password: string) =
+  let openedAccounts = self.getOpenedAccounts()
+  var selectedAccount: AccountDto
+  for acc in openedAccounts:
+    if(acc.keyUid == self.selectedAccountKeyUid):
+      selectedAccount = acc
+      break
+
+  let error = self.accountsService.login(selectedAccount, password)
+  if(error.len > 0):
+    self.delegate.loginAccountError(error)

src/app/modules/startup/login/controller_interface.nim

@@ -14,4 +14,7 @@ method getOpenedAccounts*(self: AccessInterface): seq[AccountDto] {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method setSelectedAccountKeyUid*(self: AccessInterface, keyUid: string) {.base.} =
+  raise newException(ValueError, "No implementation available")
+
+method login*(self: AccessInterface, password: string) {.base.} =
   raise newException(ValueError, "No implementation available")

src/app/modules/startup/login/module.nim

@@ -72,4 +72,10 @@ method viewDidLoad*(self: Module) =
 
 method setSelectedAccount*(self: Module, item: Item) =
   self.controller.setSelectedAccountKeyUid(item.getKeyUid())
-  self.view.setSelectedAccount(item)
+  self.view.setSelectedAccount(item)
+
+method login*(self: Module, password: string) =
+  self.controller.login(password)
+
+method loginAccountError*(self: Module, error: string) =
+  self.view.loginAccountError(error)

src/app/modules/startup/login/private_interfaces/module_controller_delegate_interface.nim

@@ -0,0 +1,2 @@
+method loginAccountError*(self: AccessInterface, error: string) {.base.} =
+  raise newException(ValueError, "No implementation available")

src/app/modules/startup/login/private_interfaces/module_view_delegate_interface.nim

@@ -4,4 +4,7 @@ method viewDidLoad*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method setSelectedAccount*(self: AccessInterface, item: Item) {.base.} =
+  raise newException(ValueError, "No implementation available")
+
+method login*(self: AccessInterface, password: string) {.base.} =
   raise newException(ValueError, "No implementation available")

src/app/modules/startup/login/view.nim

@@ -58,4 +58,12 @@ QtObject:
 
   QtProperty[QVariant] accountsModel:
     read = getModel
-    notify = modelChanged
+    notify = modelChanged
+
+  proc login*(self: View, password: string) {.slot.} =
+    self.delegate.login(password)
+
+  proc accountLoginError*(self: View, error: string) {.signal.}
+
+  proc loginAccountError*(self: View, error: string) =
+    self.accountLoginError(error)

src/app/modules/startup/module.nim

@@ -29,7 +29,7 @@ proc newModule*[T](delegate: T,
   result.delegate = delegate
   result.view = view.newView(result)
   result.viewVariant = newQVariant(result.view)
-  result.controller = controller.newController(result, accountsService)
+  result.controller = controller.newController(result, appService, accountsService)
 
   # Submodules
   result.onboardingModule = onboarding_module.newModule(result, appService, accountsService)
@@ -73,8 +73,8 @@ method onboardingDidLoad*[T](self: Module[T]) =
 method loginDidLoad*[T](self: Module[T]) =
   self.checkIfModuleDidLoad()
 
-method accountCreated*[T](self: Module[T]) =
-  self.delegate.accountCreated()
+method userLoggedIn*[T](self: Module[T]) =
+  self.delegate.userLoggedIn()
 
 method moveToAppState*[T](self: Module[T]) =
   self.view.setAppState(AppState.MainAppState)

src/app/modules/startup/onboarding/controller.nim

@@ -35,12 +35,8 @@ method delete*(self: Controller) =
 method init*(self: Controller) = 
   self.appService.status.events.on(SignalType.NodeLogin.event) do(e:Args):
     let signal = NodeSignal(e)
-    echo "-NEW-ONBOARDING-- OnNodeLoginEvent: ", repr(signal)
-    if signal.event.error == "":
-      echo "-NEW-ONBOARDING-- OnNodeLoginEventA: ", repr(signal.event.error)
-      self.delegate.accountCreated()
-    else:
-      error "error: ", methodName="init", errDesription = "onboarding login error " & signal.event.error
+    if signal.event.error != "":
+      self.delegate.setupAccountError()
 
 method getGeneratedAccounts*(self: Controller): seq[GeneratedAccountDto] =
   return self.accountsService.generatedAccounts()

src/app/modules/startup/onboarding/module.nim

@@ -60,9 +60,6 @@ method setSelectedAccountByIndex*(self: Module, index: int) =
 method storeSelectedAccountAndLogin*(self: Module, password: string) =
   self.controller.storeSelectedAccountAndLogin(password)
 
-method accountCreated*(self: Module) =
-  self.delegate.accountCreated()
-
 method setupAccountError*(self: Module) =
   self.view.setupAccountError()
 

src/app/modules/startup/onboarding/private_interfaces/module_controller_delegate_interface.nim

@@ -1,6 +1,3 @@
-method accountCreated*(self: AccessInterface) {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method setupAccountError*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")
 

src/app/modules/startup/onboarding/view.nim

@@ -80,7 +80,9 @@ QtObject:
   proc accountImportError*(self: View) {.signal.}
 
   proc importAccountError*(self: View) =
-    self.accountImportError() # In QML we can connect to this signal and notify a user
+    # In QML we can connect to this signal and notify a user
+    # before refactoring we didn't have this signal
+    self.accountImportError()
 
   proc importAccountSuccess*(self: View) =
     self.importedAccountChanged()

src/app/modules/startup/private_interfaces/module_controller_delegate_interface.nim

@@ -0,0 +1,2 @@
+method userLoggedIn*(self: AccessInterface) {.base.} =
+  raise newException(ValueError, "No implementation available")

src/app/modules/startup/private_interfaces/module_onboarding_delegate_interface.nim

@@ -1,5 +1,2 @@
 method onboardingDidLoad*(self: AccessInterface) {.base.} =
-  raise newException(ValueError, "No implementation available")
-
-method accountCreated*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")

src/app_service/service/accounts/dto/accounts.nim

@@ -44,5 +44,6 @@ proc toAccountDto*(jsonObj: JsonNode): AccountDto =
   discard jsonObj.getProp("key-uid", result.keyUid)
   
   var imagesObj: JsonNode
-  if(jsonObj.getProp("images", imagesObj)):
-    result.images.add(toImage(imagesObj))
+  if(jsonObj.getProp("images", imagesObj) and imagesObj.kind == JArray):
+    for imgObj in imagesObj:
+      result.images.add(toImage(imgObj))

src/app_service/service/accounts/service.nim

@@ -1,4 +1,5 @@
-import Tables, json, sequtils, strutils, strformat, uuids, chronicles
+import Tables, json, sequtils, strutils, strformat, uuids
+import json_serialization, chronicles
 
 import service_interface
 import ./dto/accounts
@@ -282,4 +283,31 @@ method importMnemonic*(self: Service, mnemonic: string): bool =
   
   except Exception as e:
     error "error: ", methodName="importMnemonic", errName = e.name, errDesription = e.msg
-    return false
+    return false
+
+method login*(self: Service, account: AccountDto, password: string): string =
+  try:
+    let hashedPassword = hashString(password)
+    var thumbnailImage: string
+    var largeImage: string
+    for img in account.images:
+      if(img.imgType == "thumbnail"):
+        thumbnailImage = img.uri
+      elif(img.imgType == "large"):
+        largeImage = img.uri
+
+    let response = status_go.login(account.name, account.keyUid, hashedPassword,
+    account.identicon, thumbnailImage, largeImage)
+
+    var error = "response doesn't contain \"error\""
+    if(response.result.contains("error")):
+      error = response.result["error"].getStr
+      if error == "":
+        debug "Account logged in"
+        self.loggedInAccount = account
+
+    return error
+
+  except Exception as e:
+    error "error: ", methodName="setupAccount", errName = e.name, errDesription = e.msg
+    return e.msg

src/app_service/service/accounts/service_interface.nim

@@ -44,4 +44,8 @@ method validateMnemonic*(self: ServiceInterface, mnemonic: string):
   raise newException(ValueError, "No implementation available")
 
 method importMnemonic*(self: ServiceInterface, mnemonic: string): bool {.base.} =
+  raise newException(ValueError, "No implementation available")
+
+method login*(self: ServiceInterface, account: AccountDto, password: string): 
+  string {.base.} =
   raise newException(ValueError, "No implementation available")

ui/app/AppLayouts/Chat/ChatLayout.qml

@@ -164,24 +164,14 @@ StatusAppThreePanelLayout {
         sourceComponent: appSettings.communitiesEnabled && root.rootStore.chatsModelInst.communities.activeCommunity.active ? communtiyColumnComponent : contactsColumnComponent
     }
 
-//    centerPanel: ChatColumn {
-//        id: chatColumn
-//        chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
-//    }
-
-    centerPanel: Rectangle {
+    centerPanel: ChatColumn {
         id: chatColumn
-        anchors.fill: parent
-        color: "green"
+        chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
     }
 
     showRightPanel: (appSettings.expandUsersList && (appSettings.showOnlineUsers || chatsModel.communities.activeCommunity.active)
                     && (chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne))
-    //rightPanel: appSettings.communitiesEnabled && chatsModel.communities.activeCommunity.active ? communityUserListComponent : userListComponent
-    rightPanel: Rectangle {
-        anchors.fill: parent
-        color: "blue"
-    }
+    rightPanel: appSettings.communitiesEnabled && chatsModel.communities.activeCommunity.active ? communityUserListComponent : userListComponent
 
     Component {
         id: communityUserListComponent

ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml

@@ -160,7 +160,9 @@ ModalPopup {
                 if (storingPasswordModal)
                 {
                     accountSettings.storeToKeychain = Constants.storeToKeychainValueStore
-                    loginModel.storePassword(profileModel.profile.username, repeatPasswordField.text)
+                    // NEED TO HANDLE IT
+                    // This part should be done via PrivacyAndSecurity submodule section of ProfileSection module
+//                    loginModel.storePassword(profileModel.profile.username, repeatPasswordField.text)
                     popup.close()
                 }
                 else

ui/app/AppLayouts/Onboarding/views/LoginView.qml

@@ -227,25 +227,23 @@ Item {
             }
         }
 
-        // NEED TO HANDLE IT
-//        Connections {
-//            target: LoginStore.loginModelInst
-//            ignoreUnknownSignals: true
-//            onLoginResponseChanged: {
-//                if (error) {
-//                    // SQLITE_NOTADB: "file is not a database"
-//                    if (error === "file is not a database") {
-//                        errMsg.text = errMsg.incorrectPasswordMsg
-//                    } else {
-//                        //% "Login failed: %1"
-//                        errMsg.text = qsTrId("login-failed---1").arg(error.toUpperCase())
-//                    }
-//                    errMsg.visible = true
-//                    loading = false
-//                    txtPassword.textField.forceActiveFocus()
-//                }
-//            }
-//        }
+        Connections {
+            target: LoginStore.loginModul
+            onAccountLoginError: {
+                if (error) {
+                    // SQLITE_NOTADB: "file is not a database"
+                    if (error === "file is not a database") {
+                        errMsg.text = errMsg.incorrectPasswordMsg
+                    } else {
+                        //% "Login failed: %1"
+                        errMsg.text = qsTrId("login-failed---1").arg(error.toUpperCase())
+                    }
+                    errMsg.visible = true
+                    loading = false
+                    txtPassword.textField.forceActiveFocus()
+                }
+            }
+        }
 
         StatusQControls.StatusFlatButton {
             id: generateKeysLinkText

ui/main.qml

@@ -320,7 +320,8 @@ StatusWindow {
 
         onConfirmButtonClicked: {
             accountSettings.storeToKeychain = Constants.storeToKeychainValueStore
-            loginModel.storePassword(username, password)
+            // This is need to be handled using KeyChain service via LoginModule
+//            loginModel.storePassword(username, password)
             finish()
         }