Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing contacts field in OIDC configuration. #1662

Merged
merged 1 commit into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions ElementX.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions ElementX/Sources/Application/AppSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 20 additions & 0 deletions ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions changelog.d/1653.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add missing contacts field to OIDC configuration.
2 changes: 1 addition & 1 deletion project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down