Revert "move responsibility of bypass"

This reverts commit 7ae69e0b1e.

src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts

@@ -109,7 +109,7 @@ export class UmbAppElement extends UmbLitElement {
 		OpenAPI.BASE = this.serverUrl;
 		const redirectUrl = `${window.location.origin}${this.backofficePath}`;
 
-		this.#authContext = new UmbAuthContext(this, this.serverUrl, redirectUrl, this.bypassAuth);
+		this.#authContext = new UmbAuthContext(this, this.serverUrl, redirectUrl);
 
 		this.provideContext(UMB_AUTH_CONTEXT, this.#authContext);
 
@@ -197,9 +197,13 @@ export class UmbAppElement extends UmbLitElement {
 			OpenAPI.WITH_CREDENTIALS = true;
 		}
 
-		// TODO: This feels like an od placement, move this into some method regarding starting the application/not install/...
 		this.#listenForLanguageChange();
 
+		if (this.#authContext?.isAuthorized()) {
+			this.#authContext.isLoggedIn.next(true);
+		} else {
+			this.#authContext?.isLoggedIn.next(false);
+		}
 	}
 
 	#redirect() {
@@ -240,7 +244,8 @@ export class UmbAppElement extends UmbLitElement {
 	}
 
 	#isAuthorized(): boolean {
-		return this.#authContext?.isAuthorized() ?? false;
+		if (!this.#authContext) return false;
+		return this.bypassAuth ? true : this.#authContext.isAuthorized();
 	}
 
 	#isAuthorizedGuard(): Guard {

src/Umbraco.Web.UI.Client/src/shared/auth/auth-flow.ts

@@ -24,13 +24,12 @@ import {
 	AuthorizationServiceConfiguration,
 	GRANT_TYPE_AUTHORIZATION_CODE,
 	GRANT_TYPE_REFRESH_TOKEN,
-	//RevokeTokenRequest,
+	RevokeTokenRequest,
 	TokenRequest,
 	TokenResponse,
 	LocationLike,
 	StringMap,
 } from '@umbraco-cms/backoffice/external/openid';
-import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 
 const requestor = new FetchRequestor();
 
@@ -83,7 +82,6 @@ class UmbNoHashQueryStringUtils extends BasicQueryStringUtils {
  * 4. After login, get the latest token before each request to the server by calling the `performWithFreshTokens` method
  */
 export class UmbAuthFlow {
-
 	// handlers
 	readonly #notifier: AuthorizationNotifier;
 	readonly #authorizationHandler: RedirectRequestHandler;
@@ -100,9 +98,6 @@ export class UmbAuthFlow {
 	#refreshToken: string | undefined;
 	#accessTokenResponse: TokenResponse | undefined;
 
-	readonly #authorized = new UmbBooleanState<boolean>(false);
-	readonly authorized = this.#authorized.asObservable();
-
 	constructor(
 		openIdConnectUrl: string,
 		redirectUri: string,
@@ -147,6 +142,7 @@ export class UmbAuthFlow {
 
 				await this.#makeRefreshTokenRequest(response.code, codeVerifier);
 				await this.performWithFreshTokens();
+				await this.#saveTokenState();
 			}
 		});
 	}
@@ -171,7 +167,6 @@ export class UmbAuthFlow {
 			if (response.isValid()) {
 				this.#accessTokenResponse = response;
 				this.#refreshToken = this.#accessTokenResponse.refreshToken;
-				this.checkAuthorization();
 			}
 		}
 
@@ -219,7 +214,7 @@ export class UmbAuthFlow {
 	}
 
 	/**
-	 * Checks if the user is logged in by validating the timestamp of the stored token.
+	 * This method will check if the user is logged in by validating the timestamp of the stored token.
 	 * If no token is stored, it will return false.
 	 *
 	 * @returns true if the user is logged in, false otherwise.
@@ -228,17 +223,6 @@ export class UmbAuthFlow {
 		return !!this.#accessTokenResponse && this.#accessTokenResponse.isValid();
 	}
 
-	/**
-	 * Checks if the user is logged in by validating the token, this will update authorized state as well.
-	 *
-	 * @returns true if the user is logged in, false otherwise.
-	 */
-	checkAuthorization() {
-		const authorized = this.isAuthorized();
-		this.#authorized.next(authorized);
-		return authorized;
-	}
-
 	/**
 	 * This method will sign the user out of the application.
 	 */
@@ -257,7 +241,6 @@ export class UmbAuthFlow {
 			// await this.#tokenHandler.performRevokeTokenRequest(this.#configuration, tokenRevokeRequest);
 
 			this.#accessTokenResponse = undefined;
-			this.checkAuthorization();
 		}
 
 		if (this.#refreshToken) {
@@ -302,8 +285,6 @@ export class UmbAuthFlow {
 
 		const response = await this.#tokenHandler.performTokenRequest(this.#configuration, request);
 		this.#accessTokenResponse = response;
-		await this.#saveTokenState();
-		this.checkAuthorization();
 		return response.accessToken;
 	}
 
@@ -339,6 +320,5 @@ export class UmbAuthFlow {
 		const response = await this.#tokenHandler.performTokenRequest(this.#configuration, request);
 		this.#refreshToken = response.refreshToken;
 		this.#accessTokenResponse = response;
-		this.checkAuthorization();
 	}
 }

src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts

@@ -12,26 +12,14 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth {
 	#currentUser = new UmbObjectState<UmbLoggedInUser | undefined>(undefined);
 	readonly currentUser = this.#currentUser.asObservable();
 
-	#isLoggedIn = new UmbBooleanState<boolean>(false);
-	readonly isLoggedIn = this.#isLoggedIn.asObservable();
+	readonly isLoggedIn = new UmbBooleanState<boolean>(false);
 	readonly languageIsoCode = this.#currentUser.asObservablePart((user) => user?.languageIsoCode ?? 'en-us');
 
 	#authFlow;
 
-	constructor(host: UmbControllerHostElement, serverUrl: string, redirectUrl: string, bypassAuth: boolean) {
+	constructor(host: UmbControllerHostElement, serverUrl: string, redirectUrl: string) {
 		super(host)
-		if(bypassAuth) {
-			this.#isLoggedIn.next(true);
-		} else {
-			this.#authFlow = new UmbAuthFlow(serverUrl, redirectUrl);
-			this.observe(this.#authFlow.authorized, (isAuthorized) => {
-				if (isAuthorized) {
-					this.#isLoggedIn.next(true);
-				} else {
-					this.#isLoggedIn.next(false);
-				}
-			});
-		}
+		this.#authFlow = new UmbAuthFlow(serverUrl, redirectUrl);
 
 		this.observe(this.isLoggedIn, (isLoggedIn) => {
 			if (isLoggedIn) {
@@ -44,15 +32,15 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth {
 	 * Initiates the login flow.
 	 */
 	login(): void {
-		return this.#authFlow?.makeAuthorizationRequest();
+		return this.#authFlow.makeAuthorizationRequest();
 	}
 
 	isAuthorized() {
-		return this.#authFlow?.isAuthorized() ?? true;
+		return this.#authFlow.isAuthorized();
 	}
 
 	setInitialState(): Promise<void> {
-		return this.#authFlow?.setInitialState() ?? Promise.resolve();
+		return this.#authFlow.setInitialState();
 	}
 
 	async fetchCurrentUser(): Promise<UmbLoggedInUser | undefined> {
@@ -72,14 +60,14 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth {
 	 * @returns The latest token from the Management API
 	 */
 	getLatestToken(): Promise<string> {
-		return this.#authFlow?.performWithFreshTokens() ?? Promise.resolve('bypass');
+		return this.#authFlow.performWithFreshTokens();
 	}
 
 	/**
 	 * Signs the user out by removing any tokens from the browser.
 	 */
 	signOut(): Promise<void> {
-		return this.#authFlow?.signOut() ?? Promise.resolve();
+		return this.#authFlow.signOut();
 	}
 
 	/**