From 5bea0f8c9d7f0f3614bfff03d427a8fe76c3e463 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:24:53 +0100 Subject: [PATCH] Remove the support email address from the OIDC configuration. (#4059) The contacts property has been removed from the SDK. --- ElementX/Sources/Application/AppSettings.swift | 5 ----- .../Services/Authentication/OIDCConfigurationProxy.swift | 3 +-- Enterprise | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift index 28c5dc4c0..da683bb2a 100644 --- a/ElementX/Sources/Application/AppSettings.swift +++ b/ElementX/Sources/Application/AppSettings.swift @@ -101,7 +101,6 @@ final class AppSettings { copyrightURL: URL, acceptableUseURL: URL, privacyURL: URL, - supportEmailAddress: String, encryptionURL: URL, chatBackupDetailsURL: URL, identityPinningViolationDetailsURL: URL, @@ -117,7 +116,6 @@ final class AppSettings { self.copyrightURL = copyrightURL self.acceptableUseURL = acceptableUseURL self.privacyURL = privacyURL - self.supportEmailAddress = supportEmailAddress self.encryptionURL = encryptionURL self.chatBackupDetailsURL = chatBackupDetailsURL self.identityPinningViolationDetailsURL = identityPinningViolationDetailsURL @@ -167,8 +165,6 @@ final class AppSettings { private(set) var acceptableUseURL: URL = "https://element.io/acceptable-use-policy-terms" /// A URL that contains the app's Privacy Policy. private(set) var privacyURL: URL = "https://element.io/privacy" - /// An email address that should be used for support requests. - private(set) var supportEmailAddress = "support@element.io" /// A URL where users can go read more about encryption in general. private(set) var encryptionURL: URL = "https://element.io/help#encryption" /// A URL where users can go read more about the chat backup. @@ -209,7 +205,6 @@ final class AppSettings { logoURI: logoURL, tosURI: acceptableUseURL, policyURI: privacyURL, - contacts: [supportEmailAddress], staticRegistrations: oidcStaticRegistrations.mapKeys { $0.absoluteString }) /// Whether or not the Create Account button is shown on the start screen. diff --git a/ElementX/Sources/Services/Authentication/OIDCConfigurationProxy.swift b/ElementX/Sources/Services/Authentication/OIDCConfigurationProxy.swift index 8d3ad2ff6..17acfcb45 100644 --- a/ElementX/Sources/Services/Authentication/OIDCConfigurationProxy.swift +++ b/ElementX/Sources/Services/Authentication/OIDCConfigurationProxy.swift @@ -14,7 +14,6 @@ struct OIDCConfigurationProxy { let logoURI: URL let tosURI: URL let policyURI: URL - let contacts: [String] let staticRegistrations: [String: String] } @@ -29,7 +28,7 @@ extension OIDCConfigurationProxy { logoUri: logoURI.absoluteString, tosUri: tosURI.absoluteString, policyUri: policyURI.absoluteString, - contacts: contacts, + contacts: nil, staticRegistrations: staticRegistrations) } } diff --git a/Enterprise b/Enterprise index 2c4b038f7..1b5e6442c 160000 --- a/Enterprise +++ b/Enterprise @@ -1 +1 @@ -Subproject commit 2c4b038f7a1c23648b48ffb1ccd6af2e020050f4 +Subproject commit 1b5e6442c8313a82edccde3ff5310d1256bdfeca