yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make it work

Browse Source
This commit is contained in:
Niels Lyngsø
2023-11-09 14:43:00 +01:00
parent 7f2ca5f47b
commit 766872456a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
View File

@@ -88,7 +88,7 @@ export class UmbAppElement extends UmbLitElement {
// This way we can ensure that the document language is always loaded first and subsequently registered as the fallback language.
this.observe(umbLocalizationRegistry.isDefaultLoaded, (isDefaultLoaded) => {
if (!this.#authContext) {
throw new Error('[Fatal] AuthContext requested before it was initialised');
throw new Error('[Fatal] AuthContext requested before it was initialized');
}
if (!isDefaultLoaded) return;
@@ -134,7 +134,7 @@ export class UmbAppElement extends UmbLitElement {
// If the auth flow fails, there is most likely something wrong with the connection to the backend server
// and we should redirect to the error page
let errorMsg =
'An error occured while trying to initialise the connection to the Umbraco server (check console for details)';
'An error occurred while trying to initialize the connection to the Umbraco server (check console for details)';
// Get the type of the error and check http status codes
if (error instanceof Error) {
@@ -186,7 +186,7 @@ export class UmbAppElement extends UmbLitElement {
async #setAuthStatus() {
if (this.bypassAuth === false) {
if (!this.#authContext) {
throw new Error('[Fatal] AuthContext requested before it was initialised');
throw new Error('[Fatal] AuthContext requested before it was initialized');
}
// Get service configuration from authentication server
@@ -200,9 +200,9 @@ export class UmbAppElement extends UmbLitElement {
this.#listenForLanguageChange();
if (this.#authContext?.isAuthorized()) {
this.#authContext.isLoggedIn.next(true);
this.#authContext?.setLoggedIn(true);
} else {
this.#authContext?.isLoggedIn.next(false);
this.#authContext?.setLoggedIn(false);
}
}

8
src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts
View File

@@ -12,7 +12,8 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth {
#currentUser = new UmbObjectState<UmbLoggedInUser | undefined>(undefined);
readonly currentUser = this.#currentUser.asObservable();
readonly isLoggedIn = new UmbBooleanState<boolean>(false);
#isLoggedIn = new UmbBooleanState<boolean>(false);
readonly isLoggedIn = this.#isLoggedIn.asObservable();
readonly languageIsoCode = this.#currentUser.asObservablePart((user) => user?.languageIsoCode ?? 'en-us');
#authFlow;
@@ -35,6 +36,11 @@ export class UmbAuthContext extends UmbBaseController implements IUmbAuth {
return this.#authFlow.makeAuthorizationRequest();
}
/* TEMPORARY METHOD UNTIL RESPONSIBILITY IS MOVED TO CONTEXT */
setLoggedIn(newValue: boolean): void {
return this.#isLoggedIn.next(newValue);
}
isAuthorized() {
return this.#authFlow.isAuthorized();
}