From c3dfb7735ff6b2770aa5def84fc53fe2c2e12108 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Tue, 14 Feb 2023 11:26:20 +0100 Subject: [PATCH] [SM-487] Fix lock and logout (#4683) --- .../dialog/project-delete-dialog.component.ts | 4 ++-- .../secrets-manager/projects/project.service.ts | 2 +- .../dialogs/bulk-status-dialog.component.html | 0 .../dialogs/bulk-status-dialog.component.ts | 0 .../{layout => shared}/header.component.html | 4 ++-- .../{layout => shared}/header.component.ts | 15 ++++++++++++++- .../{layout => shared}/header.stories.ts | 0 .../{layout => shared}/new-menu.component.html | 0 .../{layout => shared}/new-menu.component.ts | 0 .../{layout => shared}/no-items.component.html | 0 .../{layout => shared}/no-items.component.ts | 0 .../secrets-manager/shared/sm-shared.module.ts | 9 ++++----- 12 files changed, 23 insertions(+), 11 deletions(-) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/dialogs/bulk-status-dialog.component.html (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/dialogs/bulk-status-dialog.component.ts (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/header.component.html (96%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/header.component.ts (74%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/header.stories.ts (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/new-menu.component.html (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/new-menu.component.ts (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/no-items.component.html (100%) rename bitwarden_license/bit-web/src/app/secrets-manager/{layout => shared}/no-items.component.ts (100%) diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts index cb175ee7569..30b00224ea2 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.ts @@ -12,12 +12,12 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { DialogService } from "@bitwarden/components"; +import { ProjectListView } from "../../models/view/project-list.view"; import { BulkOperationStatus, BulkStatusDetails, BulkStatusDialogComponent, -} from "../../layout/dialogs/bulk-status-dialog.component"; -import { ProjectListView } from "../../models/view/project-list.view"; +} from "../../shared/dialogs/bulk-status-dialog.component"; import { ProjectService } from "../project.service"; export interface ProjectDeleteOperation { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts index 59bf9e1d962..a56112a55fe 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts @@ -8,9 +8,9 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; -import { BulkOperationStatus } from "../layout/dialogs/bulk-status-dialog.component"; import { ProjectListView } from "../models/view/project-list.view"; import { ProjectView } from "../models/view/project.view"; +import { BulkOperationStatus } from "../shared/dialogs/bulk-status-dialog.component"; import { ProjectRequest } from "./models/requests/project.request"; import { ProjectListItemResponse } from "./models/responses/project-list-item.response"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/dialogs/bulk-status-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/dialogs/bulk-status-dialog.component.html rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.html diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/dialogs/bulk-status-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/dialogs/bulk-status-dialog.component.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html similarity index 96% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.html rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html index 3b4bed90ab7..32dfe1d7997 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html @@ -67,11 +67,11 @@ - - diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.ts similarity index 74% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.ts index 6d299579a32..8c9110a3a65 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/header.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.ts @@ -2,6 +2,7 @@ import { Component, Input } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { combineLatest, map, Observable } from "rxjs"; +import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AccountProfile } from "@bitwarden/common/models/domain/account"; @@ -23,7 +24,11 @@ export class HeaderComponent { protected routeData$: Observable<{ titleId: string }>; protected account$: Observable; - constructor(private route: ActivatedRoute, private stateService: StateService) { + constructor( + private route: ActivatedRoute, + private stateService: StateService, + private messagingService: MessagingService + ) { this.routeData$ = this.route.data.pipe( map((params) => { return { @@ -41,4 +46,12 @@ export class HeaderComponent { }) ); } + + protected lock() { + this.messagingService.send("lockVault"); + } + + protected logout() { + this.messagingService.send("logout"); + } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/header.stories.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.stories.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/header.stories.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/header.stories.ts diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/new-menu.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/new-menu.component.html rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/new-menu.component.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/no-items.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.html rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/no-items.component.html diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/no-items.component.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/no-items.component.ts diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts index 2dcbb6fecf0..ecce7c3795e 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts @@ -5,12 +5,11 @@ import { ProductSwitcherModule } from "@bitwarden/web-vault/app/layouts/product- import { CoreOrganizationModule } from "@bitwarden/web-vault/app/organizations/core"; import { SharedModule } from "@bitwarden/web-vault/app/shared"; -import { BulkStatusDialogComponent } from "../layout/dialogs/bulk-status-dialog.component"; -import { HeaderComponent } from "../layout/header.component"; -import { NewMenuComponent } from "../layout/new-menu.component"; -import { NoItemsComponent } from "../layout/no-items.component"; - import { AccessSelectorComponent } from "./access-policies/access-selector.component"; +import { BulkStatusDialogComponent } from "./dialogs/bulk-status-dialog.component"; +import { HeaderComponent } from "./header.component"; +import { NewMenuComponent } from "./new-menu.component"; +import { NoItemsComponent } from "./no-items.component"; import { SecretsListComponent } from "./secrets-list.component"; @NgModule({