Skip to content

Conditionally attach external message bus #3131

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.

Sign up for GitHub

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

Merged
balloob merged 1 commit into from
Apr 27, 2019
Merged

Conditionally attach external message bus #3131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/entrypoints/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const isExternal = location.search.includes("external_auth=1");
const authProm = isExternal
? () =>
import(/* webpackChunkName: "external_auth" */ "../external_app/external_auth").then(
(mod) => new mod.default(hassUrl)
({ createExternalAuth }) => createExternalAuth(hassUrl)
)
: () =>
getAuth({
Expand Down
19 changes: 15 additions & 4 deletions src/external_app/external_auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ if (!window.externalApp && !window.webkit) {
);
}

export default class ExternalAuth extends Auth {
public external = new ExternalMessaging();
class ExternalAuth extends Auth {
public external?: ExternalMessaging;

constructor(hassUrl) {
constructor(hassUrl: string) {
super({
hassUrl,
clientId: "",
Expand All @@ -58,7 +58,6 @@ export default class ExternalAuth extends Auth {
// This will trigger connection to do a refresh right away
expires: 0,
});
this.external.attach();
}

public async refreshAccessToken() {
Expand Down Expand Up @@ -100,3 +99,15 @@ export default class ExternalAuth extends Auth {
});
}
}

export const createExternalAuth = (hassUrl: string) => {
const auth = new ExternalAuth(hassUrl);
if (
(window.externalApp && window.externalApp.externalBus) ||
(window.webkit && window.webkit.messageHandlers.externalBus)
) {
auth.external = new ExternalMessaging();
auth.external.attach();
}
return auth;
};