From 0c8ae463bcb3311a1229563a7ff77db891ad3618 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Tue, 3 Aug 2021 14:07:05 +0300 Subject: [PATCH 1/3] stable ids for MSC 2858 --- .../Authentication/SSO/SSOAuthenticationService.swift | 6 ++---- Riot/Modules/Authentication/SSO/SSOURLConstants.swift | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift index d00094b85..1ede12851 100644 --- a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift +++ b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift @@ -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 diff --git a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift index 01de2ddc9..7cc90150d 100644 --- a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift +++ b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift @@ -25,6 +25,5 @@ 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/" } } From 09ede8e4d59f463fb956921ab23ddc3cf9e479d2 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Tue, 3 Aug 2021 14:09:45 +0300 Subject: [PATCH 2/3] Update CHANGES.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c7d5e0920..39ca3b388 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changes to be released in next version * 🙌 Improvements - * + * SSO: Stable ids for MSC 2858 (#4362). 🐛 Bugfix * From ba83da8f6461dcffe8c36561d887c1028aa124d2 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Mon, 9 Aug 2021 18:06:08 +0300 Subject: [PATCH 3/3] Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift Co-authored-by: SBiOSoftWhare --- Riot/Modules/Authentication/SSO/SSOURLConstants.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift index 7cc90150d..791987bfc 100644 --- a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift +++ b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift @@ -24,6 +24,6 @@ enum SSOURLConstants { } enum Paths { - static let redirect = "/_matrix/client/r0/login/sso/redirect" + static let redirect = "/_matrix/client/r0/login/sso/redirect/" } }