From 7c16410c8626a034c7c7d4909334aa13ed15f08f Mon Sep 17 00:00:00 2001 From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:10:20 -0400 Subject: [PATCH 1/6] Don't invoke ManageTaxInformationComponent when CB is disabled (#9614) --- .../providers/setup/setup.component.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts index 845f2834b3..e0c011f9bc 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts @@ -119,9 +119,15 @@ export class SetupComponent implements OnInit, OnDestroy { submit = async () => { try { + const consolidatedBillingEnabled = await firstValueFrom(this.enableConsolidatedBilling$); + this.formGroup.markAllAsTouched(); - const taxInformationValid = this.manageTaxInformationComponent.touch(); - if (this.formGroup.invalid || !taxInformationValid) { + + const formIsValid = consolidatedBillingEnabled + ? this.formGroup.valid && this.manageTaxInformationComponent.touch() + : this.formGroup.valid; + + if (!formIsValid) { return; } @@ -134,9 +140,7 @@ export class SetupComponent implements OnInit, OnDestroy { request.token = this.token; request.key = key; - const enableConsolidatedBilling = await firstValueFrom(this.enableConsolidatedBilling$); - - if (enableConsolidatedBilling) { + if (consolidatedBillingEnabled) { request.taxInfo = new ExpandedTaxInfoUpdateRequest(); const taxInformation = this.manageTaxInformationComponent.getTaxInformation(); From 6687ef59784afcac26b71aee92627822f395ffd6 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Wed, 12 Jun 2024 14:33:18 -0700 Subject: [PATCH 2/6] [PM-7683] Fix dynamic item defects (#9575) * [PM-8639] Add data-testid attribute for test automation * [PM-8669] Add autofill aria label * [PM-8674] Show autofill menu options for card/identities when not in the autofill suggestion list * [PM-8635] Hide menu items when copy cipher field directive is disabled * [PM-8636] Disable copy menu dropdown when no items available to copy * [CL-309] Add title override to bitBadge * [PM-8669] Update menu-item directive disabled input * [PM-7683] Fix race condition for remainingCiphers$ * [PM-7683] Use strict equality check --- apps/browser/src/_locales/en/messages.json | 33 ++++++++----------- .../item-copy-actions.component.html | 23 ++++++++----- .../item-copy-actions.component.ts | 23 +++++++++++++ .../item-more-options.component.html | 2 +- .../item-more-options.component.ts | 13 +++++--- .../vault-list-items-container.component.html | 14 ++++++-- .../services/vault-popup-items.service.ts | 8 ++++- libs/components/src/badge/badge.directive.ts | 10 +++++- .../src/menu/menu-item.directive.ts | 8 ++++- .../components/copy-cipher-field.directive.ts | 24 ++++++++++++-- 10 files changed, 116 insertions(+), 42 deletions(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index ecea2deb9e..39f95f0990 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -3323,16 +3323,6 @@ "clearFiltersOrTryAnother": { "message": "Clear filters or try another search term" }, - "copyInfoLabel": { - "message": "Copy info, $ITEMNAME$", - "description": "Aria label for a button that opens a menu with options to copy information from an item.", - "placeholders": { - "itemname": { - "content": "$1", - "example": "Secret Item" - } - } - }, "copyInfoTitle": { "message": "Copy info - $ITEMNAME$", "description": "Title for a button that opens a menu with options to copy information from an item.", @@ -3343,16 +3333,6 @@ } } }, - "copyNoteLabel": { - "message": "Copy Note, $ITEMNAME$", - "description": "Aria label for a button copies a note to the clipboard.", - "placeholders": { - "itemname": { - "content": "$1", - "example": "Secret Note Item" - } - } - }, "copyNoteTitle": { "message": "Copy Note - $ITEMNAME$", "description": "Title for a button copies a note to the clipboard.", @@ -3393,6 +3373,19 @@ } } }, + "autofillTitle": { + "message": "Auto-fill - $ITEMNAME$", + "description": "Title for a button that auto-fills a login item.", + "placeholders": { + "itemname": { + "content": "$1", + "example": "Secret Item" + } + } + }, + "noValuesToCopy": { + "message": "No values to copy" + }, "assignCollections": { "message": "Assign collections" }, diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html index 08133c6b46..487168539b 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html +++ b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html @@ -3,8 +3,10 @@ type="button" bitIconButton="bwi-clone" size="small" - [attr.aria-label]="'copyInfoLabel' | i18n: cipher.name" - [title]="'copyInfoTitle' | i18n: cipher.name" + [appA11yTitle]=" + hasLoginValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n) + " + [disabled]="!hasLoginValues" [bitMenuTriggerFor]="loginOptions" > @@ -25,8 +27,10 @@ type="button" bitIconButton="bwi-clone" size="small" - [attr.aria-label]="'copyInfoLabel' | i18n: cipher.name" - [title]="'copyInfoTitle' | i18n: cipher.name" + [appA11yTitle]=" + hasCardValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n) + " + [disabled]="!hasCardValues" [bitMenuTriggerFor]="cardOptions" > @@ -44,8 +48,10 @@ type="button" bitIconButton="bwi-clone" size="small" - [attr.aria-label]="'copyInfoLabel' | i18n: cipher.name" - [title]="'copyInfoTitle' | i18n: cipher.name" + [appA11yTitle]=" + hasIdentityValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n) + " + [disabled]="!hasIdentityValues" [bitMenuTriggerFor]="identityOptions" > @@ -69,8 +75,9 @@ type="button" bitIconButton="bwi-clone" size="small" - [attr.aria-label]="'copyNoteLabel' | i18n: cipher.name" - [title]="'copyNoteTitle' | i18n: cipher.name" + [appA11yTitle]=" + hasSecureNoteValue ? ('copyNoteTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n) + " appCopyField="secureNote" [cipher]="cipher" > diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts index c89fcca3b3..a53c4a7c35 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.ts @@ -25,5 +25,28 @@ export class ItemCopyActionsComponent { protected CipherType = CipherType; + get hasLoginValues() { + return ( + !!this.cipher.login.hasTotp || !!this.cipher.login.password || !!this.cipher.login.username + ); + } + + get hasCardValues() { + return !!this.cipher.card.code || !!this.cipher.card.number; + } + + get hasIdentityValues() { + return ( + !!this.cipher.identity.fullAddressForCopy || + !!this.cipher.identity.email || + !!this.cipher.identity.username || + !!this.cipher.identity.phone + ); + } + + get hasSecureNoteValue() { + return !!this.cipher.notes; + } + constructor() {} } diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html index 1d7a2a8cd0..ef451bd934 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html +++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html @@ -8,7 +8,7 @@ [bitMenuTriggerFor]="moreOptions" > - + + diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts index f96bb095b9..c6d155c521 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts @@ -2,6 +2,7 @@ import { inject, Injectable, NgZone } from "@angular/core"; import { BehaviorSubject, combineLatest, + concatMap, distinctUntilChanged, distinctUntilKeyChanged, from, @@ -176,7 +177,12 @@ export class VaultPopupItemsService { * Ciphers are sorted by name. */ remainingCiphers$: Observable = this.favoriteCiphers$.pipe( - withLatestFrom(this._filteredCipherList$, this.autoFillCiphers$), + concatMap( + ( + favoriteCiphers, // concatMap->of is used to make withLatestFrom lazy to avoid race conditions with autoFillCiphers$ + ) => + of(favoriteCiphers).pipe(withLatestFrom(this._filteredCipherList$, this.autoFillCiphers$)), + ), map(([favoriteCiphers, ciphers, autoFillCiphers]) => ciphers.filter( (cipher) => !autoFillCiphers.includes(cipher) && !favoriteCiphers.includes(cipher), diff --git a/libs/components/src/badge/badge.directive.ts b/libs/components/src/badge/badge.directive.ts index ce41072706..55977f10f9 100644 --- a/libs/components/src/badge/badge.directive.ts +++ b/libs/components/src/badge/badge.directive.ts @@ -51,10 +51,18 @@ export class BadgeDirective implements FocusableElement { .concat(this.hasHoverEffects ? hoverStyles[this.variant] : []) .concat(this.truncate ? ["tw-truncate", this.maxWidthClass] : []); } - @HostBinding("attr.title") get title() { + @HostBinding("attr.title") get titleAttr() { + if (this.title !== undefined) { + return this.title; + } return this.truncate ? this.el.nativeElement.textContent.trim() : null; } + /** + * Optional override for the automatic badge title when truncating. + */ + @Input() title?: string; + /** * Variant, sets the background color of the badge. */ diff --git a/libs/components/src/menu/menu-item.directive.ts b/libs/components/src/menu/menu-item.directive.ts index 37289c9364..3f4b23e1cc 100644 --- a/libs/components/src/menu/menu-item.directive.ts +++ b/libs/components/src/menu/menu-item.directive.ts @@ -1,5 +1,6 @@ import { FocusableOption } from "@angular/cdk/a11y"; -import { Component, ElementRef, HostBinding } from "@angular/core"; +import { coerceBooleanProperty } from "@angular/cdk/coercion"; +import { Component, ElementRef, HostBinding, Input } from "@angular/core"; @Component({ selector: "[bitMenuItem]", @@ -32,6 +33,11 @@ export class MenuItemDirective implements FocusableOption { ]; @HostBinding("attr.role") role = "menuitem"; @HostBinding("tabIndex") tabIndex = "-1"; + @HostBinding("attr.disabled") get disabledAttr() { + return this.disabled || null; // native disabled attr must be null when false + } + + @Input({ transform: coerceBooleanProperty }) disabled?: boolean = false; constructor(private elementRef: ElementRef) {} diff --git a/libs/vault/src/components/copy-cipher-field.directive.ts b/libs/vault/src/components/copy-cipher-field.directive.ts index 2b79742c66..7d842c36bf 100644 --- a/libs/vault/src/components/copy-cipher-field.directive.ts +++ b/libs/vault/src/components/copy-cipher-field.directive.ts @@ -1,6 +1,7 @@ -import { Directive, HostBinding, HostListener, Input, OnChanges } from "@angular/core"; +import { Directive, HostBinding, HostListener, Input, OnChanges, Optional } from "@angular/core"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { MenuItemDirective } from "@bitwarden/components"; import { CopyAction, CopyCipherFieldService } from "@bitwarden/vault"; /** @@ -9,6 +10,8 @@ import { CopyAction, CopyCipherFieldService } from "@bitwarden/vault"; * * Automatically disables the host element if the field to copy is not available or null. * + * If the host element is a menu item, it will be hidden when disabled. + * * @example * ```html * @@ -27,11 +30,23 @@ export class CopyCipherFieldDirective implements OnChanges { @Input({ required: true }) cipher: CipherView; - constructor(private copyCipherFieldService: CopyCipherFieldService) {} + constructor( + private copyCipherFieldService: CopyCipherFieldService, + @Optional() private menuItemDirective?: MenuItemDirective, + ) {} @HostBinding("attr.disabled") protected disabled: boolean | null = null; + /** + * Hide the element if it is disabled and is a menu item. + * @private + */ + @HostBinding("class.tw-hidden") + private get hidden() { + return this.disabled && this.menuItemDirective; + } + @HostListener("click") async copy() { const value = this.getValueToCopy(); @@ -49,6 +64,11 @@ export class CopyCipherFieldDirective implements OnChanges { (this.action === "totp" && !(await this.copyCipherFieldService.totpAllowed(this.cipher))) ? true : null; + + // If the directive is used on a menu item, update the menu item to prevent keyboard navigation + if (this.menuItemDirective) { + this.menuItemDirective.disabled = this.disabled; + } } private getValueToCopy() { From b35930074cbbd97ad51ef2598d072eaa1917adce Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:09:35 +1000 Subject: [PATCH 3/6] [PM-8457] [PM-8608] Members page - remove paging logic / fix search (#9515) * update admin console members page to use Component Library components and tools, including virtual scroll and table filtering * temporarily duplicate the base component to avoid impacting other subclasses --- .../common/new-base.people.component.ts | 415 +++++++++++++++ .../organizations/members/members.module.ts | 2 + .../members/people.component.html | 501 +++++++++--------- .../organizations/members/people.component.ts | 41 +- 4 files changed, 679 insertions(+), 280 deletions(-) create mode 100644 apps/web/src/app/admin-console/common/new-base.people.component.ts diff --git a/apps/web/src/app/admin-console/common/new-base.people.component.ts b/apps/web/src/app/admin-console/common/new-base.people.component.ts new file mode 100644 index 0000000000..17f504c74a --- /dev/null +++ b/apps/web/src/app/admin-console/common/new-base.people.component.ts @@ -0,0 +1,415 @@ +import { Directive, ViewChild, ViewContainerRef } from "@angular/core"; +import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; +import { FormControl } from "@angular/forms"; +import { firstValueFrom, lastValueFrom, debounceTime } from "rxjs"; + +import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; +import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service"; +import { + OrganizationUserStatusType, + OrganizationUserType, + ProviderUserStatusType, + ProviderUserType, +} from "@bitwarden/common/admin-console/enums"; +import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response"; +import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { DialogService, TableDataSource } from "@bitwarden/components"; + +import { OrganizationUserView } from "../organizations/core/views/organization-user.view"; +import { UserConfirmComponent } from "../organizations/manage/user-confirm.component"; + +type StatusType = OrganizationUserStatusType | ProviderUserStatusType; + +const MaxCheckedCount = 500; + +/** + * A refactored copy of BasePeopleComponent, using the component library table and other modern features. + * This will replace BasePeopleComponent once all subclasses have been changed over to use this class. + */ +@Directive() +export abstract class NewBasePeopleComponent< + UserView extends ProviderUserUserDetailsResponse | OrganizationUserView, +> { + @ViewChild("confirmTemplate", { read: ViewContainerRef, static: true }) + confirmModalRef: ViewContainerRef; + + get allCount() { + return this.activeUsers != null ? this.activeUsers.length : 0; + } + + get invitedCount() { + return this.statusMap.has(this.userStatusType.Invited) + ? this.statusMap.get(this.userStatusType.Invited).length + : 0; + } + + get acceptedCount() { + return this.statusMap.has(this.userStatusType.Accepted) + ? this.statusMap.get(this.userStatusType.Accepted).length + : 0; + } + + get confirmedCount() { + return this.statusMap.has(this.userStatusType.Confirmed) + ? this.statusMap.get(this.userStatusType.Confirmed).length + : 0; + } + + get revokedCount() { + return this.statusMap.has(this.userStatusType.Revoked) + ? this.statusMap.get(this.userStatusType.Revoked).length + : 0; + } + + /** + * Shows a banner alerting the admin that users need to be confirmed. + */ + get showConfirmUsers(): boolean { + return ( + this.activeUsers != null && + this.statusMap != null && + this.activeUsers.length > 1 && + this.confirmedCount > 0 && + this.confirmedCount < 3 && + this.acceptedCount > 0 + ); + } + + get showBulkConfirmUsers(): boolean { + return this.acceptedCount > 0; + } + + abstract userType: typeof OrganizationUserType | typeof ProviderUserType; + abstract userStatusType: typeof OrganizationUserStatusType | typeof ProviderUserStatusType; + + protected dataSource = new TableDataSource(); + + firstLoaded: boolean; + + /** + * A hashmap that groups users by their status (invited/accepted/etc). This is used by the toggles to show + * user counts and filter data by user status. + */ + statusMap = new Map(); + + /** + * The currently selected status filter, or null to show all active users. + */ + status: StatusType | null; + + /** + * The currently executing promise - used to avoid multiple user actions executing at once. + */ + actionPromise: Promise; + + /** + * All users, loaded from the server, before any filtering has been applied. + */ + protected allUsers: UserView[] = []; + + /** + * Active users only, that is, users that are not in the revoked status. + */ + protected activeUsers: UserView[] = []; + + protected searchControl = new FormControl("", { nonNullable: true }); + + constructor( + protected apiService: ApiService, + protected i18nService: I18nService, + protected platformUtilsService: PlatformUtilsService, + protected cryptoService: CryptoService, + protected validationService: ValidationService, + protected modalService: ModalService, + private logService: LogService, + protected userNamePipe: UserNamePipe, + protected dialogService: DialogService, + protected organizationManagementPreferencesService: OrganizationManagementPreferencesService, + ) { + // Connect the search input to the table dataSource filter input + this.searchControl.valueChanges + .pipe(debounceTime(200), takeUntilDestroyed()) + .subscribe((v) => (this.dataSource.filter = v)); + } + + abstract edit(user: UserView): void; + abstract getUsers(): Promise | UserView[]>; + abstract deleteUser(id: string): Promise; + abstract revokeUser(id: string): Promise; + abstract restoreUser(id: string): Promise; + abstract reinviteUser(id: string): Promise; + abstract confirmUser(user: UserView, publicKey: Uint8Array): Promise; + + async load() { + // Load new users from the server + const response = await this.getUsers(); + + // Reset and repopulate the statusMap + this.statusMap.clear(); + this.activeUsers = []; + for (const status of Utils.iterateEnum(this.userStatusType)) { + this.statusMap.set(status, []); + } + + if (response instanceof ListResponse) { + this.allUsers = response.data != null && response.data.length > 0 ? response.data : []; + } else if (Array.isArray(response)) { + this.allUsers = response; + } + + this.allUsers.forEach((u) => { + if (!this.statusMap.has(u.status)) { + this.statusMap.set(u.status, [u]); + } else { + this.statusMap.get(u.status).push(u); + } + if (u.status !== this.userStatusType.Revoked) { + this.activeUsers.push(u); + } + }); + + // Filter based on UserStatus - this also populates the table on first load + this.filter(this.status); + + this.firstLoaded = true; + } + + /** + * Filter the data source by user status. + * This overwrites dataSource.data because this filtering needs to apply first, before the search input + */ + filter(status: StatusType | null) { + this.status = status; + if (this.status != null) { + this.dataSource.data = this.statusMap.get(this.status); + } else { + this.dataSource.data = this.activeUsers; + } + // Reset checkbox selection + this.selectAll(false); + } + + checkUser(user: UserView, select?: boolean) { + (user as any).checked = select == null ? !(user as any).checked : select; + } + + selectAll(select: boolean) { + if (select) { + // Reset checkbox selection first so we know nothing else is selected + this.selectAll(false); + } + + const filteredUsers = this.dataSource.filteredData; + + const selectCount = + select && filteredUsers.length > MaxCheckedCount ? MaxCheckedCount : filteredUsers.length; + for (let i = 0; i < selectCount; i++) { + this.checkUser(filteredUsers[i], select); + } + } + + invite() { + this.edit(null); + } + + protected async removeUserConfirmationDialog(user: UserView) { + return this.dialogService.openSimpleDialog({ + title: this.userNamePipe.transform(user), + content: { key: "removeUserConfirmation" }, + type: "warning", + }); + } + + async remove(user: UserView) { + const confirmed = await this.removeUserConfirmationDialog(user); + if (!confirmed) { + return false; + } + + this.actionPromise = this.deleteUser(user.id); + try { + await this.actionPromise; + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("removedUserId", this.userNamePipe.transform(user)), + ); + this.removeUser(user); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + protected async revokeUserConfirmationDialog(user: UserView) { + return this.dialogService.openSimpleDialog({ + title: { key: "revokeAccess", placeholders: [this.userNamePipe.transform(user)] }, + content: this.revokeWarningMessage(), + acceptButtonText: { key: "revokeAccess" }, + type: "warning", + }); + } + + async revoke(user: UserView) { + const confirmed = await this.revokeUserConfirmationDialog(user); + + if (!confirmed) { + return false; + } + + this.actionPromise = this.revokeUser(user.id); + try { + await this.actionPromise; + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)), + ); + await this.load(); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async restore(user: UserView) { + this.actionPromise = this.restoreUser(user.id); + try { + await this.actionPromise; + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)), + ); + await this.load(); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async reinvite(user: UserView) { + if (this.actionPromise != null) { + return; + } + + this.actionPromise = this.reinviteUser(user.id); + try { + await this.actionPromise; + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)), + ); + } catch (e) { + this.validationService.showError(e); + } + this.actionPromise = null; + } + + async confirm(user: UserView) { + function updateUser(self: NewBasePeopleComponent) { + user.status = self.userStatusType.Confirmed; + const mapIndex = self.statusMap.get(self.userStatusType.Accepted).indexOf(user); + if (mapIndex > -1) { + self.statusMap.get(self.userStatusType.Accepted).splice(mapIndex, 1); + self.statusMap.get(self.userStatusType.Confirmed).push(user); + } + } + + const confirmUser = async (publicKey: Uint8Array) => { + try { + this.actionPromise = this.confirmUser(user, publicKey); + await this.actionPromise; + updateUser(this); + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)), + ); + } catch (e) { + this.validationService.showError(e); + throw e; + } finally { + this.actionPromise = null; + } + }; + + if (this.actionPromise != null) { + return; + } + + try { + const publicKeyResponse = await this.apiService.getUserPublicKey(user.userId); + const publicKey = Utils.fromB64ToArray(publicKeyResponse.publicKey); + + const autoConfirm = await firstValueFrom( + this.organizationManagementPreferencesService.autoConfirmFingerPrints.state$, + ); + if (autoConfirm == null || !autoConfirm) { + const dialogRef = UserConfirmComponent.open(this.dialogService, { + data: { + name: this.userNamePipe.transform(user), + userId: user != null ? user.userId : null, + publicKey: publicKey, + confirmUser: () => confirmUser(publicKey), + }, + }); + await lastValueFrom(dialogRef.closed); + + return; + } + + try { + const fingerprint = await this.cryptoService.getFingerprint(user.userId, publicKey); + this.logService.info(`User's fingerprint: ${fingerprint.join("-")}`); + } catch (e) { + this.logService.error(e); + } + await confirmUser(publicKey); + } catch (e) { + this.logService.error(`Handled exception: ${e}`); + } + } + + protected revokeWarningMessage(): string { + return this.i18nService.t("revokeUserConfirmation"); + } + + protected getCheckedUsers() { + return this.dataSource.data.filter((u) => (u as any).checked); + } + + /** + * Remove a user row from the table and all related data sources + */ + protected removeUser(user: UserView) { + let index = this.dataSource.data.indexOf(user); + if (index > -1) { + // Clone the array so that the setter for dataSource.data is triggered to update the table rendering + const updatedData = [...this.dataSource.data]; + updatedData.splice(index, 1); + this.dataSource.data = updatedData; + } + + index = this.allUsers.indexOf(user); + if (index > -1) { + this.allUsers.splice(index, 1); + } + + if (this.statusMap.has(user.status)) { + index = this.statusMap.get(user.status).indexOf(user); + if (index > -1) { + this.statusMap.get(user.status).splice(index, 1); + } + } + } +} diff --git a/apps/web/src/app/admin-console/organizations/members/members.module.ts b/apps/web/src/app/admin-console/organizations/members/members.module.ts index 39246010d5..5dff43b77b 100644 --- a/apps/web/src/app/admin-console/organizations/members/members.module.ts +++ b/apps/web/src/app/admin-console/organizations/members/members.module.ts @@ -1,3 +1,4 @@ +import { ScrollingModule } from "@angular/cdk/scrolling"; import { NgModule } from "@angular/core"; import { PasswordCalloutComponent } from "@bitwarden/auth/angular"; @@ -22,6 +23,7 @@ import { PeopleComponent } from "./people.component"; MembersRoutingModule, UserDialogModule, PasswordCalloutComponent, + ScrollingModule, ], declarations: [ BulkConfirmComponent, diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html index 902efeafcd..c6e7bfd070 100644 --- a/apps/web/src/app/admin-console/organizations/members/people.component.html +++ b/apps/web/src/app/admin-console/organizations/members/people.component.html @@ -37,7 +37,7 @@ - + {{ "loading" | i18n }} - -

