Show OIDC sign in errors more sensibly

Author: hughns

src/domain/RootViewModel.js

@@ -90,15 +90,11 @@ export class RootViewModel extends ViewModel {
                 this._showLogin({loginToken});
             }
         } else if (oidcCallback) {
-            if (oidcCallback.error) {
-                this._setSection(() => this._error = new Error(`OIDC error: ${oidcCallback.error}`));
-            } else {
-                this.urlRouter.normalizeUrl();
-                if (this.activeSection !== "login") {
-                    this._showLogin({
-                        oidc: oidcCallback,
-                    });
-                }
+            this.urlRouter.normalizeUrl();
+            if (this.activeSection !== "login") {
+                this._showLogin({
+                    oidc: oidcCallback,
+                });
             }
         }
         else {

src/domain/login/LoginViewModel.ts

@@ -32,15 +32,15 @@ import { OIDCLoginMethod } from "../../matrix/login/OIDCLoginMethod.js";
 type Options = {
     defaultHomeserver: string;
     ready: ReadyFn;
-    oidc?: { state: string, code: string };
+    oidc?: SegmentType["oidc"];
     loginToken?: string;
 } & BaseOptions;
 
 export class LoginViewModel extends ViewModel<SegmentType, Options> {
     private _ready: ReadyFn;
     private _loginToken?: string;
     private _client: Client;
-    private _oidc?: { state: string, code: string };
+    private _oidc?: SegmentType["oidc"];
     private _loginOptions?: LoginOptions;
     private _passwordLoginViewModel?: PasswordLoginViewModel;
     private _startSSOLoginViewModel?: StartSSOLoginViewModel;
@@ -139,7 +139,7 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
                     })));
             this.emitChange("completeSSOLoginViewModel");
         }
-        else if (this._oidc) {
+        else if (this._oidc?.success === true) {
             this._hideHomeserver = true;
             this._completeOIDCLoginViewModel = this.track(new CompleteOIDCLoginViewModel(
                 this.childOptions(
@@ -151,6 +151,10 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
                     })));
             this.emitChange("completeOIDCLoginViewModel");
         }
+        else if (this._oidc?.success === false) {
+            this._hideHomeserver = false;
+            this._showError(`Sign in failed: ${this._oidc.errorDescription ?? this._oidc.error} `);
+        }
         else {
             void this.queryHomeserver();
         }

src/domain/navigation/index.ts

@@ -38,8 +38,10 @@ export type SegmentType = {
         state: string, 
     } & 
         ({
+            success: true,
             code: string,
         } | { 
+            success: false,
             error: string,
             errorDescription: string | null,
             errorUri: string | null ,
@@ -149,13 +151,15 @@ export function parseUrlPath(urlPath: string, currentNavPath: Path<SegmentType>,
             // This is a proper OIDC callback
             if (code) {
                 segments.push(new Segment("oidc", {
+                    success: true,
                     state,
                     code,
                 }));
                 return segments;
             } else if (error) {
                 segments.push(new Segment("oidc", {
                     state,
+                    success: false,
                     error,
                     errorDescription: params.get("error_description"),
                     errorUri: params.get("error_uri"),