mirror of
https://github.com/bitwarden/desktop
synced 2026-01-02 00:23:19 +00:00
* [refactor] Remove references to deprecated services * [feature] Implement account switching * [bug] Fix state handling for authentication dependent system menu items * [bug] Enable the account switcher to fucntion properly when switching to a locked accounts * [feature] Enable locking any account from the menu * [bug] Ensure the avatar instance used in the account switcher updates on account change * [style] Fix lint complaints * [bug] Ensure the logout command callback can handle any user in state * [style] Fix lint complaints * rollup * [style] Fix lint complaints * [bug] Don't clean up state until everything else is done on logout * [bug] Navigate to vault on a succesful account switch * [bug] Init the state service on start * [feature] Limit account switching to 5 account maximum * [bug] Resolve app lock state with 5 logged out accounts * [chore] Update account refrences to match recent jslib restructuring * [bug] Add missing awaits * [bug] Update app menu on logout * [bug] Hide the switcher if there are no authed accounts * [bug] Move authenticationStatus display information out of jslib * [bug] Remove unused active style from scss * [refactor] Rewrite the menu bar * [style] Fix lint complaints * [bug] Clean state of loggout out user after redirect * [bug] Redirect on logout if not explicity provided a userId that isn't active * [bug] Relocated several settings items to persistant storage * [bug] Correct account switcher styles on all themes * [chore] Include state migration service in services * [bug] Swap to next account on logout * [bug] Correct DI service * [bug] fix loginGuard deps in services.module * [chore] update jslib * [bug] Remove badly merged scss * [chore] update jslib * [review] Code review cleanup * [review] Code review cleanup Co-authored-by: Hinton <oscar@oscarhinton.com>
106 lines
3.2 KiB
TypeScript
106 lines
3.2 KiB
TypeScript
import {
|
|
Menu,
|
|
MenuItemConstructorOptions,
|
|
} from 'electron';
|
|
|
|
import { AboutMenu } from './menu.about';
|
|
import { AccountMenu } from './menu.account';
|
|
import { BitwardenMenu } from './menu.bitwarden';
|
|
import { EditMenu } from './menu.edit';
|
|
import { FileMenu } from './menu.file';
|
|
import { HelpMenu } from './menu.help';
|
|
import { MenuUpdateRequest } from './menu.updater';
|
|
import { ViewMenu } from './menu.view';
|
|
import { WindowMenu } from './menu.window';
|
|
|
|
import { I18nService } from 'jslib-common/abstractions/i18n.service';
|
|
import { MessagingService } from 'jslib-common/abstractions/messaging.service';
|
|
|
|
import { UpdaterMain } from 'jslib-electron/updater.main';
|
|
import { WindowMain } from 'jslib-electron/window.main';
|
|
|
|
export interface IMenubarMenu {
|
|
id: string;
|
|
label: string;
|
|
visible?: boolean; // Assumes true if null
|
|
items: MenuItemConstructorOptions[];
|
|
}
|
|
|
|
export class Menubar {
|
|
private readonly items: IMenubarMenu[];
|
|
|
|
get menu(): Menu {
|
|
const template: MenuItemConstructorOptions[] = [];
|
|
if (this.items != null) {
|
|
this.items.forEach((item: IMenubarMenu) => {
|
|
if (item != null) {
|
|
template.push({
|
|
id: item.id,
|
|
label: item.label,
|
|
submenu: item.items,
|
|
visible: item.visible ?? true,
|
|
});
|
|
}
|
|
});
|
|
}
|
|
return Menu.buildFromTemplate(template);
|
|
}
|
|
|
|
constructor(
|
|
i18nService: I18nService,
|
|
messagingService: MessagingService,
|
|
updaterMain: UpdaterMain,
|
|
windowMain: WindowMain,
|
|
webVaultUrl: string,
|
|
appVersion: string,
|
|
updateRequest?: MenuUpdateRequest,
|
|
) {
|
|
this.items = [
|
|
new BitwardenMenu(
|
|
i18nService,
|
|
messagingService,
|
|
updaterMain,
|
|
windowMain.win,
|
|
updateRequest?.accounts
|
|
),
|
|
new FileMenu(
|
|
i18nService,
|
|
messagingService,
|
|
updateRequest?.accounts[updateRequest?.activeUserId]?.isLocked ?? true,
|
|
),
|
|
new EditMenu(
|
|
i18nService,
|
|
messagingService,
|
|
updateRequest?.accounts[updateRequest?.activeUserId]?.isLocked ?? true,
|
|
),
|
|
new ViewMenu(
|
|
i18nService,
|
|
messagingService,
|
|
updateRequest?.accounts[updateRequest?.activeUserId]?.isLocked ?? true,
|
|
),
|
|
new AccountMenu(
|
|
i18nService,
|
|
messagingService,
|
|
webVaultUrl,
|
|
windowMain.win,
|
|
updateRequest?.accounts[updateRequest?.activeUserId]?.isLocked ?? true,
|
|
),
|
|
new WindowMenu(
|
|
i18nService,
|
|
messagingService,
|
|
windowMain,
|
|
),
|
|
new AboutMenu(
|
|
i18nService,
|
|
appVersion,
|
|
windowMain.win,
|
|
updaterMain,
|
|
),
|
|
new HelpMenu(
|
|
i18nService,
|
|
webVaultUrl,
|
|
),
|
|
];
|
|
}
|
|
}
|