eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 20:55:31 +00:00
Code Activity

Added logout request

Browse Source
This commit is contained in:
Raimund Wege
2017-08-23 14:32:54 +02:00
parent 81f6a4e2f6
commit 919eb6420f
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/SAPTracker/src/xcode/SAPTracker/SignUpController.swift
+21 -6
View File
@@ -39,10 +39,13 @@ class SignUpController: NSObject {
func loginWithViewController(_ controller: UIViewController) {
do {
let accessToken = try Keychain.userAccessToken.readPassword()
print(accessToken)
controller.presentingViewController?.dismiss(animated: true)
self.delegate?.signUpControllerDidFinish(self)
let userName = try Keychain.userName.readPassword()
let password = try Keychain.userPassword.readPassword()
requestManager.postHello(userName: userName, password: password, success: { (principal, authenticated, remembered) in
}) { (error, message) in
}
} catch {
let storyboard = UIStoryboard(name: "SignUp", bundle: nil)
let loginNC = storyboard.instantiateInitialViewController() as! UINavigationController
@@ -59,6 +62,11 @@ class SignUpController: NSObject {
try Keychain.userAccessToken.deleteItem()
} catch {
self.showAlert(forError: error, andMessage: nil, withViewController: controller)
}
requestManager.postLogout(success: {
}) { (error, message) in
}
delegate?.signUpControllerDidLogout(self)
}
@@ -78,7 +86,7 @@ extension SignUpController: LoginViewControllerDelegate {
func loginViewController(_ controller: LoginViewController, willLoginWithUserName userName: String, password: String) {
requestManager.postAccessToken(userName: userName, password: password, success: { [weak self] userName, accessToken in
self?.loginViewController(controller, didFinishLoginWithUserName: userName, password: password)
self?.loginViewController(controller, didFinishLoginWithUserName: userName, password: password, accessToken: accessToken)
}) { [weak self] error, message in
self?.loginViewController(controller, didFailLoginWithError: error, message: message)
}
@@ -89,7 +97,14 @@ extension SignUpController: LoginViewControllerDelegate {
self.delegate?.signUpControllerDidCancel(self)
}
fileprivate func loginViewController(_ controller: LoginViewController, didFinishLoginWithUserName: String, password: String) {
fileprivate func loginViewController(_ controller: LoginViewController, didFinishLoginWithUserName userName: String, password: String, accessToken: String) {
do {
try Keychain.userName.savePassword(userName)
try Keychain.userPassword.savePassword(password)
try Keychain.userAccessToken.savePassword(accessToken)
} catch {
self.showAlert(forError: error, andMessage: nil, withViewController: controller)
}
controller.presentingViewController?.dismiss(animated: true)
self.delegate?.signUpControllerDidFinish(self)
}
ios/SAPTracker/src/xcode/SAPTracker/SignUpRequestManager.swift
+28
View File
@@ -245,6 +245,30 @@ class SignUpRequestManager: NSObject {
failure(error, stringForError(error))
}
// MARK: - Logout
func postLogout(
success: @escaping () -> Void,
failure: @escaping (_ error: Error, _ message: String?) -> Void)
{
let urlString = "\(basePathString)/logout/"
manager.post(urlString, parameters: nil, success: { (requestOperation, responseObject) in
self.postLogoutSuccess(success: success)
}) { (requestOperation, error) in
self.postLogoutFailure(error: error, failure: failure)
}
}
fileprivate func postLogoutSuccess(success: () -> Void) {
logInfo(name: "\(#function)", info: "success")
success()
}
fileprivate func postLogoutFailure(error: Error, failure: (_ error: Error, _ message: String?) -> Void) {
logError(name: "\(#function)", error: error)
failure(error, stringForError(error))
}
// MARK: - Helper
fileprivate func stringForError(_ error: Error) -> String? {
@@ -252,4 +276,8 @@ class SignUpRequestManager: NSObject {
return String(data: data as Data, encoding: String.Encoding.utf8)
}
fileprivate func jsessionCookie() -> HTTPCookie? {
return HTTPCookieStorage.shared.cookies?.first(where: { $0.name == "JSESSIONID" })
}
}