QR Code Login Flow (#2767)

Co-authored-by: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Co-authored-by: Hugh Nimmo-Smith <hughns@element.io>

ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift

@@ -32,22 +32,13 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
         
         homeserverSubject = .init(LoginHomeserver(address: appSettings.defaultHomeserverAddress,
                                                   loginMode: .unknown))
-        
-        let oidcConfiguration = OidcConfiguration(clientName: InfoPlistReader.main.bundleDisplayName,
-                                                  redirectUri: appSettings.oidcRedirectURL.absoluteString,
-                                                  clientUri: appSettings.websiteURL.absoluteString,
-                                                  logoUri: appSettings.logoURL.absoluteString,
-                                                  tosUri: appSettings.acceptableUseURL.absoluteString,
-                                                  policyUri: appSettings.privacyURL.absoluteString,
-                                                  contacts: [appSettings.supportEmailAddress],
-                                                  staticRegistrations: appSettings.oidcStaticRegistrations.mapKeys { $0.absoluteString })
                
         authenticationService = AuthenticationService(basePath: userSessionStore.baseDirectory.path,
                                                       passphrase: passphrase,
                                                       userAgent: UserAgentBuilder.makeASCIIUserAgent(),
                                                       additionalRootCertificates: [],
                                                       proxy: appSettings.websiteURL.globalProxy,
-                                                      oidcConfiguration: oidcConfiguration,
+                                                      oidcConfiguration: appSettings.oidcConfiguration.rustValue,
                                                       customSlidingSyncProxy: appSettings.slidingSyncProxyURL?.absoluteString,
                                                       sessionDelegate: userSessionStore.clientSessionDelegate,
                                                       crossProcessRefreshLockId: InfoPlistReader.main.bundleIdentifier)

ElementX/Sources/Services/Authentication/AuthenticationServiceProxyProtocol.swift

@@ -42,7 +42,7 @@ enum AuthenticationServiceError: Error {
 protocol AuthenticationServiceProxyProtocol {
     /// The currently configured homeserver.
     var homeserver: CurrentValuePublisher<LoginHomeserver, Never> { get }
-    
+        
     /// Sets up the service for login on the specified homeserver address.
     func configure(for homeserverAddress: String) async -> Result<Void, AuthenticationServiceError>
     /// Performs login using OIDC for the current homeserver.

ElementX/Sources/Services/Authentication/OIDCConfigurationProxy.swift

@@ -0,0 +1,45 @@
+//
+// Copyright 2024 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct OIDCConfigurationProxy {
+    let clientName: String
+    let redirectURI: URL
+    let clientURI: URL
+    let logoURI: URL
+    let tosURI: URL
+    let policyURI: URL
+    let contacts: [String]
+    let staticRegistrations: [String: String]
+}
+
+#if canImport(MatrixRustSDK)
+import MatrixRustSDK
+
+extension OIDCConfigurationProxy {
+    var rustValue: OidcConfiguration {
+        OidcConfiguration(clientName: clientName,
+                          redirectUri: redirectURI.absoluteString,
+                          clientUri: clientURI.absoluteString,
+                          logoUri: logoURI.absoluteString,
+                          tosUri: tosURI.absoluteString,
+                          policyUri: policyURI.absoluteString,
+                          contacts: contacts,
+                          staticRegistrations: staticRegistrations)
+    }
+}
+#endif