mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 16:22:39 +00:00
Merge pull request #4645 from vector-im/element_4362
Stable ids for MSC 2858
This commit is contained in:
commit
07f5996c3b
3 changed files with 4 additions and 6 deletions
|
@ -14,6 +14,7 @@ Changes to be released in next version
|
|||
* Voice messages: Remove labs setting and enable them by default
|
||||
* Room: Remove the green border from direct message room avatars (#4520).
|
||||
* VoIP: Additional changes on call tiles (#4642).
|
||||
* SSO: Stable ids for MSC 2858 (#4362).
|
||||
|
||||
🐛 Bugfix
|
||||
*
|
||||
|
|
|
@ -48,12 +48,10 @@ final class SSOAuthenticationService: NSObject {
|
|||
return nil
|
||||
}
|
||||
|
||||
let ssoRedirectPath: String
|
||||
var ssoRedirectPath = SSOURLConstants.Paths.redirect
|
||||
|
||||
if let identityProvider = identityProvider {
|
||||
ssoRedirectPath = SSOURLConstants.Paths.unstableRedirect + identityProvider
|
||||
} else {
|
||||
ssoRedirectPath = SSOURLConstants.Paths.redirect
|
||||
ssoRedirectPath.append(identityProvider)
|
||||
}
|
||||
|
||||
authenticationComponent.path = ssoRedirectPath
|
||||
|
|
|
@ -24,7 +24,6 @@ enum SSOURLConstants {
|
|||
}
|
||||
|
||||
enum Paths {
|
||||
static let redirect = "/_matrix/client/r0/login/sso/redirect"
|
||||
static let unstableRedirect = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect/"
|
||||
static let redirect = "/_matrix/client/r0/login/sso/redirect/"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue