Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support external step for login flow #23204

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions src/auth/ha-auth-external.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import type { CSSResultGroup, TemplateResult } from "lit";
import { css, html } from "lit";
import { customElement, property } from "lit/decorators";
import type { DataEntryFlowStepExternal } from "../data/data_entry_flow";
import { fireEvent } from "../common/dom/fire_event";
import type { LocalizeFunc } from "../common/translations/localize";
import { HaForm } from "../components/ha-form/ha-form";

@customElement("ha-auth-external")
export class HaAuthExternal extends HaForm {
@property({ attribute: false }) public localize!: LocalizeFunc;

@property({ attribute: false }) public stepTitle?: string;

@property({ attribute: false }) public step!: DataEntryFlowStepExternal;

protected render(): TemplateResult {
return html`
<h2>${this.stepTitle}</h2>
<div class="content">
${this.localize("ui.panel.page-authorize.external.description")}
<div class="open-button">
<a href=${this.step.url} target="_blank" rel="opener">
<mwc-button raised>
${this.localize("ui.panel.page-authorize.external.open_site")}
</mwc-button>
</a>
</div>
</div>
`;
}

protected firstUpdated(changedProps) {
super.firstUpdated(changedProps);
const source = window.open(this.step.url);
allenporter marked this conversation as resolved.
Show resolved Hide resolved
window.addEventListener("message", async (message: MessageEvent) => {
if (
message.origin === window.location.origin &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The message is sent from the external site right? So the origin would something like this.step.url?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears to always be the home assistant url e.g. http://localhost:8123 when i'm testing, and not as the external IDP.

message.source === source &&
message.data.type === "externalCallback"
) {
fireEvent(this, "step-finished");
}
});
}

static get styles(): CSSResultGroup {
return [
css`
.open-button {
text-align: center;
padding: 24px 0;
}
.open-button a {
text-decoration: none;
}
`,
];
}
}

declare global {
interface HTMLElementTagNameMap {
"ha-auth-external": HaAuthExternal;
}
interface HASSDomEvents {
"step-finished": undefined;
}
}
50 changes: 35 additions & 15 deletions src/auth/ha-auth-flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import type {
DataEntryFlowStepForm,
} from "../data/data_entry_flow";
import "./ha-auth-form";
import "./ha-auth-external";

type State = "loading" | "error" | "step";

Expand Down Expand Up @@ -171,18 +172,7 @@ export class HaAuthFlow extends LitElement {
}

return html`
${this._renderStep(this.step)}
<div class="action">
<mwc-button
raised
@click=${this._handleSubmit}
.disabled=${this._submitting}
>
${this.step.type === "form"
? this.localize("ui.panel.page-authorize.form.next")
: this.localize("ui.panel.page-authorize.form.start_over")}
</mwc-button>
</div>
${this._renderStep(this.step)} ${this._renderAction(this.step)}
`;
case "error":
return html`
Expand Down Expand Up @@ -266,11 +256,35 @@ export class HaAuthFlow extends LitElement {
`
: ""}
`;
case "external":
return html`<ha-auth-external
.localize=${this.localize}
.step=${this.step!}
.title=${this.authProvider!.name}
@step-finished=${this._externalStepFinished}
></ha-auth-external>`;
default:
return nothing;
}
}

private _renderAction(step: DataEntryFlowStep) {
if (step.type === "external") {
return nothing;
}
return html`<div class="action">
<mwc-button
raised
@click=${this._handleSubmit}
.disabled=${this._submitting}
>
${step.type === "form"
? this.localize("ui.panel.page-authorize.form.next")
: this.localize("ui.panel.page-authorize.form.start_over")}
</mwc-button>
</div>`;
}

private _storeTokenChanged(e: CustomEvent<HTMLInputElement>) {
this._storeToken = (e.currentTarget as HTMLInputElement).checked;
}
Expand Down Expand Up @@ -359,12 +373,14 @@ export class HaAuthFlow extends LitElement {
this._providerChanged(this.authProvider);
}

private async _handleSubmit(ev: Event) {
ev.preventDefault();
private async _handleSubmit(ev?: Event) {
if (ev) {
ev.preventDefault();
}
if (this.step == null) {
return;
}
if (this.step.type !== "form") {
if (this.step.type !== "form" && this.step.type !== "external") {
this._providerChanged(this.authProvider);
return;
}
Expand Down Expand Up @@ -403,6 +419,10 @@ export class HaAuthFlow extends LitElement {
this._submitting = false;
}
}

private _externalStepFinished(_ev: CustomEvent) {
this._handleSubmit();
}
}

declare global {
Expand Down
4 changes: 4 additions & 0 deletions src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -7144,6 +7144,10 @@
}
}
}
},
"external": {
"description": "This step requires you to visit an external website to be completed.",
"open_site": "Open website"
}
},
"page-demo": {
Expand Down
Loading