|
|
@@ -205,44 +205,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
|
|
|
@IBAction func actionCertificate(_ sender: Any) {
|
|
|
|
|
|
- let pathsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
|
|
|
- let fileNameCertificate = pathsDirectory.appendingPathComponent(NCGlobal.shared.certificate).path
|
|
|
- let directoryCertificate = CCUtility.getDirectoryCerificates()!
|
|
|
-
|
|
|
- var host = "cloud.nextcloud.com"
|
|
|
- if let url = URL(string: NCBrandOptions.shared.loginBaseUrl) {
|
|
|
- let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
|
|
|
- if let hostComponets = urlComponents?.host {
|
|
|
- host = hostComponets
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if FileManager.default.fileExists(atPath: fileNameCertificate) {
|
|
|
-
|
|
|
- let certificateToPath = directoryCertificate + "/" + host + ".der"
|
|
|
-
|
|
|
- if NCUtilityFileSystem.shared.moveFile(atPath: fileNameCertificate, toPath: certificateToPath) {
|
|
|
-
|
|
|
- let message = String(format: NSLocalizedString("_certificate_installed_", comment: ""), NCGlobal.shared.certificate)
|
|
|
- let alertController = UIAlertController(title: "", message: message, preferredStyle: .alert)
|
|
|
- alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { action in }))
|
|
|
- self.present(alertController, animated: true, completion: { })
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- let message = String(format: NSLocalizedString("_copy_failed_", comment: ""), NCGlobal.shared.certificate)
|
|
|
- let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: message, preferredStyle: .alert)
|
|
|
- alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { action in }))
|
|
|
- self.present(alertController, animated: true, completion: { })
|
|
|
- }
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- let message = String(format: NSLocalizedString("_certificate_not_found_", comment: ""), NCGlobal.shared.certificate)
|
|
|
- let alertController = UIAlertController(title: NSLocalizedString("_file_not_found_", comment: ""), message: message, preferredStyle: .alert)
|
|
|
- alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { action in }))
|
|
|
- self.present(alertController, animated: true, completion: { })
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
// MARK: - Login
|
|
|
@@ -250,42 +212,50 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
func isUrlValid(url: String) {
|
|
|
|
|
|
loginButton.isEnabled = false
|
|
|
- //activity.startAnimating()
|
|
|
|
|
|
NCCommunication.shared.getServerStatus(serverUrl: url) { (serverProductName, serverVersion, versionMajor, versionMinor, versionMicro, extendedSupport, errorCode ,errorDescription) in
|
|
|
|
|
|
if errorCode == 0 {
|
|
|
|
|
|
- NCNetworking.shared.writeCertificate(url: url)
|
|
|
+ if let host = URL(string: url)?.host {
|
|
|
+ NCNetworking.shared.writeCertificate(host: host)
|
|
|
+ }
|
|
|
|
|
|
NCCommunication.shared.getLoginFlowV2(serverUrl: url) { (token, endpoint, login, errorCode, errorDescription) in
|
|
|
|
|
|
self.loginButton.isEnabled = true
|
|
|
- //self.activity.stopAnimating()
|
|
|
|
|
|
// Login Flow V2
|
|
|
if errorCode == 0 && NCBrandOptions.shared.use_loginflowv2 && token != nil && endpoint != nil && login != nil {
|
|
|
|
|
|
- if let loginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb {
|
|
|
-
|
|
|
- loginWeb.urlBase = url
|
|
|
- loginWeb.loginFlowV2Available = true
|
|
|
- loginWeb.loginFlowV2Token = token!
|
|
|
- loginWeb.loginFlowV2Endpoint = endpoint!
|
|
|
- loginWeb.loginFlowV2Login = login!
|
|
|
-
|
|
|
- self.navigationController?.pushViewController(loginWeb, animated: true)
|
|
|
- }
|
|
|
+ NCNetworking.shared.checkPushNotificationServerProxyCertificateUntrusted(viewController: self, completion: { errorCode in
|
|
|
+ if errorCode == 0 {
|
|
|
+ if let loginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb {
|
|
|
+
|
|
|
+ loginWeb.urlBase = url
|
|
|
+ loginWeb.loginFlowV2Available = true
|
|
|
+ loginWeb.loginFlowV2Token = token!
|
|
|
+ loginWeb.loginFlowV2Endpoint = endpoint!
|
|
|
+ loginWeb.loginFlowV2Login = login!
|
|
|
+
|
|
|
+ self.navigationController?.pushViewController(loginWeb, animated: true)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
|
|
|
// Login Flow
|
|
|
} else if versionMajor >= NCGlobal.shared.nextcloudVersion12 {
|
|
|
|
|
|
- if let loginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb {
|
|
|
-
|
|
|
- loginWeb.urlBase = url
|
|
|
+ NCNetworking.shared.checkPushNotificationServerProxyCertificateUntrusted(viewController: self, completion: { errorCode in
|
|
|
+ if errorCode == 0 {
|
|
|
+ if let loginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb {
|
|
|
+
|
|
|
+ loginWeb.urlBase = url
|
|
|
|
|
|
- self.navigationController?.pushViewController(loginWeb, animated: true)
|
|
|
- }
|
|
|
+ self.navigationController?.pushViewController(loginWeb, animated: true)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
|
|
|
// NO Login flow available
|
|
|
} else if versionMajor < NCGlobal.shared.nextcloudVersion12 {
|
|
|
@@ -301,20 +271,18 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
} else {
|
|
|
|
|
|
self.loginButton.isEnabled = true
|
|
|
- //self.activity.stopAnimating()
|
|
|
|
|
|
if errorCode == NSURLErrorServerCertificateUntrusted {
|
|
|
|
|
|
let alertController = UIAlertController(title: NSLocalizedString("_ssl_certificate_untrusted_", comment: ""), message: NSLocalizedString("_connect_server_anyway_", comment: ""), preferredStyle: .alert)
|
|
|
|
|
|
alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .default, handler: { action in
|
|
|
- NCNetworking.shared.writeCertificate(url: url)
|
|
|
- self.appDelegate.startTimerErrorNetworking()
|
|
|
+ if let host = URL(string: url)?.host {
|
|
|
+ NCNetworking.shared.writeCertificate(host: host)
|
|
|
+ }
|
|
|
}))
|
|
|
|
|
|
- alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { action in
|
|
|
- self.appDelegate.startTimerErrorNetworking()
|
|
|
- }))
|
|
|
+ alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { action in }))
|
|
|
|
|
|
alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { action in
|
|
|
if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() {
|
|
|
@@ -322,9 +290,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
}
|
|
|
}))
|
|
|
|
|
|
- self.present(alertController, animated: true, completion: {
|
|
|
- self.appDelegate.timerErrorNetworking?.invalidate()
|
|
|
- })
|
|
|
+ self.present(alertController, animated: true)
|
|
|
|
|
|
} else {
|
|
|
|
|
|
@@ -338,19 +304,57 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // MARK: - QRCode
|
|
|
+
|
|
|
+ func dismissQRCode(_ value: String?, metadataType: String?) {
|
|
|
+
|
|
|
+ guard var value = value else { return }
|
|
|
+
|
|
|
+ let protocolLogin = NCBrandOptions.shared.webLoginAutenticationProtocol + "login/"
|
|
|
+
|
|
|
+ if value.hasPrefix(protocolLogin) && value.contains("user:") && value.contains("password:") && value.contains("server:") {
|
|
|
+
|
|
|
+ value = value.replacingOccurrences(of: protocolLogin, with: "")
|
|
|
+ let valueArray = value.components(separatedBy: "&")
|
|
|
+ if valueArray.count == 3 {
|
|
|
+
|
|
|
+ let user = valueArray[0].replacingOccurrences(of: "user:", with: "")
|
|
|
+ let password = valueArray[1].replacingOccurrences(of: "password:", with: "")
|
|
|
+ let urlBase = valueArray[2].replacingOccurrences(of: "server:", with: "")
|
|
|
+ let webDAV = NCUtilityFileSystem.shared.getWebDAV(account: appDelegate.account)
|
|
|
+ let serverUrl = urlBase + "/" + webDAV
|
|
|
+
|
|
|
+ loginButton.isEnabled = false
|
|
|
+
|
|
|
+ NCCommunication.shared.checkServer(serverUrl: serverUrl) { (errorCode, errorDescription) in
|
|
|
+
|
|
|
+ NCNetworking.shared.checkPushNotificationServerProxyCertificateUntrusted(viewController: self, completion: { errorCode in
|
|
|
+ if errorCode == 0 {
|
|
|
+ self.loginButton.isEnabled = true
|
|
|
+ self.standardLogin(url: urlBase, user: user, password: password, errorCode: errorCode, errorDescription: errorDescription)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
func standardLogin(url: String, user: String, password: String, errorCode: Int, errorDescription: String) {
|
|
|
|
|
|
if errorCode == 0 {
|
|
|
|
|
|
- NCNetworking.shared.writeCertificate(url: url)
|
|
|
+ if let host = URL(string: url)?.host {
|
|
|
+ NCNetworking.shared.writeCertificate(host: host)
|
|
|
+ }
|
|
|
|
|
|
let account = user + " " + url
|
|
|
|
|
|
if NCManageDatabase.shared.getAccounts() == nil {
|
|
|
NCUtility.shared.removeAllSettings()
|
|
|
}
|
|
|
-
|
|
|
- CCUtility.clearCertificateError(account)
|
|
|
+
|
|
|
+ // Clear certificate error
|
|
|
+ NCNetworking.shared.certificatesError.removeAll()
|
|
|
|
|
|
NCManageDatabase.shared.deleteAccount(account)
|
|
|
NCManageDatabase.shared.addAccount(account, urlBase: url, user: user, password: password)
|
|
|
@@ -388,13 +392,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
let alertController = UIAlertController(title: NSLocalizedString("_ssl_certificate_untrusted_", comment: ""), message: NSLocalizedString("_connect_server_anyway_", comment: ""), preferredStyle: .alert)
|
|
|
|
|
|
alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .default, handler: { action in
|
|
|
- NCNetworking.shared.writeCertificate(url: url)
|
|
|
- self.appDelegate.startTimerErrorNetworking()
|
|
|
+ if let host = URL(string: url)?.host {
|
|
|
+ NCNetworking.shared.writeCertificate(host: host)
|
|
|
+ }
|
|
|
}))
|
|
|
|
|
|
- alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { action in
|
|
|
- self.appDelegate.startTimerErrorNetworking()
|
|
|
- }))
|
|
|
+ alertController.addAction(UIAlertAction(title: NSLocalizedString("_no_", comment: ""), style: .default, handler: { action in }))
|
|
|
|
|
|
alertController.addAction(UIAlertAction(title: NSLocalizedString("_certificate_details_", comment: ""), style: .default, handler: { action in
|
|
|
if let navigationController = UIStoryboard(name: "NCViewCertificateDetails", bundle: nil).instantiateInitialViewController() {
|
|
|
@@ -402,9 +405,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
}
|
|
|
}))
|
|
|
|
|
|
- self.present(alertController, animated: true, completion: {
|
|
|
- self.appDelegate.timerErrorNetworking?.invalidate()
|
|
|
- })
|
|
|
+ self.present(alertController, animated: true)
|
|
|
|
|
|
} else {
|
|
|
|
|
|
@@ -416,38 +417,4 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
|
|
|
self.present(alertController, animated: true, completion: { })
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // MARK: - QRCode
|
|
|
-
|
|
|
- func dismissQRCode(_ value: String?, metadataType: String?) {
|
|
|
-
|
|
|
- guard var value = value else { return }
|
|
|
-
|
|
|
- let protocolLogin = NCBrandOptions.shared.webLoginAutenticationProtocol + "login/"
|
|
|
-
|
|
|
- if value.hasPrefix(protocolLogin) && value.contains("user:") && value.contains("password:") && value.contains("server:") {
|
|
|
-
|
|
|
- value = value.replacingOccurrences(of: protocolLogin, with: "")
|
|
|
- let valueArray = value.components(separatedBy: "&")
|
|
|
- if valueArray.count == 3 {
|
|
|
-
|
|
|
- let user = valueArray[0].replacingOccurrences(of: "user:", with: "")
|
|
|
- let password = valueArray[1].replacingOccurrences(of: "password:", with: "")
|
|
|
- let urlBase = valueArray[2].replacingOccurrences(of: "server:", with: "")
|
|
|
- let webDAV = NCUtilityFileSystem.shared.getWebDAV(account: appDelegate.account)
|
|
|
- let serverUrl = urlBase + "/" + webDAV
|
|
|
-
|
|
|
- loginButton.isEnabled = false
|
|
|
- //activity.startAnimating()
|
|
|
-
|
|
|
- NCCommunication.shared.checkServer(serverUrl: serverUrl) { (errorCode, errorDescription) in
|
|
|
-
|
|
|
- //self.activity.stopAnimating()
|
|
|
- self.loginButton.isEnabled = true
|
|
|
-
|
|
|
- self.standardLogin(url: urlBase, user: user, password: password, errorCode: errorCode, errorDescription: errorDescription)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
}
|
Marino Faggiana