jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-27 19:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show location name in auth page, if available. (#8119)

Browse Source
This commit is contained in:
Thomas Lovén 2021-01-11 13:11:30 +01:00 committed by GitHub
parent 56d88b4c56
commit a4657541fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/auth/ha-authorize.ts
View File

@ -12,6 +12,10 @@ import {
fetchAuthProviders, fetchAuthProviders,
AuthUrlSearchParams, AuthUrlSearchParams,
} from "../data/auth"; } from "../data/auth";
import {
DiscoveryInformation,
fetchDiscoveryInformation,
} from "../data/discovery";
import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin"; import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
import { registerServiceWorker } from "../util/register-service-worker"; import { registerServiceWorker } from "../util/register-service-worker";
import "./ha-auth-flow"; import "./ha-auth-flow";
@ -31,6 +35,8 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
@internalProperty() private _authProviders?: AuthProvider[]; @internalProperty() private _authProviders?: AuthProvider[];
@internalProperty() private _discovery?: DiscoveryInformation;
constructor() { constructor() {
super(); super();
this.translationFragment = "page-authorize"; this.translationFragment = "page-authorize";
@ -58,14 +64,17 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
// the name with a bold tag. // the name with a bold tag.
const loggingInWith = document.createElement("div"); const loggingInWith = document.createElement("div");
loggingInWith.innerText = this.localize( loggingInWith.innerText = this.localize(
"ui.panel.page-authorize.logging_in_with", this._discovery?.location_name
? "ui.panel.page-authorize.logging_in_to_with"
: "ui.panel.page-authorize.logging_in_with",
"locationName",
"LOCATION",
"authProviderName", "authProviderName",
"NAME" "NAME"
); );
loggingInWith.innerHTML = loggingInWith.innerHTML.replace( loggingInWith.innerHTML = loggingInWith.innerHTML
"**NAME**", .replace("**LOCATION**", `<b>${this._discovery?.location_name}</b>`)
`<b>${this._authProvider!.name}</b>` .replace("**NAME**", `<b>${this._authProvider!.name}</b>`);
);
const inactiveProviders = this._authProviders.filter( const inactiveProviders = this._authProviders.filter(
(prv) => prv !== this._authProvider (prv) => prv !== this._authProvider
@ -105,6 +114,7 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
protected firstUpdated(changedProps: PropertyValues) { protected firstUpdated(changedProps: PropertyValues) {
super.firstUpdated(changedProps); super.firstUpdated(changedProps);
this._fetchAuthProviders(); this._fetchAuthProviders();
this._fetchDiscoveryInfo();
if (!this.redirectUri) { if (!this.redirectUri) {
return; return;
@ -126,6 +136,10 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
} }
} }
private async _fetchDiscoveryInfo() {
this._discovery = await fetchDiscoveryInformation();
}
private async _fetchAuthProviders() { private async _fetchAuthProviders() {
// Fetch auth providers // Fetch auth providers
try { try {

1
src/translations/en.json
View File

@ -2977,6 +2977,7 @@
"page-authorize": { "page-authorize": {
"initializing": "Initializing", "initializing": "Initializing",
"authorizing_client": "You're about to give {clientId} access to your Home Assistant instance.", "authorizing_client": "You're about to give {clientId} access to your Home Assistant instance.",
"logging_in_to_with": "Logging in to **{locationName}** with **{authProviderName}**.",
"logging_in_with": "Logging in with **{authProviderName}**.", "logging_in_with": "Logging in with **{authProviderName}**.",
"pick_auth_provider": "Or log in with", "pick_auth_provider": "Or log in with",
"abort_intro": "Login aborted", "abort_intro": "Login aborted",