login flow

iOSClient/Library/SwiftWebVC/SwiftWebVC.swift

@@ -101,6 +101,7 @@ public class SwiftWebVC: UIViewController {
     public convenience init(aRequest: URLRequest, hideToolbar: Bool) {
         self.init()
         self.request = aRequest
+        self.request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
         self.hideToolbar = hideToolbar
     }
     
@@ -108,12 +109,8 @@ public class SwiftWebVC: UIViewController {
         
         let userAgent : String = CCUtility.getUserAgent()
         
-        if #available(iOS 9.0, *) {
-            webView.customUserAgent = userAgent
-        } else {
-            // Fallback on earlier versions
-            UserDefaults.standard.register(defaults: ["UserAgent": userAgent])
-        }
+        webView.customUserAgent = userAgent
+       
         webView.load(request)
     }
     

iOSClient/Login/CCLogin.h

@@ -27,6 +27,8 @@
 #import "CCCertificate.h"
 #import "OCNetworking.h"
 
+@class CCLoginWeb;
+
 @protocol CCLoginDelegate <NSObject>
 
 - (void) loginSuccess:(NSInteger)loginType;

iOSClient/Login/CCLogin.m

@@ -217,7 +217,15 @@
 
                 } else {
                     
-                    
+                    [self dismissViewControllerAnimated:YES completion: ^{
+                        
+                        appDelegate.activeLoginWeb = [CCLoginWeb new];
+                        appDelegate.activeLoginWeb.loginType = _loginType;
+                        appDelegate.activeLoginWeb.delegate = self.delegate;
+                        appDelegate.activeLoginWeb.url = url;
+                        
+                        [appDelegate.activeLoginWeb presentModalWithDefaultTheme:(UIViewController *)self.delegate];
+                    }];
                 }
                 
             });
@@ -446,8 +454,8 @@
 
 - (IBAction)handlebaseUrlchange:(id)sender
 {
-    if ([self.baseUrl.text length] > 0)
-        [self performSelector:@selector(testUrl) withObject:nil];
+    //if ([self.baseUrl.text length] > 0)
+    //    [self performSelector:@selector(testUrl) withObject:nil];
 }
 
 - (IBAction)handleButtonLogin:(id)sender

iOSClient/Login/CCLoginWeb.swift

@@ -25,6 +25,7 @@ public class CCLoginWeb: UIViewController {
     
     @objc weak var delegate: CCLoginDelegateWeb?
     @objc var loginType = loginAdd
+    @objc var url = NCBrandOptions.sharedInstance.loginBaseUrl
     
     var viewController : UIViewController?
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
@@ -38,7 +39,7 @@ public class CCLoginWeb: UIViewController {
             doneButtonVisible = true
         }
         
-        let webVC = SwiftModalWebVC(urlString: NCBrandOptions.sharedInstance.loginBaseUrl, theme: .custom, color: NCBrandColor.sharedInstance.brand, colorText: NCBrandColor.sharedInstance.brandText, doneButtonVisible: doneButtonVisible, hideToolbar: true)
+        let webVC = SwiftModalWebVC(urlString: url, theme: .custom, color: NCBrandColor.sharedInstance.brand, colorText: NCBrandColor.sharedInstance.brandText, doneButtonVisible: doneButtonVisible, hideToolbar: true)
         webVC.delegateWeb = self
 
         vc.present(webVC, animated: false, completion: nil)

iOSClient/Main/CCMain.m

@@ -81,10 +81,6 @@
     NSString *_noFilesSearchDescription;
     NSTimer *_timerWaitInput;
 
-    // Login
-    CCLoginWeb *_loginWeb;
-    CCLogin *_loginVC;
-    
     // Automatic Upload Folder
     NSString *_autoUploadFileName;
     NSString *_autoUploadDirectory;