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.

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

Jump to bottom

PM-2559 Messaging Rework for Passkey Bug #6282

Merged
merged 7 commits into from
Sep 27, 2023
Merged

PM-2559 Messaging Rework for Passkey Bug #6282

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6330ae7
[PM-2559] Messaging Rework
cagonzalezcs Sep 13, 2023
512e51e
remove unused sendResponse
Jingo88 Sep 13, 2023
621a80e
merged latest from EC-598 fix conflicts
Jingo88 Sep 19, 2023
31cf690
updated browser-api with default type and comments
Jingo88 Sep 25, 2023
d4ec395
put async back to await for lock in app component
Jingo88 Sep 25, 2023
e622101
minor refactor app component in browser
Jingo88 Sep 26, 2023
a08e7cf
removed unused code in app component browser
Jingo88 Sep 27, 2023
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
9 changes: 8 additions & 1 deletion apps/browser/src/platform/browser/browser-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,15 @@ export class BrowserApi {

static messageListener(
name: string,
callback: (message: any, sender: chrome.runtime.MessageSender, sendResponse: any) => unknown
callback: (
message: any,
sender: chrome.runtime.MessageSender,
sendResponse: any
) => boolean | void
) {
// updated to pass synchronous callbacks to addListener.
// Will not pass async methods because they will default return a Promoise<void>
// this causes race conditions in Firefox when a runtime.sendMessage listener receives undefined
chrome.runtime.onMessage.addListener(callback);

// Keep track of all the events registered in a Safari popup so we can remove
Expand Down
4 changes: 2 additions & 2 deletions apps/browser/src/popup/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class AppComponent implements OnInit, OnDestroy {
window.onkeypress = () => this.recordActivity();
});

(window as any).bitwardenPopupMainMessageListener = (msg: any, sender: any) => {
(window as any).bitwardenPopupMainMessageListener = async (msg: any, sender: any) => {
coroiu marked this conversation as resolved.
Show resolved Hide resolved
coroiu marked this conversation as resolved.
Show resolved Hide resolved
if (msg.command === "doneLoggingOut") {
this.authService.logOut(async () => {
if (msg.expired) {
Expand All @@ -99,7 +99,7 @@ export class AppComponent implements OnInit, OnDestroy {
} else if (msg.command === "authBlocked") {
this.router.navigate(["home"]);
} else if (msg.command === "locked") {
if (msg.userId == null || msg.userId === this.stateService.getUserId()) {
if (msg.userId == null || msg.userId === (await this.stateService.getUserId())) {
this.router.navigate(["lock"]);
}
} else if (msg.command === "showDialog") {
Expand Down
Loading