Add missing contacts field in OIDC configuration. (#1662)

element-hq · Sep 8, 2023 · ae24ba1 · ae24ba1
1 parent 3ce26a9
commit ae24ba1
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 17 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -129,8 +129,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "73b1199017b79c210fb0dc93b3513d9bfc89210c",
-        "version" : "1.1.10"
+        "revision" : "fd6188359641a35931c44dbed271afa194ee8fdc",
+        "version" : "1.1.11"
       }
     },
     {
@@ -217,7 +217,7 @@
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
         "revision" : "b94da693e57eaf79d16464b8b7c90d09cba4e290",
         "version" : "0.9.2"

diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
@@ -110,6 +110,8 @@ final class AppSettings {
     let acceptableUseURL: URL = "https://element.io/acceptable-use-policy-terms"
     /// A URL that contains the app's Privacy Policy.
     let privacyURL: URL = "https://element.io/privacy"
+    /// An email address that should be used for support requests.
+    let supportEmailAddress = "support@element.io"
 
     // MARK: - Authentication
 

diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
@@ -619,6 +619,26 @@ class SDKClientMock: SDKClientProtocol {
         unignoreUserUserIdReceivedInvocations.append(userId)
         try unignoreUserUserIdClosure?(userId)
     }
+    //MARK: - uploadAvatar
+
+    public var uploadAvatarMimeTypeDataThrowableError: Error?
+    public var uploadAvatarMimeTypeDataCallsCount = 0
+    public var uploadAvatarMimeTypeDataCalled: Bool {
+        return uploadAvatarMimeTypeDataCallsCount > 0
+    }
+    public var uploadAvatarMimeTypeDataReceivedArguments: (mimeType: String, data: [UInt8])?
+    public var uploadAvatarMimeTypeDataReceivedInvocations: [(mimeType: String, data: [UInt8])] = []
+    public var uploadAvatarMimeTypeDataClosure: ((String, [UInt8]) throws -> Void)?
+
+    public func uploadAvatar(mimeType: String, data: [UInt8]) throws {
+        if let error = uploadAvatarMimeTypeDataThrowableError {
+            throw error
+        }
+        uploadAvatarMimeTypeDataCallsCount += 1
+        uploadAvatarMimeTypeDataReceivedArguments = (mimeType: mimeType, data: data)
+        uploadAvatarMimeTypeDataReceivedInvocations.append((mimeType: mimeType, data: data))
+        try uploadAvatarMimeTypeDataClosure?(mimeType, data)
+    }
     //MARK: - uploadMedia
 
     public var uploadMediaMimeTypeDataProgressWatcherThrowableError: Error?

diff --git a/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift b/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
@@ -37,6 +37,7 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
                                                   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,

diff --git a/changelog.d/1653.bugfix b/changelog.d/1653.bugfix
@@ -0,0 +1 @@
+Add missing contacts field to OIDC configuration.
diff --git a/project.yml b/project.yml
@@ -45,7 +45,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.1.10
+    exactVersion: 1.1.11
     # path: ../matrix-rust-sdk
   DesignKit:
     path: DesignKit