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.

Sign up for GitHub

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

Revert the OIDC callback to use a custom scheme for now. #1937

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Revert the OIDC callback to use a custom scheme for now. #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions ElementX/Sources/Application/AppSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,8 @@ final class AppSettings {

/// Any pre-defined static client registrations for OIDC issuers.
let oidcStaticRegistrations: [URL: String] = ["https://id.thirdroom.io/realms/thirdroom": "elementx"]
/// The redirect URL used for OIDC. The bundle ID suffix avoids app association conflicts between Element X, Nightly and PR builds.
let oidcRedirectURL = {
guard let bundleIDSuffix = InfoPlistReader.main.bundleIdentifier.split(separator: ".").last,
let redirectURL = URL(string: "https://mobile.element.io/oidc/\(bundleIDSuffix)")
else { fatalError("Failed creating a valid OIDC redirect URL.") }
return redirectURL
}()
/// The redirect URL used for OIDC.
let oidcRedirectURL: URL = "io.element:/callback"

/// The date that the call to `/login` completed successfully. This is used to put
/// a hard wall on the history of encrypted messages until we have key backup.
Expand Down
1 change: 1 addition & 0 deletions changelog.d/1936.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Revert the OIDC redirect URL back to using a custom scheme.