From 8451cd5d436b4647f8810f7f49c15dd722466c14 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 25 Jan 2023 09:19:15 -0500 Subject: [PATCH 01/99] resolve tsconfig eslint errors (#4562) --- .eslintrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 6bcea9dd045..d48d9015324 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,7 +7,7 @@ "plugins": ["@typescript-eslint", "rxjs", "rxjs-angular", "import"], "parser": "@typescript-eslint/parser", "parserOptions": { - "project": ["./tsconfig.eslint.json"], + "project": ["**/tsconfig.eslint.json"], "sourceType": "module" }, "extends": [ From 0ce33fcd3b34852f353831d82fa41e41d74c4086 Mon Sep 17 00:00:00 2001 From: Jake Fink Date: Wed, 25 Jan 2023 10:58:08 -0500 Subject: [PATCH 02/99] [EC-1023] add bitMenuItem to menu buttons (#4551) --- apps/web/src/app/organizations/vault/vault.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/organizations/vault/vault.component.html b/apps/web/src/app/organizations/vault/vault.component.html index 4680ebfce17..dac8764cfcf 100644 --- a/apps/web/src/app/organizations/vault/vault.component.html +++ b/apps/web/src/app/organizations/vault/vault.component.html @@ -54,11 +54,11 @@ {{ "new" | i18n }} - - From d822c8591d95e087828478440a8ce140d46121ce Mon Sep 17 00:00:00 2001 From: Jake Fink Date: Wed, 25 Jan 2023 10:59:55 -0500 Subject: [PATCH 03/99] [EC-1021] move padding to permission select (#4550) --- .../components/access-selector/access-selector.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html index 8cba0eb3f01..c0bc67c4f9e 100644 --- a/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html +++ b/apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.html @@ -1,5 +1,5 @@
- + {{ "permission" | i18n }} -

{{ "selfHostingTitle" | i18n }}

-

- {{ "selfHostingEnterpriseOrganizationSectionCopy" | i18n }} -

-
- - -
-
- -
-

{{ "additionalOptions" | i18n }}

-

- {{ "additionalOptionsDesc" | i18n }} -

-
- -
- - -
-
{{ "billingPlan" | i18n }}
-
{{ sub.plan.name }}
-
{{ "expiration" | i18n }}
-
- {{ sub.expiration | date: "mediumDate" }} - - - {{ "licenseIsExpired" | i18n }} - -
-
{{ "neverExpires" | i18n }}
-
-
- - - {{ "manageSubscription" | i18n }} - -
-
-
- -

{{ "updateLicense" | i18n }}

- -
-
-
-

- {{ "billingSync" | i18n }} -

-

- {{ "billingSyncDesc" | i18n }} -

- - - {{ "lastSync" | i18n }}: - - {{ userOrg.familySponsorshipLastSyncDate | date: "medium" }} - - - {{ "never" | i18n | lowercase }} - - -
- - - - diff --git a/apps/web/src/app/organizations/billing/subscription-hidden.icon.ts b/apps/web/src/app/organizations/billing/subscription-hidden.component.ts similarity index 96% rename from apps/web/src/app/organizations/billing/subscription-hidden.icon.ts rename to apps/web/src/app/organizations/billing/subscription-hidden.component.ts index 3745747eceb..a603fff7804 100644 --- a/apps/web/src/app/organizations/billing/subscription-hidden.icon.ts +++ b/apps/web/src/app/organizations/billing/subscription-hidden.component.ts @@ -1,6 +1,8 @@ +import { Component, Input } from "@angular/core"; + import { svgIcon } from "@bitwarden/components"; -export const SubscriptionHiddenIcon = svgIcon` +const SubscriptionHiddenIcon = svgIcon` @@ -22,3 +24,16 @@ export const SubscriptionHiddenIcon = svgIcon` `; + +@Component({ + selector: "app-org-subscription-hidden", + template: `
+ +

{{ "billingManagedByProvider" | i18n: providerName }}

+

{{ "billingContactProviderForAssistance" | i18n }}

+
`, +}) +export class SubscriptionHiddenComponent { + @Input() providerName: string; + subscriptionHiddenIcon = SubscriptionHiddenIcon; +} diff --git a/apps/web/src/app/settings/billing-sync-key.component.ts b/apps/web/src/app/settings/billing-sync-key.component.ts index 70929ed8081..45b3a06d698 100644 --- a/apps/web/src/app/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/settings/billing-sync-key.component.ts @@ -1,5 +1,7 @@ import { Component } from "@angular/core"; +import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; +import { ModalConfig } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationConnectionType } from "@bitwarden/common/enums/organizationConnectionType"; @@ -8,6 +10,13 @@ import { BillingSyncConfigRequest } from "@bitwarden/common/models/request/billi import { OrganizationConnectionRequest } from "@bitwarden/common/models/request/organization-connection.request"; import { OrganizationConnectionResponse } from "@bitwarden/common/models/response/organization-connection.response"; +export interface BillingSyncKeyModalData { + entityId: string; + existingConnectionId: string; + billingSyncKey: string; + setParentConnection: (connection: OrganizationConnectionResponse) => void; +} + @Component({ selector: "app-billing-sync-key", templateUrl: "billing-sync-key.component.html", @@ -20,7 +29,17 @@ export class BillingSyncKeyComponent { formPromise: Promise> | Promise; - constructor(private apiService: ApiService, private logService: LogService) {} + constructor( + private apiService: ApiService, + private logService: LogService, + protected modalRef: ModalRef, + config: ModalConfig + ) { + this.entityId = config.data.entityId; + this.existingConnectionId = config.data.existingConnectionId; + this.billingSyncKey = config.data.billingSyncKey; + this.setParentConnection = config.data.setParentConnection; + } async submit() { try { @@ -47,6 +66,7 @@ export class BillingSyncKeyComponent { this.existingConnectionId = response?.id; this.billingSyncKey = response?.config?.billingSyncKey; this.setParentConnection(response); + this.modalRef.close(); } catch (e) { this.logService.error(e); } @@ -56,5 +76,6 @@ export class BillingSyncKeyComponent { this.formPromise = this.apiService.deleteOrganizationConnection(this.existingConnectionId); await this.formPromise; this.setParentConnection(null); + this.modalRef.close(); } } diff --git a/apps/web/src/app/settings/update-license.component.html b/apps/web/src/app/settings/update-license.component.html index 3884f569350..56058b158e8 100644 --- a/apps/web/src/app/settings/update-license.component.html +++ b/apps/web/src/app/settings/update-license.component.html @@ -14,7 +14,7 @@ {{ "submit" | i18n }} - diff --git a/apps/web/src/app/settings/update-license.component.ts b/apps/web/src/app/settings/update-license.component.ts index de23be5f777..6a43a9df99f 100644 --- a/apps/web/src/app/settings/update-license.component.ts +++ b/apps/web/src/app/settings/update-license.component.ts @@ -12,6 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti }) export class UpdateLicenseComponent { @Input() organizationId: string; + @Input() showCancel = true; @Output() onUpdated = new EventEmitter(); @Output() onCanceled = new EventEmitter(); diff --git a/apps/web/src/app/shared/shared.module.ts b/apps/web/src/app/shared/shared.module.ts index 0bc8321c171..7ac8e3a8e39 100644 --- a/apps/web/src/app/shared/shared.module.ts +++ b/apps/web/src/app/shared/shared.module.ts @@ -25,6 +25,7 @@ import { MultiSelectModule, TableModule, TabsModule, + RadioButtonModule, ToggleGroupModule, } from "@bitwarden/components"; @@ -68,6 +69,7 @@ import "./locales"; MultiSelectModule, TableModule, TabsModule, + RadioButtonModule, ToggleGroupModule, // Web specific @@ -100,6 +102,7 @@ import "./locales"; MultiSelectModule, TableModule, TabsModule, + RadioButtonModule, ToggleGroupModule, // Web specific diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index dcec317bf08..6cf0751911f 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -2058,6 +2058,9 @@ "manageSubscription": { "message": "Manage subscription" }, + "launchCloudSubscription": { + "message": "Launch Cloud Subscription" + }, "storage": { "message": "Storage" }, @@ -5239,11 +5242,8 @@ "billingSyncApiKeyRotated": { "message": "Token rotated" }, - "billingSync": { - "message": "Billing sync" - }, "billingSyncDesc": { - "message": "Billing sync provides Free Families plans for members and advanced billing capabilities by linking your self-hosted Bitwarden to the Bitwarden cloud server." + "message": "Billing sync unlocks Families sponsorships and automatic license syncing on your server. After making updates in the Bitwarden cloud server, select Sync License to apply changes." }, "billingSyncKeyDesc": { "message": "A billing sync token from your cloud organization's subscription settings is required to complete this form." @@ -6105,6 +6105,36 @@ } } }, + "licenseAndBillingManagement": { + "message": "License and billing management" + }, + "automaticSync": { + "message": "Automatic sync" + }, + "manualUpload": { + "message": "Manual upload" + }, + "manualUploadDesc": { + "message": "If you do not want to opt into billing sync, manually upload your license here." + }, + "syncLicense": { + "message": "Sync license" + }, + "licenseSyncSuccess": { + "message": "Successfully synced license" + }, + "licenseUploadSuccess": { + "message": "Successfully uploaded license" + }, + "lastLicenseSync": { + "message": "Last license sync" + }, + "billingSyncHelp": { + "message": "Billing Sync help" + }, + "uploadLicense": { + "message": "Upload license" + }, "lowKdfIterations": { "message": "Low KDF Iterations" }, diff --git a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts index cd86b0b46aa..92f4711d146 100644 --- a/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts +++ b/libs/common/src/abstractions/organization/organization-api.service.abstraction.ts @@ -58,4 +58,5 @@ export class OrganizationApiServiceAbstraction { updateKeys: (id: string, request: OrganizationKeysRequest) => Promise; getSso: (id: string) => Promise; updateSso: (id: string, request: OrganizationSsoRequest) => Promise; + selfHostedSyncLicense: (id: string) => Promise; } diff --git a/libs/common/src/models/api/billing-sync-config.api.ts b/libs/common/src/models/api/billing-sync-config.api.ts index 8850dc8c513..b99c6a89ce7 100644 --- a/libs/common/src/models/api/billing-sync-config.api.ts +++ b/libs/common/src/models/api/billing-sync-config.api.ts @@ -2,6 +2,7 @@ import { BaseResponse } from "../response/base.response"; export class BillingSyncConfigApi extends BaseResponse { billingSyncKey: string; + lastLicenseSync: Date; constructor(data: any) { super(data); @@ -9,5 +10,10 @@ export class BillingSyncConfigApi extends BaseResponse { return; } this.billingSyncKey = this.getResponseProperty("BillingSyncKey"); + + const lastLicenseSyncString = this.getResponseProperty("LastLicenseSync"); + if (lastLicenseSyncString) { + this.lastLicenseSync = new Date(lastLicenseSyncString); + } } } diff --git a/libs/common/src/services/organization/organization-api.service.ts b/libs/common/src/services/organization/organization-api.service.ts index 58630e73d87..51337eb91e6 100644 --- a/libs/common/src/services/organization/organization-api.service.ts +++ b/libs/common/src/services/organization/organization-api.service.ts @@ -87,7 +87,13 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction } async createLicense(data: FormData): Promise { - const r = await this.apiService.send("POST", "/organizations/license", data, true, true); + const r = await this.apiService.send( + "POST", + "/organizations/licenses/self-hosted", + data, + true, + true + ); return new OrganizationResponse(r); } @@ -177,7 +183,13 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction } async updateLicense(id: string, data: FormData): Promise { - await this.apiService.send("POST", "/organizations/" + id + "/license", data, true, false); + await this.apiService.send( + "POST", + "/organizations/licenses/self-hosted/" + id, + data, + true, + false + ); } async importDirectory(organizationId: string, request: ImportDirectoryRequest): Promise { @@ -270,4 +282,14 @@ export class OrganizationApiService implements OrganizationApiServiceAbstraction // Not broadcasting anything because data on this response doesn't correspond to `Organization` return new OrganizationSsoResponse(r); } + + async selfHostedSyncLicense(id: string) { + await this.apiService.send( + "POST", + "/organizations/licenses/self-hosted/" + id + "/sync/", + null, + true, + false + ); + } } diff --git a/libs/components/src/form/form.stories.ts b/libs/components/src/form/form.stories.ts index 050ea5e2c8f..741aac859a2 100644 --- a/libs/components/src/form/form.stories.ts +++ b/libs/components/src/form/form.stories.ts @@ -98,9 +98,15 @@ const FullExampleTemplate: Story = (args) => ({ Subscribe to updates? - Yes - No - Decide later + + Yes + + + No + + + Decide later + diff --git a/libs/components/src/radio-button/radio-button.component.html b/libs/components/src/radio-button/radio-button.component.html index 2bcd4c0d5f1..0d455596536 100644 --- a/libs/components/src/radio-button/radio-button.component.html +++ b/libs/components/src/radio-button/radio-button.component.html @@ -10,5 +10,6 @@ (change)="onInputChange()" (blur)="onBlur()" /> - + + diff --git a/libs/components/src/radio-button/radio-button.component.spec.ts b/libs/components/src/radio-button/radio-button.component.spec.ts index 1d2759c1af1..400b631d1ee 100644 --- a/libs/components/src/radio-button/radio-button.component.spec.ts +++ b/libs/components/src/radio-button/radio-button.component.spec.ts @@ -72,7 +72,7 @@ class MockedButtonGroupComponent implements Partial { @Component({ selector: "test-app", - template: ` Element`, + template: ` Element`, }) class TestApp { value?: string; diff --git a/libs/components/src/radio-button/radio-button.stories.ts b/libs/components/src/radio-button/radio-button.stories.ts index 4990c6b6ce0..abc7ddb92a5 100644 --- a/libs/components/src/radio-button/radio-button.stories.ts +++ b/libs/components/src/radio-button/radio-button.stories.ts @@ -12,21 +12,26 @@ const template = `
Group of radio buttons - First - Second - Third + + {{ option.key }} + This is a hint for the {{option.key}} option +
`; -enum TestValue { - First, - Second, - Third, -} +const TestValue = { + First: 0, + Second: 1, + Third: 2, +}; + +const reverseObject = (obj: Record) => + Object.fromEntries(Object.entries(obj).map(([key, value]) => [value, key])); @Component({ selector: "app-example", - template, + template: template, }) class ExampleComponent { protected TestValue = TestValue; @@ -35,9 +40,11 @@ class ExampleComponent { radio: TestValue.First, }); + @Input() layout: "block" | "inline" = "inline"; + @Input() label: boolean; - @Input() set selected(value: TestValue) { + @Input() set selected(value: number) { this.formObj.patchValue({ radio: value }); } @@ -49,7 +56,11 @@ class ExampleComponent { } } - @Input() optionDisabled = false; + @Input() optionDisabled: number[] = []; + + get blockLayout() { + return this.layout === "block"; + } constructor(private formBuilder: FormBuilder) {} } @@ -84,27 +95,53 @@ export default { args: { selected: TestValue.First, groupDisabled: false, - optionDisabled: false, + optionDisabled: null, label: true, + layout: "inline", }, argTypes: { selected: { - options: [TestValue.First, TestValue.Second, TestValue.Third], + options: Object.values(TestValue), control: { type: "inline-radio", - labels: { - [TestValue.First]: "First", - [TestValue.Second]: "Second", - [TestValue.Third]: "Third", - }, + labels: reverseObject(TestValue), + }, + }, + optionDisabled: { + options: Object.values(TestValue), + control: { + type: "check", + labels: reverseObject(TestValue), + }, + }, + layout: { + options: ["inline", "block"], + control: { + type: "inline-radio", + labels: ["inline", "block"], }, }, }, } as Meta; -const DefaultTemplate: Story = (args: ExampleComponent) => ({ +const storyTemplate = ``; + +const InlineTemplate: Story = (args: ExampleComponent) => ({ props: args, - template: ``, + template: storyTemplate, }); -export const Default = DefaultTemplate.bind({}); +export const Inline = InlineTemplate.bind({}); +Inline.args = { + layout: "inline", +}; + +const BlockTemplate: Story = (args: ExampleComponent) => ({ + props: args, + template: storyTemplate, +}); + +export const Block = BlockTemplate.bind({}); +Block.args = { + layout: "block", +}; From ce559d0587061f9e691f8b45fb06edd88b8f6347 Mon Sep 17 00:00:00 2001 From: SmithThe4th Date: Mon, 30 Jan 2023 21:22:07 -0500 Subject: [PATCH 28/99] [SG-1017] Fixed alignment and margin defect (#4604) * Fixed alignment and marghin defect * Updated warning message for iteration changes * Revert "Updated warning message for iteration changes" This reverts commit a2b66cb25230c7f8c985755f780db8c1414870da. --- apps/web/src/app/vault/vault.component.html | 4 +++- apps/web/src/app/vault/vault.component.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/web/src/app/vault/vault.component.html b/apps/web/src/app/vault/vault.component.html index 44feb609b9b..4cfee0d2fbf 100644 --- a/apps/web/src/app/vault/vault.component.html +++ b/apps/web/src/app/vault/vault.component.html @@ -83,7 +83,9 @@
- + + + Date: Tue, 31 Jan 2023 05:55:50 -0500 Subject: [PATCH 29/99] Updated warning message for iteration changes (#4606) --- apps/web/src/app/settings/change-kdf.component.html | 2 +- apps/web/src/locales/en/messages.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/settings/change-kdf.component.html b/apps/web/src/app/settings/change-kdf.component.html index b01b83a954c..0fdc67d04a9 100644 --- a/apps/web/src/app/settings/change-kdf.component.html +++ b/apps/web/src/app/settings/change-kdf.component.html @@ -1,7 +1,7 @@

{{ "encKeySettings" | i18n }}

-{{ "loggedOutWarning" | i18n }} +{{ "changeKdfLoggedOutWarning" | i18n }}
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 6cf0751911f..98898b940d5 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -6143,5 +6143,8 @@ }, "changeKdfSettings": { "message": "Change KDF settings" + }, + "changeKdfLoggedOutWarning": { + "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour. We recommend exporting your vault before changing your encryption settings to prevent data loss." } } From 25d89f36a3e74e98eb279d17d388f554f1617400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rui=20Tom=C3=A9?= <108268980+r-tome@users.noreply.github.com> Date: Tue, 31 Jan 2023 12:53:07 +0000 Subject: [PATCH 30/99] [EC-1053] Combined 'queryParams' subscriptions to be fired in order to use syncService first (#4607) --- apps/web/src/app/vault/vault.component.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts index ca0d93cf4c0..e6764c14bef 100644 --- a/apps/web/src/app/vault/vault.component.ts +++ b/apps/web/src/app/vault/vault.component.ts @@ -131,12 +131,7 @@ export class VaultComponent implements OnInit, OnDestroy { await this.editCipher(cipherView); } }), - takeUntil(this.destroy$) - ) - .subscribe(); - - this.route.queryParams - .pipe( + switchMap(() => this.route.queryParams), switchMap(async (params) => { const cipherId = getCipherIdFromParams(params); if (cipherId) { From 8ac8cc027411e81c71eedb48028490cdd1628a81 Mon Sep 17 00:00:00 2001 From: Will Martin Date: Tue, 31 Jan 2023 11:29:38 -0500 Subject: [PATCH 31/99] [SM-383] add create access token button (#4547) * rebase to master; add create access token button * add static method to access-tokens component --- .../layout/no-items.component.html | 6 ++-- .../projects-list.component.html | 6 ++-- .../access/access-list.component.html | 6 ++-- .../access/access-tokens.component.ts | 24 +++++----------- .../access-token-create-dialog.component.ts | 18 ++++++++++++ .../service-account.component.html | 4 +++ .../service-account.component.ts | 28 +++++++++++++++---- .../shared/secrets-list.component.html | 6 ++-- 8 files changed, 64 insertions(+), 34 deletions(-) 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/layout/no-items.component.html index c2add8e479d..90e93dfc81a 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/no-items.component.html @@ -4,13 +4,13 @@

- +

- +

- +
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html index 89e7010c1d4..5e66994ed89 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html @@ -3,9 +3,9 @@
- {{ "projectsNoItemsTitle" | i18n }} - {{ "projectsNoItemsMessage" | i18n }} - diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html index d40b8456460..42a55dac60f 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html @@ -3,9 +3,9 @@ - {{ "accessTokensNoItemsTitle" | i18n }} - {{ "accessTokensNoItemsDesc" | i18n }} - diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts index 8729dcb0150..d453afd429e 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts @@ -4,14 +4,10 @@ import { combineLatestWith, Observable, startWith, switchMap } from "rxjs"; import { DialogService } from "@bitwarden/components"; -import { ServiceAccountView } from "../../models/view/service-account.view"; import { AccessTokenView } from "../models/view/access-token.view"; import { AccessService } from "./access.service"; -import { - AccessTokenOperation, - AccessTokenCreateDialogComponent, -} from "./dialogs/access-token-create-dialog.component"; +import { AccessTokenCreateDialogComponent } from "./dialogs/access-token-create-dialog.component"; @Component({ selector: "sm-access-tokens", @@ -45,17 +41,11 @@ export class AccessTokenComponent implements OnInit { return await this.accessService.getAccessTokens(this.organizationId, this.serviceAccountId); } - async openNewAccessTokenDialog() { - // TODO once service account names are implemented in service account contents page pass in here. - const serviceAccountView = new ServiceAccountView(); - serviceAccountView.id = this.serviceAccountId; - serviceAccountView.name = "placeholder"; - - this.dialogService.open(AccessTokenCreateDialogComponent, { - data: { - organizationId: this.organizationId, - serviceAccountView: serviceAccountView, - }, - }); + protected openNewAccessTokenDialog() { + AccessTokenCreateDialogComponent.openNewAccessTokenDialog( + this.dialogService, + this.serviceAccountId, + this.organizationId + ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts index 93ef185f6aa..ad06778697e 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.ts @@ -82,4 +82,22 @@ export class AccessTokenCreateDialogComponent implements OnInit { }, }); } + + static openNewAccessTokenDialog( + dialogService: DialogService, + serviceAccountId: string, + organizationId: string + ) { + // TODO once service account names are implemented in service account contents page pass in here. + const serviceAccountView = new ServiceAccountView(); + serviceAccountView.id = serviceAccountId; + serviceAccountView.name = "placeholder"; + + return dialogService.open(AccessTokenCreateDialogComponent, { + data: { + organizationId: organizationId, + serviceAccountView: serviceAccountView, + }, + }); + } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html index a22dc5f13cb..0636ba2121d 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html @@ -14,5 +14,9 @@ {{ "people" | i18n }} {{ "accessTokens" | i18n }} + diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts index d0288866f37..7be88fc9a83 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts @@ -2,6 +2,9 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { switchMap } from "rxjs"; +import { DialogService } from "@bitwarden/components"; + +import { AccessTokenCreateDialogComponent } from "./access/dialogs/access-token-create-dialog.component"; import { ServiceAccountService } from "./service-account.service"; @Component({ @@ -9,19 +12,34 @@ import { ServiceAccountService } from "./service-account.service"; templateUrl: "./service-account.component.html", }) export class ServiceAccountComponent { + private organizationId: string; + private serviceAccountId: string; + /** * TODO: remove when a server method is available that fetches a service account by ID */ protected serviceAccount$ = this.route.params.pipe( - switchMap((params) => - this.serviceAccountService + switchMap((params) => { + this.serviceAccountId = params.serviceAccountId; + this.organizationId = params.organizationId; + + return this.serviceAccountService .getServiceAccounts(params.organizationId) - .then((saList) => saList.find((sa) => sa.id === params.serviceAccountId)) - ) + .then((saList) => saList.find((sa) => sa.id === params.serviceAccountId)); + }) ); constructor( private route: ActivatedRoute, - private serviceAccountService: ServiceAccountService + private serviceAccountService: ServiceAccountService, + private dialogService: DialogService ) {} + + protected openNewAccessTokenDialog() { + AccessTokenCreateDialogComponent.openNewAccessTokenDialog( + this.dialogService, + this.serviceAccountId, + this.organizationId + ); + } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html index aed896b3ff9..0c19bb20662 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html @@ -3,9 +3,9 @@ - {{ "secretsNoItemsTitle" | i18n }} - {{ "secretsNoItemsMessage" | i18n }} - From 4d6e333d8d200176cae4040ccd81e9577a6540f3 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Tue, 31 Jan 2023 18:39:10 +0100 Subject: [PATCH 32/99] [SM-468] Add eslint rule for forcing type to buttons (#4576) * Add eslint rule for forcing type to buttons * Fix eslint js errors --- .eslintrc.json | 192 +-- .../popup/vault/vault-select.component.html | 2 + .../src/popup/vault/view.component.html | 2 + .../layout/account-switcher.component.html | 2 + apps/desktop/src/app/send/send.component.html | 2 + .../filters/collection-filter.component.html | 2 + .../filters/folder-filter.component.html | 2 + .../organization-filter.component.html | 2 + .../filters/status-filter.component.html | 2 + .../filters/type-filter.component.html | 2 + .../src/app/vault/vault-items.component.html | 2 + .../desktop/src/app/vault/view.component.html | 2 + .../trial-initiation.component.html | 2 + .../vertical-step-content.component.html | 2 + .../user-verification-prompt.component.html | 2 + .../web/src/app/layouts/navbar.component.html | 2 + .../product-switcher.component.html | 2 + ...zation-billing-history-view.component.html | 2 + .../manage/groups.component.html | 2 + .../members/people.component.html | 2 + .../organizations/vault/vault.component.html | 2 + apps/web/src/app/send/add-edit.component.html | 2 + apps/web/src/app/send/send.component.html | 2 + .../src/app/settings/account.component.html | 2 + .../billing-history-view.component.html | 2 + .../settings/emergency-access.component.html | 2 + .../settings/payment-method.component.html | 2 + .../app/settings/security-keys.component.html | 2 + .../sponsoring-org-row.component.html | 2 + .../settings/two-factor-setup.component.html | 2 + .../password-generator-history.component.html | 2 + .../organization-name-badge.component.html | 2 + .../organization-options.component.html | 2 + .../vault-filter-section.component.html | 2 + .../src/app/vault/vault-items.component.html | 2 + .../web/src/connectors/webauthn-fallback.html | 2 + apps/web/src/connectors/webauthn-mobile.html | 2 + apps/web/src/connectors/webauthn.html | 2 + .../clients/add-organization.component.html | 2 + .../providers/clients/clients.component.html | 2 + .../providers/manage/people.component.html | 2 + .../layout/header.component.html | 2 + .../layout/new-menu.component.html | 2 + .../layout/org-switcher.component.html | 2 + .../project/project-secrets.component.html | 2 + .../projects-list.component.html | 2 + .../dialog/secret-dialog.component.html | 2 + .../access/access-list.component.html | 2 + .../access-token-dialog.component.html | 2 + .../service-accounts-list.component.html | 2 + .../shared/secrets-list.component.html | 2 + .../src/banner/banner.component.html | 2 + .../breadcrumbs/breadcrumbs.component.html | 2 + .../simple-configurable-dialog.component.html | 2 + .../src/navigation/nav-group.component.html | 2 + .../src/navigation/nav-item.component.html | 2 + package-lock.json | 1027 ++++++++++++++++- package.json | 3 + 58 files changed, 1200 insertions(+), 132 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 6bcea9dd045..1bd7b04f21e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,106 +4,118 @@ "browser": true, "webextensions": true }, - "plugins": ["@typescript-eslint", "rxjs", "rxjs-angular", "import"], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "project": ["./tsconfig.eslint.json"], - "sourceType": "module" - }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:import/recommended", - "plugin:import/typescript", - "prettier", - "plugin:rxjs/recommended" - ], - "settings": { - "import/parsers": { - "@typescript-eslint/parser": [".ts"] - }, - "import/resolver": { - "typescript": { - "alwaysTryTypes": true - } - } - }, - "rules": { - "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled - "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }], - "@typescript-eslint/explicit-member-accessibility": [ - "error", - { - "accessibility": "no-public" - } - ], - "@typescript-eslint/no-this-alias": [ - "error", - { - "allowedNames": ["self"] - } - ], - "no-console": "error", - "import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package. - "import/order": [ - "error", - { - "alphabetize": { - "order": "asc" + "overrides": [ + { + "files": ["*.ts", "*.js"], + "plugins": ["@typescript-eslint", "rxjs", "rxjs-angular", "import"], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "project": ["./tsconfig.eslint.json"], + "sourceType": "module", + "ecmaVersion": 2020 + }, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:import/recommended", + "plugin:import/typescript", + "prettier", + "plugin:rxjs/recommended" + ], + "settings": { + "import/parsers": { + "@typescript-eslint/parser": [".ts"] }, - "newlines-between": "always", - "pathGroups": [ + "import/resolver": { + "typescript": { + "alwaysTryTypes": true + } + } + }, + "rules": { + "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled + "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }], + "@typescript-eslint/explicit-member-accessibility": [ + "error", { - "pattern": "@bitwarden/**", - "group": "external", - "position": "after" - }, - { - "pattern": "src/**/*", - "group": "parent", - "position": "before" + "accessibility": "no-public" } ], - "pathGroupsExcludedImportTypes": ["builtin"] - } - ], - "rxjs-angular/prefer-takeuntil": "error", - "rxjs/no-exposed-subjects": ["error", { "allowProtected": true }], - "no-restricted-syntax": [ - "error", - { - "message": "Calling `svgIcon` directly is not allowed", - "selector": "CallExpression[callee.name='svgIcon']" - }, - { - "message": "Accessing FormGroup using `get` is not allowed, use `.value` instead", - "selector": "ChainExpression[expression.object.callee.property.name='get'][expression.property.name='value']" - } - ], - "curly": ["error", "all"], - "import/namespace": ["off"], // This doesn't resolve namespace imports correctly, but TS will throw for this anyway - "import/no-restricted-paths": [ - "error", - { - "zones": [ - // Do not allow angular/node code to be imported into common + "@typescript-eslint/no-this-alias": [ + "error", { - "target": "./libs/common/**/*", - "from": "./libs/angular/**/*" + "allowedNames": ["self"] + } + ], + "no-console": "error", + "import/no-unresolved": "off", // TODO: Look into turning off once each package is an actual package. + "import/order": [ + "error", + { + "alphabetize": { + "order": "asc" + }, + "newlines-between": "always", + "pathGroups": [ + { + "pattern": "@bitwarden/**", + "group": "external", + "position": "after" + }, + { + "pattern": "src/**/*", + "group": "parent", + "position": "before" + } + ], + "pathGroupsExcludedImportTypes": ["builtin"] + } + ], + "rxjs-angular/prefer-takeuntil": "error", + "rxjs/no-exposed-subjects": ["error", { "allowProtected": true }], + "no-restricted-syntax": [ + "error", + { + "message": "Calling `svgIcon` directly is not allowed", + "selector": "CallExpression[callee.name='svgIcon']" }, { - "target": "./libs/common/**/*", - "from": "./libs/node/**/*" + "message": "Accessing FormGroup using `get` is not allowed, use `.value` instead", + "selector": "ChainExpression[expression.object.callee.property.name='get'][expression.property.name='value']" } + ], + "curly": ["error", "all"], + "import/namespace": ["off"], // This doesn't resolve namespace imports correctly, but TS will throw for this anyway + "import/no-restricted-paths": [ + "error", + { + "zones": [ + // Do not allow angular/node code to be imported into common + { + "target": "./libs/common/**/*", + "from": "./libs/angular/**/*" + }, + { + "target": "./libs/common/**/*", + "from": "./libs/node/**/*" + } + ] + } + ], + "no-restricted-imports": [ + "error", + { "patterns": ["src/**/*"], "paths": ["@fluffy-spoon/substitute"] } ] } - ], - "no-restricted-imports": [ - "error", - { "patterns": ["src/**/*"], "paths": ["@fluffy-spoon/substitute"] } - ] - }, - "overrides": [ + }, + { + "files": ["*.html"], + "parser": "@angular-eslint/template-parser", + "plugins": ["@angular-eslint/template"], + "rules": { + "@angular-eslint/template/button-has-type": "error" + } + }, { "files": ["libs/common/src/**/*.ts"], "rules": { diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html index a25f49ebf2d..b6da7308ca2 100644 --- a/apps/browser/src/popup/vault/vault-select.component.html +++ b/apps/browser/src/popup/vault/vault-select.component.html @@ -1,3 +1,5 @@ + +
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html index 151460d0acf..3d5c5450bc9 100644 --- a/apps/browser/src/popup/vault/view.component.html +++ b/apps/browser/src/popup/vault/view.component.html @@ -1,3 +1,5 @@ + +
diff --git a/apps/desktop/src/app/layout/account-switcher.component.html b/apps/desktop/src/app/layout/account-switcher.component.html index 991e0dfb716..e5482b938fc 100644 --- a/apps/desktop/src/app/layout/account-switcher.component.html +++ b/apps/desktop/src/app/layout/account-switcher.component.html @@ -1,3 +1,5 @@ + +