Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4645 from vector-im/element_4362

Browse source 
Stable ids for MSC 2858
This commit is contained in:
ismailgulek 2021-08-09 18:48:34 +03:00 committed by GitHub
commit 07f5996c3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -14,6 +14,7 @@ Changes to be released in next version
* Voice messages: Remove labs setting and enable them by default * Voice messages: Remove labs setting and enable them by default
* Room: Remove the green border from direct message room avatars (#4520). * Room: Remove the green border from direct message room avatars (#4520).
* VoIP: Additional changes on call tiles (#4642). * VoIP: Additional changes on call tiles (#4642).
* SSO: Stable ids for MSC 2858 (#4362).
🐛 Bugfix 🐛 Bugfix
* *

6
Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift
View file

@ -48,12 +48,10 @@ final class SSOAuthenticationService: NSObject {
return nil return nil
} }
let ssoRedirectPath: String var ssoRedirectPath = SSOURLConstants.Paths.redirect
if let identityProvider = identityProvider { if let identityProvider = identityProvider {
ssoRedirectPath = SSOURLConstants.Paths.unstableRedirect + identityProvider ssoRedirectPath.append(identityProvider)
} else {
ssoRedirectPath = SSOURLConstants.Paths.redirect
} }
authenticationComponent.path = ssoRedirectPath authenticationComponent.path = ssoRedirectPath

3
Riot/Modules/Authentication/SSO/SSOURLConstants.swift
View file

@ -24,7 +24,6 @@ enum SSOURLConstants {
} }
enum Paths { enum Paths {
static let redirect = "/_matrix/client/r0/login/sso/redirect" static let redirect = "/_matrix/client/r0/login/sso/redirect/"
static let unstableRedirect = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect/"
} }
} }