felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-26 19:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

SSOAuthenticationService: Update callback scheme property and handle transaction id.

Browse Source
This commit is contained in:
SBiOSoftWhare
2021-01-07 14:27:18 +01:00
parent dd8f1d6a46
commit 2d57e6e53b
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift
+16 -30
View File
@@ -27,39 +27,23 @@ final class SSOAuthenticationService: NSObject {
// MARK: - Constants
private enum SSOURLPath {
static let redirect = "/_matrix/client/r0/login/sso/redirect"
static let unstableRedirect = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect/"
}
private enum SSOURLParameters {
static let callbackLoginToken = "loginToken"
static let redirectURL = "redirectUrl"
}
// TODO: Move this constant
private enum ApplicationSchemePathes {
static let connect = "connect"
}
// MARK: - Properties
private let homeserverStringURL: String
lazy var callBackURLScheme: String? = {
return self.buildCallBackURLScheme()
}()
let callBackURLScheme: String?
// MARK: - Setup
init(homeserverStringURL: String) {
self.homeserverStringURL = homeserverStringURL
self.homeserverStringURL = homeserverStringURL
self.callBackURLScheme = BuildSettings.applicationURLScheme
super.init()
}
// MARK: - Public
func authenticationURL(for identityProvider: String?) -> URL? {
func authenticationURL(for identityProvider: String?, transactionId: String) -> URL? {
guard var authenticationComponent = URLComponents(string: self.homeserverStringURL) else {
return nil
}
@@ -67,17 +51,17 @@ final class SSOAuthenticationService: NSObject {
let ssoRedirectPath: String
if let identityProvider = identityProvider {
ssoRedirectPath = SSOURLPath.unstableRedirect + identityProvider
ssoRedirectPath = SSOURLConstants.Pathes.unstableRedirect + identityProvider
} else {
ssoRedirectPath = SSOURLPath.redirect
ssoRedirectPath = SSOURLConstants.Pathes.redirect
}
authenticationComponent.path = ssoRedirectPath
var queryItems: [URLQueryItem] = []
if let callBackURLScheme = self.callBackURLScheme {
queryItems.append(URLQueryItem(name: SSOURLParameters.redirectURL, value: callBackURLScheme))
if let callBackURLScheme = self.buildCallBackURL(with: transactionId) {
queryItems.append(URLQueryItem(name: SSOURLConstants.Parameters.redirectURL, value: callBackURLScheme))
}
authenticationComponent.queryItems = queryItems
@@ -89,19 +73,21 @@ final class SSOAuthenticationService: NSObject {
guard let components = URLComponents(string: url.absoluteString) else {
return nil
}
let tokenQueryItem = components.queryItems?.first(where: { $0.name == SSOURLParameters.callbackLoginToken })
return tokenQueryItem?.value
return components.vc_getQueryItemValue(for: SSOURLConstants.Parameters.callbackLoginToken)
}
// MARK: - Private
private func buildCallBackURLScheme() -> String? {
guard let appScheme = BuildSettings.applicationURLScheme else {
private func buildCallBackURL(with transactionId: String) -> String? {
guard let callBackURLScheme = self.callBackURLScheme else {
return nil
}
var urlComponents = URLComponents()
urlComponents.scheme = appScheme
urlComponents.host = ApplicationSchemePathes.connect
urlComponents.scheme = callBackURLScheme
urlComponents.host = CustomSchemeURLConstants.Hosts.connect
// Transaction id is used to indentify the request
urlComponents.queryItems = [URLQueryItem(name: CustomSchemeURLConstants.Parameters.transactionId, value: transactionId)]
return urlComponents.string
}
}