login flow

iOSClient/AppDelegate.m

@@ -346,16 +346,18 @@
     
     @synchronized (self) {
 
-        // only for Band : LoginWeb
-        if ([NCBrandOptions sharedInstance].use_login_web && _activeLoginWeb == nil) {
+        // only for personalized LoginWeb
+        if ([NCBrandOptions sharedInstance].use_login_web_personalized) {
             
-            _activeLoginWeb = [CCLoginWeb new];
-            _activeLoginWeb.delegate = delegate;
-            _activeLoginWeb.loginType = loginType;
+            if (_activeLoginWeb == nil) {
+                _activeLoginWeb = [CCLoginWeb new];
+                _activeLoginWeb.delegate = delegate;
+                _activeLoginWeb.loginType = loginType;
                 
-            dispatch_async(dispatch_get_main_queue(), ^ {
-                [_activeLoginWeb presentModalWithDefaultTheme:delegate];
-            });
+                dispatch_async(dispatch_get_main_queue(), ^ {
+                    [_activeLoginWeb presentModalWithDefaultTheme:delegate];
+                });
+            }
             return;
         }
         
@@ -363,7 +365,7 @@
         //
         
         // Login flow : LoginWeb
-        if (loginType == loginModifyPasswordUser && [NCBrandOptions sharedInstance].use_login_web_flow) {
+        if (loginType == loginModifyPasswordUser) {
             tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             if (account.loginFlow)
                 loginWeb = YES;

iOSClient/Brand/NCBrand.swift

@@ -76,8 +76,9 @@ class NCBrandColor: NSObject {
     @objc public let textLoginProvider:               String = "_login_bottom_label_"
     @objc public let middlewarePingUrl:               String = ""
     @objc public let webLoginAutenticationProtocol:   String = "nc://"                                          // example "abc://"
-    @objc public let webCloseViewProtocol:            String = ""                                               // example "abc://change/plan"
-    @objc public let folderBrandAutoUpload:           String = ""                                               // example "_auto_upload_folder_"
+    // Personalized
+    @objc public let webCloseViewProtocolPersonalized:String = ""                                               // example "abc://change/plan"      Don't touch me !!
+    @objc public let folderBrandAutoUpload:           String = ""                                               // example "_auto_upload_folder_"   Don't touch me !!
 
     // Auto Upload default folder
     @objc public var folderDefaultAutoUpload:         String = "Photos"
@@ -86,8 +87,7 @@ class NCBrandColor: NSObject {
     @objc public let capabilitiesGroups:              String = "group.it.twsweb.Crypto-Cloud"
     
     // Options
-    @objc public let use_login_web:                   Bool = false
-    @objc public let use_login_web_flow:              Bool = true
+    @objc public let use_login_web_personalized:      Bool = false                                              // Don't touch me !!
     @objc public let use_firebase:                    Bool = false
     @objc public let use_default_auto_upload:         Bool = false
     @objc public let use_themingColor:                Bool = true

iOSClient/Login/CCLogin.m

@@ -97,23 +97,19 @@
 
     if (_loginType == loginAdd) {
         // Login Flow ?
-        if ([NCBrandOptions sharedInstance].use_login_web_flow) {
-            _imageUser.hidden = YES;
-            _user.hidden = YES;
-            _imagePassword.hidden = YES;
-            _password.hidden = YES;
-        }
+        _imageUser.hidden = YES;
+        _user.hidden = YES;
+        _imagePassword.hidden = YES;
+        _password.hidden = YES;
     }
     
     if (_loginType == loginAddForced) {
         _annulla.hidden = YES;
         // Login Flow ?
-        if ([NCBrandOptions sharedInstance].use_login_web_flow) {
-            _imageUser.hidden = YES;
-            _user.hidden = YES;
-            _imagePassword.hidden = YES;
-            _password.hidden = YES;
-        }
+        _imageUser.hidden = YES;
+        _user.hidden = YES;
+        _imagePassword.hidden = YES;
+        _password.hidden = YES;
     }
     
     if (_loginType == loginModifyPasswordUser) {

iOSClient/Login/CCLoginWeb.swift

@@ -66,7 +66,7 @@ extension CCLoginWeb: SwiftModalWebVCDelegate {
                     var serverUrl : String = keyValue[0].replacingOccurrences(of: "/server:", with: "")
                     
                     // Login Flow
-                    if NCBrandOptions.sharedInstance.use_login_web_flow == true {
+                    if (NCBrandOptions.sharedInstance.use_login_web_personalized == false) {
                         
                         if (self.urlBase.hasPrefix("http://")) {
                             serverUrl = "http://" + serverUrl;
@@ -84,7 +84,8 @@ extension CCLoginWeb: SwiftModalWebVCDelegate {
                 
                     let account : String = "\(username) \(serverUrl)"
                 
-                    if (loginType == loginModifyPasswordUser && NCBrandOptions.sharedInstance.use_login_web_flow) {
+                    // Login Flow
+                    if (loginType == loginModifyPasswordUser && NCBrandOptions.sharedInstance.use_login_web_personalized == false) {
                         
                         // Verify if change the active account
                         guard let activeAccount = NCManageDatabase.sharedInstance.getAccountActive() else {

iOSClient/Main/CCMore.swift

@@ -409,7 +409,7 @@ extension CCMore: SwiftModalWebVCDelegate, SwiftWebVCDelegate{
         let urlString: String = url.absoluteString.lowercased()
         
         // Protocol close webVC
-        if (urlString.contains(NCBrandOptions.sharedInstance.webCloseViewProtocol) == true) {
+        if (urlString.contains(NCBrandOptions.sharedInstance.webCloseViewProtocolPersonalized) == true) {
             
             if (self.presentingViewController != nil) {
                 self.dismiss(animated: true, completion: nil)