Update OIDC presentation (#987)

* Present OIDC directly on the ServerConfirmationScreen. Read the actual window from the view. * Pop back to the confirmation screen when a user enters an MXID that needs OIDC. * Remove OIDC error handling from the login screen.
2026-11-02 21:33:26 +00:00 · 2023-05-30 16:51:00 +01:00
parent 03ba211e6c
commit 6b6ea118e2
24 changed files with 130 additions and 122 deletions
@@ -32,17 +32,6 @@ class LoginScreenUITests: XCTestCase {
        try await app.assertScreenshot(.login, step: 0)
    }
    
-    func testOIDC() async throws {
-        // Given the initial login screen.
-        let app = Application.launch(.login)
-        
-        // When entering a username on a homeserver that only supports OIDC.
-        app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("@test:company.com\n")
-        
-        // Then the screen should be configured for OIDC.
-        try await app.assertScreenshot(.login, step: 1)
-    }
-    
    func testUnsupported() async throws {
        // Given the initial login screen.
        let app = Application.launch(.login)
@@ -51,6 +40,6 @@ class LoginScreenUITests: XCTestCase {
        app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("@test:server.net\n")
        
        // Then the screen should not allow login to continue.
-        try await app.assertScreenshot(.login, step: 2)
+        try await app.assertScreenshot(.login, step: 1)
    }
 }
@@ -48,7 +48,7 @@ class ServerSelectionUITests: XCTestCase {
        
        // Then an error should be shown and the confirmation button disabled.
        try await app.assertScreenshot(.serverSelection, step: 2)
-        XCTAssertFalse(app.buttons[A11yIdentifiers.changeServerScreen.continue].isEnabled, "The confirm button should be disabled when there is an error.")
+        XCTAssertFalse(app.buttons[A11yIdentifiers.changeServerScreen.continue].isEnabled, "The continue button should be disabled when there is an error.")
    }

    func testNonModalPresentation() async throws {
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:983a85ed153810102033ab63393860e34bfaafa93008221c7561917eeef2716e
-size 66743
+oid sha256:f7c8ca16e04390ab80586512f5ec8bd2a93f7cf4f505e1e6eab655d716483413
+size 79966
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7c8ca16e04390ab80586512f5ec8bd2a93f7cf4f505e1e6eab655d716483413
-size 79966
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2323bf954c479c1cba9da33d44389875c14538e357e933521b0de7c9c99c6a7f
-size 68073
+oid sha256:39f4e0c7d6659d6e0e650cc858bba9979b95d053a5d5504201b4f529ce87a3f3
+size 89379
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39f4e0c7d6659d6e0e650cc858bba9979b95d053a5d5504201b4f529ce87a3f3
-size 89379
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4256cefea1560f7a604c2e1ff9a58095f4a7c90ea84cc1654a200f1499d4939b
-size 70140
+oid sha256:7d5c56d3c46647226a54b38ac1b0cfa86bf52deb559cb634a0005c74f6b33424
+size 97924
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d5c56d3c46647226a54b38ac1b0cfa86bf52deb559cb634a0005c74f6b33424
-size 97924
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bf19067e1d8b000ffd6a5d081054953be94f7f15961d055ee4eac38868f3d0e
-size 74768
+oid sha256:495068fcb3484f9b1329df608d84c217a019d12b812ebf8676f1987cada089db
+size 122325
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:495068fcb3484f9b1329df608d84c217a019d12b812ebf8676f1987cada089db
-size 122325