{{ "noMembersInList" | i18n }}

- + +

{{ "noMembersInList" | i18n }}

+ {{ "usersNeedConfirmed" | i18n }} - - - - - - - - {{ "name" | i18n }} - {{ (organization.useGroups ? "groups" : "collections") | i18n }} - {{ "role" | i18n }} - {{ "policies" | i18n }} - - - - - - - - - + + + + + + + + + + {{ "name" | i18n }} + {{ (organization.useGroups ? "groups" : "collections") | i18n }} + {{ "role" | i18n }} + {{ "policies" | i18n }} + - - - - - - - - - - - - - -
- -
-
- + + + + - {{ "invited" | i18n }} - {{ "needsConfirmation" | i18n }} - {{ "revoked" | i18n }} -
-
- {{ u.email }} + + + + + + + + + + + + + + + + + +
+ +
+
+ + {{ "invited" | i18n }} + {{ "needsConfirmation" | i18n }} + {{ "revoked" | i18n }} +
+
+ {{ u.email }} +
-
- + - - - + + + - - {{ u.type | userType }} - + + {{ u.type | userType }} + - - - - {{ "userUsingTwoStep" | i18n }} - - - - {{ "enrolledAccountRecovery" | i18n }} - - - - + + + + {{ "userUsingTwoStep" | i18n }} + + + + {{ "enrolledAccountRecovery" | i18n }} + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts index 668526b38c..a47e0acd0c 100644 --- a/apps/web/src/app/admin-console/organizations/members/people.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts @@ -1,4 +1,5 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; +import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; import { ActivatedRoute, Router } from "@angular/router"; import { combineLatest, @@ -9,16 +10,12 @@ import { map, Observable, shareReplay, - Subject, switchMap, - takeUntil, } from "rxjs"; -import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service"; @@ -50,7 +47,7 @@ import { CollectionDetailsResponse } from "@bitwarden/common/vault/models/respon import { DialogService, SimpleDialogOptions } from "@bitwarden/components"; import { openEntityEventsDialog } from "../../../admin-console/organizations/manage/entity-events.component"; -import { BasePeopleComponent } from "../../common/base.people.component"; +import { NewBasePeopleComponent } from "../../common/new-base.people.component"; import { GroupService } from "../core"; import { OrganizationUserView } from "../core/views/organization-user.view"; @@ -70,7 +67,7 @@ import { ResetPasswordComponent } from "./components/reset-password.component"; selector: "app-org-people", templateUrl: "people.component.html", }) -export class PeopleComponent extends BasePeopleComponent { +export class PeopleComponent extends NewBasePeopleComponent { @ViewChild("groupsTemplate", { read: ViewContainerRef, static: true }) groupsModalRef: ViewContainerRef; @ViewChild("confirmTemplate", { read: ViewContainerRef, static: true }) @@ -95,7 +92,9 @@ export class PeopleComponent extends BasePeopleComponent { protected canUseSecretsManager$: Observable; - private destroy$ = new Subject(); + // Fixed sizes used for cdkVirtualScroll + protected rowHeight = 62; + protected rowHeightClass = `tw-h-[62px]`; constructor( apiService: ApiService, @@ -104,12 +103,10 @@ export class PeopleComponent extends BasePeopleComponent { modalService: ModalService, platformUtilsService: PlatformUtilsService, cryptoService: CryptoService, - searchService: SearchService, validationService: ValidationService, private policyService: PolicyService, private policyApiService: PolicyApiService, logService: LogService, - searchPipe: SearchPipe, userNamePipe: UserNamePipe, private syncService: SyncService, private organizationService: OrganizationService, @@ -124,21 +121,17 @@ export class PeopleComponent extends BasePeopleComponent { ) { super( apiService, - searchService, i18nService, platformUtilsService, cryptoService, validationService, modalService, logService, - searchPipe, userNamePipe, dialogService, organizationManagementPreferencesService, ); - } - async ngOnInit() { const organization$ = this.route.params.pipe( concatMap((params) => this.organizationService.get$(params.organizationId)), shareReplay({ refCount: true, bufferSize: 1 }), @@ -198,29 +191,19 @@ export class PeopleComponent extends BasePeopleComponent { await this.load(); this.searchControl.setValue(qParams.search); + if (qParams.viewEvents != null) { - const user = this.users.filter((u) => u.id === qParams.viewEvents); + const user = this.dataSource.data.filter((u) => u.id === qParams.viewEvents); if (user.length > 0 && user[0].status === OrganizationUserStatusType.Confirmed) { - // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. - // eslint-disable-next-line @typescript-eslint/no-floating-promises - this.events(user[0]); + this.openEventsDialog(user[0]); } } }), - takeUntil(this.destroy$), + takeUntilDestroyed(), ) .subscribe(); } - ngOnDestroy(): void { - this.destroy$.next(); - this.destroy$.complete(); - } - - async load() { - await super.load(); - } - async getUsers(): Promise { let groupsPromise: Promise>; let collectionsPromise: Promise>; @@ -593,8 +576,8 @@ export class PeopleComponent extends BasePeopleComponent { await this.load(); } - async events(user: OrganizationUserView) { - await openEntityEventsDialog(this.dialogService, { + openEventsDialog(user: OrganizationUserView) { + openEntityEventsDialog(this.dialogService, { data: { name: this.userNamePipe.transform(user), organizationId: this.organization.id, From 89aa6220ca78921777f9a7b8f006b586a925659b Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:32:51 +1000 Subject: [PATCH 4/6] [AC-2740] Add device-approval to bw serve (#9512) * Extract bw serve endpoint configuration to a configurator class * Add device-approval endpoints to bw serve --- apps/cli/src/bw.ts | 6 + apps/cli/src/commands/serve.command.ts | 396 +---------------- apps/cli/src/oss-serve-configurator.ts | 399 ++++++++++++++++++ apps/cli/src/program.ts | 30 -- apps/cli/src/serve.program.ts | 49 +++ .../device-approval/approve-all.command.ts | 9 + .../device-approval/approve.command.ts | 8 + .../device-approval/deny-all.command.ts | 8 + .../device-approval/deny.command.ts | 8 + .../device-approval.program.ts | 26 +- .../admin-console/device-approval/index.ts | 7 +- .../device-approval/list.command.ts | 9 + .../bit-cli/src/bit-serve-configurator.ts | 95 +++++ bitwarden_license/bit-cli/src/bw.ts | 5 + 14 files changed, 613 insertions(+), 442 deletions(-) create mode 100644 apps/cli/src/oss-serve-configurator.ts create mode 100644 apps/cli/src/serve.program.ts create mode 100644 bitwarden_license/bit-cli/src/bit-serve-configurator.ts diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 03ebaa7368..e4c46dd9ee 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -1,6 +1,8 @@ import { program } from "commander"; +import { OssServeConfigurator } from "./oss-serve-configurator"; import { registerOssPrograms } from "./register-oss-programs"; +import { ServeProgram } from "./serve.program"; import { ServiceContainer } from "./service-container"; async function main() { @@ -9,6 +11,10 @@ async function main() { await registerOssPrograms(serviceContainer); + // ServeProgram is registered separately so it can be overridden by bit-cli + const serveConfigurator = new OssServeConfigurator(serviceContainer); + new ServeProgram(serviceContainer, serveConfigurator).register(); + program.parse(process.argv); } diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 8949e5b71e..05603a3c24 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -1,4 +1,3 @@ -import * as koaMulter from "@koa/multer"; import * as koaRouter from "@koa/router"; import { OptionValues } from "commander"; import * as koa from "koa"; @@ -7,170 +6,14 @@ import * as koaJson from "koa-json"; import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { ConfirmCommand } from "../admin-console/commands/confirm.command"; -import { ShareCommand } from "../admin-console/commands/share.command"; -import { LockCommand } from "../auth/commands/lock.command"; -import { UnlockCommand } from "../auth/commands/unlock.command"; -import { Response } from "../models/response"; -import { FileResponse } from "../models/response/file.response"; +import { OssServeConfigurator } from "../oss-serve-configurator"; import { ServiceContainer } from "../service-container"; -import { GenerateCommand } from "../tools/generate.command"; -import { - SendEditCommand, - SendCreateCommand, - SendDeleteCommand, - SendGetCommand, - SendListCommand, - SendRemovePasswordCommand, -} from "../tools/send"; -import { CreateCommand } from "../vault/create.command"; -import { DeleteCommand } from "../vault/delete.command"; -import { SyncCommand } from "../vault/sync.command"; - -import { EditCommand } from "./edit.command"; -import { GetCommand } from "./get.command"; -import { ListCommand } from "./list.command"; -import { RestoreCommand } from "./restore.command"; -import { StatusCommand } from "./status.command"; export class ServeCommand { - private listCommand: ListCommand; - private getCommand: GetCommand; - private createCommand: CreateCommand; - private editCommand: EditCommand; - private generateCommand: GenerateCommand; - private shareCommand: ShareCommand; - private statusCommand: StatusCommand; - private syncCommand: SyncCommand; - private deleteCommand: DeleteCommand; - private confirmCommand: ConfirmCommand; - private restoreCommand: RestoreCommand; - private lockCommand: LockCommand; - private unlockCommand: UnlockCommand; - - private sendCreateCommand: SendCreateCommand; - private sendDeleteCommand: SendDeleteCommand; - private sendEditCommand: SendEditCommand; - private sendGetCommand: SendGetCommand; - private sendListCommand: SendListCommand; - private sendRemovePasswordCommand: SendRemovePasswordCommand; - - constructor(protected serviceContainer: ServiceContainer) { - this.getCommand = new GetCommand( - this.serviceContainer.cipherService, - this.serviceContainer.folderService, - this.serviceContainer.collectionService, - this.serviceContainer.totpService, - this.serviceContainer.auditService, - this.serviceContainer.cryptoService, - this.serviceContainer.stateService, - this.serviceContainer.searchService, - this.serviceContainer.apiService, - this.serviceContainer.organizationService, - this.serviceContainer.eventCollectionService, - this.serviceContainer.billingAccountProfileStateService, - ); - this.listCommand = new ListCommand( - this.serviceContainer.cipherService, - this.serviceContainer.folderService, - this.serviceContainer.collectionService, - this.serviceContainer.organizationService, - this.serviceContainer.searchService, - this.serviceContainer.organizationUserService, - this.serviceContainer.apiService, - this.serviceContainer.eventCollectionService, - ); - this.createCommand = new CreateCommand( - this.serviceContainer.cipherService, - this.serviceContainer.folderService, - this.serviceContainer.cryptoService, - this.serviceContainer.apiService, - this.serviceContainer.folderApiService, - this.serviceContainer.billingAccountProfileStateService, - this.serviceContainer.organizationService, - ); - this.editCommand = new EditCommand( - this.serviceContainer.cipherService, - this.serviceContainer.folderService, - this.serviceContainer.cryptoService, - this.serviceContainer.apiService, - this.serviceContainer.folderApiService, - ); - this.generateCommand = new GenerateCommand( - this.serviceContainer.passwordGenerationService, - this.serviceContainer.stateService, - ); - this.syncCommand = new SyncCommand(this.serviceContainer.syncService); - this.statusCommand = new StatusCommand( - this.serviceContainer.environmentService, - this.serviceContainer.syncService, - this.serviceContainer.accountService, - this.serviceContainer.authService, - ); - this.deleteCommand = new DeleteCommand( - this.serviceContainer.cipherService, - this.serviceContainer.folderService, - this.serviceContainer.apiService, - this.serviceContainer.folderApiService, - this.serviceContainer.billingAccountProfileStateService, - ); - this.confirmCommand = new ConfirmCommand( - this.serviceContainer.apiService, - this.serviceContainer.cryptoService, - this.serviceContainer.organizationUserService, - ); - this.restoreCommand = new RestoreCommand(this.serviceContainer.cipherService); - this.shareCommand = new ShareCommand(this.serviceContainer.cipherService); - this.lockCommand = new LockCommand(this.serviceContainer.vaultTimeoutService); - this.unlockCommand = new UnlockCommand( - this.serviceContainer.accountService, - this.serviceContainer.masterPasswordService, - this.serviceContainer.cryptoService, - this.serviceContainer.stateService, - this.serviceContainer.cryptoFunctionService, - this.serviceContainer.apiService, - this.serviceContainer.logService, - this.serviceContainer.keyConnectorService, - this.serviceContainer.environmentService, - this.serviceContainer.syncService, - this.serviceContainer.organizationApiService, - async () => await this.serviceContainer.logout(), - this.serviceContainer.kdfConfigService, - ); - - this.sendCreateCommand = new SendCreateCommand( - this.serviceContainer.sendService, - this.serviceContainer.environmentService, - this.serviceContainer.sendApiService, - this.serviceContainer.billingAccountProfileStateService, - ); - this.sendDeleteCommand = new SendDeleteCommand( - this.serviceContainer.sendService, - this.serviceContainer.sendApiService, - ); - this.sendGetCommand = new SendGetCommand( - this.serviceContainer.sendService, - this.serviceContainer.environmentService, - this.serviceContainer.searchService, - this.serviceContainer.cryptoService, - ); - this.sendEditCommand = new SendEditCommand( - this.serviceContainer.sendService, - this.sendGetCommand, - this.serviceContainer.sendApiService, - this.serviceContainer.billingAccountProfileStateService, - ); - this.sendListCommand = new SendListCommand( - this.serviceContainer.sendService, - this.serviceContainer.environmentService, - this.serviceContainer.searchService, - ); - this.sendRemovePasswordCommand = new SendRemovePasswordCommand( - this.serviceContainer.sendService, - this.serviceContainer.sendApiService, - this.serviceContainer.environmentService, - ); - } + constructor( + protected serviceContainer: ServiceContainer, + protected serveConfigurator: OssServeConfigurator, + ) {} async run(options: OptionValues) { const protectOrigin = !options.disableOriginProtection; @@ -205,207 +48,7 @@ export class ServeCommand { .use(koaBodyParser()) .use(koaJson({ pretty: false, param: "pretty" })); - router.get("/generate", async (ctx, next) => { - const response = await this.generateCommand.run(ctx.request.query); - this.processResponse(ctx.response, response); - await next(); - }); - - router.get("/status", async (ctx, next) => { - const response = await this.statusCommand.run(); - this.processResponse(ctx.response, response); - await next(); - }); - - router.get("/list/object/:object", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - let response: Response = null; - if (ctx.params.object === "send") { - response = await this.sendListCommand.run(ctx.request.query); - } else { - response = await this.listCommand.run(ctx.params.object, ctx.request.query); - } - this.processResponse(ctx.response, response); - await next(); - }); - - router.get("/send/list", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.sendListCommand.run(ctx.request.query); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/sync", async (ctx, next) => { - const response = await this.syncCommand.run(ctx.request.query); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/lock", async (ctx, next) => { - const response = await this.lockCommand.run(); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/unlock", async (ctx, next) => { - // Do not allow guessing password location through serve command - delete ctx.request.query.passwordFile; - delete ctx.request.query.passwordEnv; - - const response = await this.unlockCommand.run( - ctx.request.body.password == null ? null : (ctx.request.body.password as string), - ctx.request.query, - ); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/confirm/:object/:id", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.confirmCommand.run( - ctx.params.object, - ctx.params.id, - ctx.request.query, - ); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/restore/:object/:id", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.restoreCommand.run(ctx.params.object, ctx.params.id); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/move/:id/:organizationId", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.shareCommand.run( - ctx.params.id, - ctx.params.organizationId, - ctx.request.body, // TODO: Check the format of this body for an array of collection ids - ); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/attachment", koaMulter().single("file"), async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.createCommand.run( - "attachment", - ctx.request.body, - ctx.request.query, - { - fileBuffer: ctx.request.file.buffer, - fileName: ctx.request.file.originalname, - }, - ); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/send/:id/remove-password", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - const response = await this.sendRemovePasswordCommand.run(ctx.params.id); - this.processResponse(ctx.response, response); - await next(); - }); - - router.post("/object/:object", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - let response: Response = null; - if (ctx.params.object === "send") { - response = await this.sendCreateCommand.run(ctx.request.body, ctx.request.query); - } else { - response = await this.createCommand.run( - ctx.params.object, - ctx.request.body, - ctx.request.query, - ); - } - this.processResponse(ctx.response, response); - await next(); - }); - - router.put("/object/:object/:id", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - let response: Response = null; - if (ctx.params.object === "send") { - ctx.request.body.id = ctx.params.id; - response = await this.sendEditCommand.run(ctx.request.body, ctx.request.query); - } else { - response = await this.editCommand.run( - ctx.params.object, - ctx.params.id, - ctx.request.body, - ctx.request.query, - ); - } - this.processResponse(ctx.response, response); - await next(); - }); - - router.get("/object/:object/:id", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - let response: Response = null; - if (ctx.params.object === "send") { - response = await this.sendGetCommand.run(ctx.params.id, null); - } else { - response = await this.getCommand.run(ctx.params.object, ctx.params.id, ctx.request.query); - } - this.processResponse(ctx.response, response); - await next(); - }); - - router.delete("/object/:object/:id", async (ctx, next) => { - if (await this.errorIfLocked(ctx.response)) { - await next(); - return; - } - let response: Response = null; - if (ctx.params.object === "send") { - response = await this.sendDeleteCommand.run(ctx.params.id); - } else { - response = await this.deleteCommand.run( - ctx.params.object, - ctx.params.id, - ctx.request.query, - ); - } - this.processResponse(ctx.response, response); - await next(); - }); + this.serveConfigurator.configureRouter(router); server .use(router.routes()) @@ -414,31 +57,4 @@ export class ServeCommand { this.serviceContainer.logService.info("Listening on " + hostname + ":" + port); }); } - - private processResponse(res: koa.Response, commandResponse: Response) { - if (!commandResponse.success) { - res.status = 400; - } - if (commandResponse.data instanceof FileResponse) { - res.body = commandResponse.data.data; - res.attachment(commandResponse.data.fileName); - res.set("Content-Type", "application/octet-stream"); - res.set("Content-Length", commandResponse.data.data.length.toString()); - } else { - res.body = commandResponse; - } - } - - private async errorIfLocked(res: koa.Response) { - const authed = await this.serviceContainer.stateService.getIsAuthenticated(); - if (!authed) { - this.processResponse(res, Response.error("You are not logged in.")); - return true; - } - if (await this.serviceContainer.cryptoService.hasUserKey()) { - return false; - } - this.processResponse(res, Response.error("Vault is locked.")); - return true; - } } diff --git a/apps/cli/src/oss-serve-configurator.ts b/apps/cli/src/oss-serve-configurator.ts new file mode 100644 index 0000000000..970be7a4bb --- /dev/null +++ b/apps/cli/src/oss-serve-configurator.ts @@ -0,0 +1,399 @@ +import * as koaMulter from "@koa/multer"; +import * as koaRouter from "@koa/router"; +import * as koa from "koa"; + +import { ConfirmCommand } from "./admin-console/commands/confirm.command"; +import { ShareCommand } from "./admin-console/commands/share.command"; +import { LockCommand } from "./auth/commands/lock.command"; +import { UnlockCommand } from "./auth/commands/unlock.command"; +import { EditCommand } from "./commands/edit.command"; +import { GetCommand } from "./commands/get.command"; +import { ListCommand } from "./commands/list.command"; +import { RestoreCommand } from "./commands/restore.command"; +import { StatusCommand } from "./commands/status.command"; +import { Response } from "./models/response"; +import { FileResponse } from "./models/response/file.response"; +import { ServiceContainer } from "./service-container"; +import { GenerateCommand } from "./tools/generate.command"; +import { + SendEditCommand, + SendCreateCommand, + SendDeleteCommand, + SendGetCommand, + SendListCommand, + SendRemovePasswordCommand, +} from "./tools/send"; +import { CreateCommand } from "./vault/create.command"; +import { DeleteCommand } from "./vault/delete.command"; +import { SyncCommand } from "./vault/sync.command"; + +export class OssServeConfigurator { + private listCommand: ListCommand; + private getCommand: GetCommand; + private createCommand: CreateCommand; + private editCommand: EditCommand; + private generateCommand: GenerateCommand; + private shareCommand: ShareCommand; + private statusCommand: StatusCommand; + private syncCommand: SyncCommand; + private deleteCommand: DeleteCommand; + private confirmCommand: ConfirmCommand; + private restoreCommand: RestoreCommand; + private lockCommand: LockCommand; + private unlockCommand: UnlockCommand; + + private sendCreateCommand: SendCreateCommand; + private sendDeleteCommand: SendDeleteCommand; + private sendEditCommand: SendEditCommand; + private sendGetCommand: SendGetCommand; + private sendListCommand: SendListCommand; + private sendRemovePasswordCommand: SendRemovePasswordCommand; + + constructor(protected serviceContainer: ServiceContainer) { + this.getCommand = new GetCommand( + this.serviceContainer.cipherService, + this.serviceContainer.folderService, + this.serviceContainer.collectionService, + this.serviceContainer.totpService, + this.serviceContainer.auditService, + this.serviceContainer.cryptoService, + this.serviceContainer.stateService, + this.serviceContainer.searchService, + this.serviceContainer.apiService, + this.serviceContainer.organizationService, + this.serviceContainer.eventCollectionService, + this.serviceContainer.billingAccountProfileStateService, + ); + this.listCommand = new ListCommand( + this.serviceContainer.cipherService, + this.serviceContainer.folderService, + this.serviceContainer.collectionService, + this.serviceContainer.organizationService, + this.serviceContainer.searchService, + this.serviceContainer.organizationUserService, + this.serviceContainer.apiService, + this.serviceContainer.eventCollectionService, + ); + this.createCommand = new CreateCommand( + this.serviceContainer.cipherService, + this.serviceContainer.folderService, + this.serviceContainer.cryptoService, + this.serviceContainer.apiService, + this.serviceContainer.folderApiService, + this.serviceContainer.billingAccountProfileStateService, + this.serviceContainer.organizationService, + ); + this.editCommand = new EditCommand( + this.serviceContainer.cipherService, + this.serviceContainer.folderService, + this.serviceContainer.cryptoService, + this.serviceContainer.apiService, + this.serviceContainer.folderApiService, + ); + this.generateCommand = new GenerateCommand( + this.serviceContainer.passwordGenerationService, + this.serviceContainer.stateService, + ); + this.syncCommand = new SyncCommand(this.serviceContainer.syncService); + this.statusCommand = new StatusCommand( + this.serviceContainer.environmentService, + this.serviceContainer.syncService, + this.serviceContainer.accountService, + this.serviceContainer.authService, + ); + this.deleteCommand = new DeleteCommand( + this.serviceContainer.cipherService, + this.serviceContainer.folderService, + this.serviceContainer.apiService, + this.serviceContainer.folderApiService, + this.serviceContainer.billingAccountProfileStateService, + ); + this.confirmCommand = new ConfirmCommand( + this.serviceContainer.apiService, + this.serviceContainer.cryptoService, + this.serviceContainer.organizationUserService, + ); + this.restoreCommand = new RestoreCommand(this.serviceContainer.cipherService); + this.shareCommand = new ShareCommand(this.serviceContainer.cipherService); + this.lockCommand = new LockCommand(this.serviceContainer.vaultTimeoutService); + this.unlockCommand = new UnlockCommand( + this.serviceContainer.accountService, + this.serviceContainer.masterPasswordService, + this.serviceContainer.cryptoService, + this.serviceContainer.stateService, + this.serviceContainer.cryptoFunctionService, + this.serviceContainer.apiService, + this.serviceContainer.logService, + this.serviceContainer.keyConnectorService, + this.serviceContainer.environmentService, + this.serviceContainer.syncService, + this.serviceContainer.organizationApiService, + async () => await this.serviceContainer.logout(), + this.serviceContainer.kdfConfigService, + ); + + this.sendCreateCommand = new SendCreateCommand( + this.serviceContainer.sendService, + this.serviceContainer.environmentService, + this.serviceContainer.sendApiService, + this.serviceContainer.billingAccountProfileStateService, + ); + this.sendDeleteCommand = new SendDeleteCommand( + this.serviceContainer.sendService, + this.serviceContainer.sendApiService, + ); + this.sendGetCommand = new SendGetCommand( + this.serviceContainer.sendService, + this.serviceContainer.environmentService, + this.serviceContainer.searchService, + this.serviceContainer.cryptoService, + ); + this.sendEditCommand = new SendEditCommand( + this.serviceContainer.sendService, + this.sendGetCommand, + this.serviceContainer.sendApiService, + this.serviceContainer.billingAccountProfileStateService, + ); + this.sendListCommand = new SendListCommand( + this.serviceContainer.sendService, + this.serviceContainer.environmentService, + this.serviceContainer.searchService, + ); + this.sendRemovePasswordCommand = new SendRemovePasswordCommand( + this.serviceContainer.sendService, + this.serviceContainer.sendApiService, + this.serviceContainer.environmentService, + ); + } + + configureRouter(router: koaRouter) { + router.get("/generate", async (ctx, next) => { + const response = await this.generateCommand.run(ctx.request.query); + this.processResponse(ctx.response, response); + await next(); + }); + + router.get("/status", async (ctx, next) => { + const response = await this.statusCommand.run(); + this.processResponse(ctx.response, response); + await next(); + }); + + router.get("/list/object/:object", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + let response: Response = null; + if (ctx.params.object === "send") { + response = await this.sendListCommand.run(ctx.request.query); + } else { + response = await this.listCommand.run(ctx.params.object, ctx.request.query); + } + this.processResponse(ctx.response, response); + await next(); + }); + + router.get("/send/list", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.sendListCommand.run(ctx.request.query); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/sync", async (ctx, next) => { + const response = await this.syncCommand.run(ctx.request.query); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/lock", async (ctx, next) => { + const response = await this.lockCommand.run(); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/unlock", async (ctx, next) => { + // Do not allow guessing password location through serve command + delete ctx.request.query.passwordFile; + delete ctx.request.query.passwordEnv; + + const response = await this.unlockCommand.run( + ctx.request.body.password == null ? null : (ctx.request.body.password as string), + ctx.request.query, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/confirm/:object/:id", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.confirmCommand.run( + ctx.params.object, + ctx.params.id, + ctx.request.query, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/restore/:object/:id", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.restoreCommand.run(ctx.params.object, ctx.params.id); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/move/:id/:organizationId", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.shareCommand.run( + ctx.params.id, + ctx.params.organizationId, + ctx.request.body, // TODO: Check the format of this body for an array of collection ids + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/attachment", koaMulter().single("file"), async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.createCommand.run( + "attachment", + ctx.request.body, + ctx.request.query, + { + fileBuffer: ctx.request.file.buffer, + fileName: ctx.request.file.originalname, + }, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/send/:id/remove-password", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + const response = await this.sendRemovePasswordCommand.run(ctx.params.id); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/object/:object", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + let response: Response = null; + if (ctx.params.object === "send") { + response = await this.sendCreateCommand.run(ctx.request.body, ctx.request.query); + } else { + response = await this.createCommand.run( + ctx.params.object, + ctx.request.body, + ctx.request.query, + ); + } + this.processResponse(ctx.response, response); + await next(); + }); + + router.put("/object/:object/:id", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + let response: Response = null; + if (ctx.params.object === "send") { + ctx.request.body.id = ctx.params.id; + response = await this.sendEditCommand.run(ctx.request.body, ctx.request.query); + } else { + response = await this.editCommand.run( + ctx.params.object, + ctx.params.id, + ctx.request.body, + ctx.request.query, + ); + } + this.processResponse(ctx.response, response); + await next(); + }); + + router.get("/object/:object/:id", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + let response: Response = null; + if (ctx.params.object === "send") { + response = await this.sendGetCommand.run(ctx.params.id, null); + } else { + response = await this.getCommand.run(ctx.params.object, ctx.params.id, ctx.request.query); + } + this.processResponse(ctx.response, response); + await next(); + }); + + router.delete("/object/:object/:id", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + let response: Response = null; + if (ctx.params.object === "send") { + response = await this.sendDeleteCommand.run(ctx.params.id); + } else { + response = await this.deleteCommand.run( + ctx.params.object, + ctx.params.id, + ctx.request.query, + ); + } + this.processResponse(ctx.response, response); + await next(); + }); + } + + protected processResponse(res: koa.Response, commandResponse: Response) { + if (!commandResponse.success) { + res.status = 400; + } + if (commandResponse.data instanceof FileResponse) { + res.body = commandResponse.data.data; + res.attachment(commandResponse.data.fileName); + res.set("Content-Type", "application/octet-stream"); + res.set("Content-Length", commandResponse.data.data.length.toString()); + } else { + res.body = commandResponse; + } + } + + protected async errorIfLocked(res: koa.Response) { + const authed = await this.serviceContainer.stateService.getIsAuthenticated(); + if (!authed) { + this.processResponse(res, Response.error("You are not logged in.")); + return true; + } + if (await this.serviceContainer.cryptoService.hasUserKey()) { + return false; + } + this.processResponse(res, Response.error("Vault is locked.")); + return true; + } +} diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 597b388a05..b8ddca11de 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -12,7 +12,6 @@ import { BaseProgram } from "./base-program"; import { CompletionCommand } from "./commands/completion.command"; import { ConfigCommand } from "./commands/config.command"; import { EncodeCommand } from "./commands/encode.command"; -import { ServeCommand } from "./commands/serve.command"; import { StatusCommand } from "./commands/status.command"; import { UpdateCommand } from "./commands/update.command"; import { Response } from "./models/response"; @@ -487,34 +486,5 @@ export class Program extends BaseProgram { const response = await command.run(); this.processResponse(response); }); - - program - .command("serve") - .description("Start a RESTful API webserver.") - .option("--hostname ", "The hostname to bind your API webserver to.") - .option("--port ", "The port to run your API webserver on.") - .option( - "--disable-origin-protection", - "If set, allows requests with origin header. Warning, this option exists for backwards compatibility reasons and exposes your environment to known CSRF attacks.", - ) - .on("--help", () => { - writeLn("\n Notes:"); - writeLn(""); - writeLn(" Default hostname is `localhost`."); - writeLn(" Use hostname `all` for no hostname binding."); - writeLn(" Default port is `8087`."); - writeLn(""); - writeLn(" Examples:"); - writeLn(""); - writeLn(" bw serve"); - writeLn(" bw serve --port 8080"); - writeLn(" bw serve --hostname bwapi.mydomain.com --port 80"); - writeLn("", true); - }) - .action(async (cmd) => { - await this.exitIfNotAuthed(); - const command = new ServeCommand(this.serviceContainer); - await command.run(cmd); - }); } } diff --git a/apps/cli/src/serve.program.ts b/apps/cli/src/serve.program.ts new file mode 100644 index 0000000000..bbf66661e5 --- /dev/null +++ b/apps/cli/src/serve.program.ts @@ -0,0 +1,49 @@ +import { program } from "commander"; + +import { BaseProgram } from "./base-program"; +import { ServeCommand } from "./commands/serve.command"; +import { OssServeConfigurator } from "./oss-serve-configurator"; +import { ServiceContainer } from "./service-container"; +import { CliUtils } from "./utils"; + +const writeLn = CliUtils.writeLn; + +export class ServeProgram extends BaseProgram { + constructor( + serviceContainer: ServiceContainer, + private configurator: OssServeConfigurator, + ) { + super(serviceContainer); + } + + register() { + program + .command("serve") + .description("Start a RESTful API webserver.") + .option("--hostname ", "The hostname to bind your API webserver to.") + .option("--port ", "The port to run your API webserver on.") + .option( + "--disable-origin-protection", + "If set, allows requests with origin header. Warning, this option exists for backwards compatibility reasons and exposes your environment to known CSRF attacks.", + ) + .on("--help", () => { + writeLn("\n Notes:"); + writeLn(""); + writeLn(" Default hostname is `localhost`."); + writeLn(" Use hostname `all` for no hostname binding."); + writeLn(" Default port is `8087`."); + writeLn(""); + writeLn(" Examples:"); + writeLn(""); + writeLn(" bw serve"); + writeLn(" bw serve --port 8080"); + writeLn(" bw serve --hostname bwapi.mydomain.com --port 80"); + writeLn("", true); + }) + .action(async (cmd) => { + await this.exitIfNotAuthed(); + const command = new ServeCommand(this.serviceContainer, this.configurator); + await command.run(cmd); + }); + } +} diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts index 3214a0fc41..bb00c50ab1 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts @@ -6,6 +6,8 @@ import { MessageResponse } from "@bitwarden/cli/models/response/message.response import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { ServiceContainer } from "../../service-container"; + export class ApproveAllCommand { constructor( private organizationAuthRequestService: OrganizationAuthRequestService, @@ -49,4 +51,11 @@ export class ApproveAllCommand { return Response.error(e); } } + + static create(serviceContainer: ServiceContainer) { + return new ApproveAllCommand( + serviceContainer.organizationAuthRequestService, + serviceContainer.organizationService, + ); + } } diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts index 8efa172296..918bd077b0 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts @@ -5,6 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Utils } from "@bitwarden/common/platform/misc/utils"; import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests"; +import { ServiceContainer } from "../../service-container"; export class ApproveCommand { constructor( @@ -51,4 +52,11 @@ export class ApproveCommand { return Response.error(e); } } + + static create(serviceContainer: ServiceContainer) { + return new ApproveCommand( + serviceContainer.organizationService, + serviceContainer.organizationAuthRequestService, + ); + } } diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts index 59cc4235eb..db73773f08 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts @@ -6,6 +6,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Utils } from "@bitwarden/common/platform/misc/utils"; import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests"; +import { ServiceContainer } from "../../service-container"; export class DenyAllCommand { constructor( @@ -46,4 +47,11 @@ export class DenyAllCommand { return Response.error(e); } } + + static create(serviceContainer: ServiceContainer) { + return new DenyAllCommand( + serviceContainer.organizationService, + serviceContainer.organizationAuthRequestService, + ); + } } diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts index a9676d3fc5..3470baaa25 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts @@ -5,6 +5,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { Utils } from "@bitwarden/common/platform/misc/utils"; import { OrganizationAuthRequestService } from "../../../../bit-common/src/admin-console/auth-requests"; +import { ServiceContainer } from "../../service-container"; export class DenyCommand { constructor( @@ -43,4 +44,11 @@ export class DenyCommand { return Response.error(e); } } + + static create(serviceContainer: ServiceContainer) { + return new DenyCommand( + serviceContainer.organizationService, + serviceContainer.organizationAuthRequestService, + ); + } } diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts index 408a5b8d81..984bd15cde 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/device-approval.program.ts @@ -42,11 +42,7 @@ export class DeviceApprovalProgram extends BaseProgram { await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval); await this.exitIfLocked(); - const cmd = new ListCommand( - this.serviceContainer.organizationAuthRequestService, - this.serviceContainer.organizationService, - ); - + const cmd = ListCommand.create(this.serviceContainer); const response = await cmd.run(options.organizationid); this.processResponse(response); }); @@ -61,10 +57,7 @@ export class DeviceApprovalProgram extends BaseProgram { await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval); await this.exitIfLocked(); - const cmd = new ApproveCommand( - this.serviceContainer.organizationService, - this.serviceContainer.organizationAuthRequestService, - ); + const cmd = ApproveCommand.create(this.serviceContainer); const response = await cmd.run(options.organizationid, id); this.processResponse(response); }); @@ -78,10 +71,7 @@ export class DeviceApprovalProgram extends BaseProgram { await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval); await this.exitIfLocked(); - const cmd = new ApproveAllCommand( - this.serviceContainer.organizationAuthRequestService, - this.serviceContainer.organizationService, - ); + const cmd = ApproveAllCommand.create(this.serviceContainer); const response = await cmd.run(options.organizationid); this.processResponse(response); }); @@ -96,10 +86,7 @@ export class DeviceApprovalProgram extends BaseProgram { await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval); await this.exitIfLocked(); - const cmd = new DenyCommand( - this.serviceContainer.organizationService, - this.serviceContainer.organizationAuthRequestService, - ); + const cmd = DenyCommand.create(this.serviceContainer); const response = await cmd.run(options.organizationid, id); this.processResponse(response); }); @@ -113,10 +100,7 @@ export class DeviceApprovalProgram extends BaseProgram { await this.exitIfFeatureFlagDisabled(FeatureFlag.BulkDeviceApproval); await this.exitIfLocked(); - const cmd = new DenyAllCommand( - this.serviceContainer.organizationService, - this.serviceContainer.organizationAuthRequestService, - ); + const cmd = DenyAllCommand.create(this.serviceContainer); const response = await cmd.run(options.organizationid); this.processResponse(response); }); diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/index.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/index.ts index 399f89623e..0482c8caf1 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/index.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/index.ts @@ -1 +1,6 @@ -export { DeviceApprovalProgram } from "./device-approval.program"; +export * from "./device-approval.program"; +export * from "./approve.command"; +export * from "./approve-all.command"; +export * from "./deny.command"; +export * from "./deny-all.command"; +export * from "./list.command"; diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts index 10da11b35c..972be460df 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts @@ -6,6 +6,8 @@ import { ListResponse } from "@bitwarden/cli/models/response/list.response"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { ServiceContainer } from "../../service-container"; + import { PendingAuthRequestResponse } from "./pending-auth-request.response"; export class ListCommand { @@ -39,4 +41,11 @@ export class ListCommand { return Response.error(e); } } + + static create(serviceContainer: ServiceContainer) { + return new ListCommand( + serviceContainer.organizationAuthRequestService, + serviceContainer.organizationService, + ); + } } diff --git a/bitwarden_license/bit-cli/src/bit-serve-configurator.ts b/bitwarden_license/bit-cli/src/bit-serve-configurator.ts new file mode 100644 index 0000000000..c669eb7092 --- /dev/null +++ b/bitwarden_license/bit-cli/src/bit-serve-configurator.ts @@ -0,0 +1,95 @@ +import * as koaRouter from "@koa/router"; + +import { OssServeConfigurator } from "@bitwarden/cli/oss-serve-configurator"; + +import { + ApproveAllCommand, + ApproveCommand, + DenyAllCommand, + DenyCommand, + ListCommand, +} from "./admin-console/device-approval"; +import { ServiceContainer } from "./service-container"; + +export class BitServeConfigurator extends OssServeConfigurator { + constructor(protected override serviceContainer: ServiceContainer) { + super(serviceContainer); + } + + override configureRouter(router: koaRouter): void { + // Register OSS endpoints + super.configureRouter(router); + + // Register bit endpoints + this.serveDeviceApprovals(router); + } + + private serveDeviceApprovals(router: koaRouter) { + router.get("/device-approval/:organizationId", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + + const response = await ListCommand.create(this.serviceContainer).run( + ctx.params.organizationId, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/device-approval/:organizationId/approve-all", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + + const response = await ApproveAllCommand.create(this.serviceContainer).run( + ctx.params.organizationId, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/device-approval/:organizationId/approve/:requestId", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + + const response = await ApproveCommand.create(this.serviceContainer).run( + ctx.params.organizationId, + ctx.params.requestId, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/device-approval/:organizationId/deny-all", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + + const response = await DenyAllCommand.create(this.serviceContainer).run( + ctx.params.organizationId, + ); + this.processResponse(ctx.response, response); + await next(); + }); + + router.post("/device-approval/:organizationId/deny/:requestId", async (ctx, next) => { + if (await this.errorIfLocked(ctx.response)) { + await next(); + return; + } + + const response = await DenyCommand.create(this.serviceContainer).run( + ctx.params.organizationId, + ctx.params.requestId, + ); + this.processResponse(ctx.response, response); + await next(); + }); + } +} diff --git a/bitwarden_license/bit-cli/src/bw.ts b/bitwarden_license/bit-cli/src/bw.ts index d6ebcaf041..ffbc186d9e 100644 --- a/bitwarden_license/bit-cli/src/bw.ts +++ b/bitwarden_license/bit-cli/src/bw.ts @@ -1,7 +1,9 @@ import { program } from "commander"; import { registerOssPrograms } from "@bitwarden/cli/register-oss-programs"; +import { ServeProgram } from "@bitwarden/cli/serve.program"; +import { BitServeConfigurator } from "./bit-serve-configurator"; import { registerBitPrograms } from "./register-bit-programs"; import { ServiceContainer } from "./service-container"; @@ -12,6 +14,9 @@ async function main() { await registerOssPrograms(serviceContainer); await registerBitPrograms(serviceContainer); + const serveConfigurator = new BitServeConfigurator(serviceContainer); + new ServeProgram(serviceContainer, serveConfigurator).register(); + program.parse(process.argv); } From 61e578e9832684fb136a541591213c34ba498a2e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:23:17 +1000 Subject: [PATCH 5/6] [deps] AC: Update webpack to v5.92.0 (#8477) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 54 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf734e25a3..b3419b7de3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -185,7 +185,7 @@ "url": "0.11.3", "util": "0.12.5", "wait-on": "7.2.0", - "webpack": "5.89.0", + "webpack": "5.92.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", "webpack-node-externals": "3.0.0" @@ -13528,6 +13528,16 @@ "acorn": "^8" } }, + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -18836,10 +18846,11 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", - "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz", + "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -39429,34 +39440,35 @@ } }, "node_modules/webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", + "version": "5.92.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz", + "integrity": "sha512-Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA==", "dev": true, + "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -39834,6 +39846,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -39850,6 +39863,7 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, + "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" } @@ -39859,6 +39873,7 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -39872,6 +39887,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -39880,13 +39896,15 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/webpack/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", diff --git a/package.json b/package.json index 93a6b51280..14f0fa3fcd 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "url": "0.11.3", "util": "0.12.5", "wait-on": "7.2.0", - "webpack": "5.89.0", + "webpack": "5.92.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", "webpack-node-externals": "3.0.0" From d8c764fc9e85a99a3088a294743062f91a6e67c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:39:50 +1000 Subject: [PATCH 6/6] [deps] AC: Update sass-loader to v14 (#8481) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 18 +++++++++++------- package.json | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3419b7de3..ab127c1005 100644 --- a/package-lock.json +++ b/package-lock.json @@ -173,7 +173,7 @@ "remark-gfm": "3.0.1", "rimraf": "5.0.7", "sass": "1.74.1", - "sass-loader": "13.3.3", + "sass-loader": "14.2.1", "storybook": "7.6.19", "style-loader": "3.3.4", "tailwindcss": "3.4.3", @@ -34935,29 +34935,30 @@ } }, "node_modules/sass-loader": { - "version": "13.3.3", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz", - "integrity": "sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA==", + "version": "14.2.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz", + "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==", "dev": true, + "license": "MIT", "dependencies": { "neo-async": "^2.6.2" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "fibers": ">= 3.1.0", + "@rspack/core": "0.x || 1.x", "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" }, "peerDependenciesMeta": { - "fibers": { + "@rspack/core": { "optional": true }, "node-sass": { @@ -34968,6 +34969,9 @@ }, "sass-embedded": { "optional": true + }, + "webpack": { + "optional": true } } }, diff --git a/package.json b/package.json index 14f0fa3fcd..4d38e7eba5 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "remark-gfm": "3.0.1", "rimraf": "5.0.7", "sass": "1.74.1", - "sass-loader": "13.3.3", + "sass-loader": "14.2.1", "storybook": "7.6.19", "style-loader": "3.3.4", "tailwindcss": "3.4.3",