Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

[SM-632] fix copy secret value in Safari (#4974)

Browse Source 
* add async copy method

* be more DRY
This commit is contained in:
Will Martin 2023-03-10 10:13:07 -05:00 committed by GitHub
parent 0b93a33f5a
commit e11e4db356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
View File

@ -45,6 +45,7 @@ import {
ServiceAccountOperation,
} from "../service-accounts/dialog/service-account-dialog.component";
import { ServiceAccountService } from "../service-accounts/service-account.service";
import { SecretsListComponent } from "../shared/secrets-list.component";
type Tasks = {
[organizationId: string]: OrganizationTasks;
@ -277,21 +278,15 @@ export class OverviewComponent implements OnInit, OnDestroy {
}
copySecretName(name: string) {
this.platformUtilsService.copyToClipboard(name);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("name"))
);
SecretsListComponent.copySecretName(name, this.platformUtilsService, this.i18nService);
}
async copySecretValue(id: string) {
const secret = await this.secretService.getBySecretId(id);
this.platformUtilsService.copyToClipboard(secret.value);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("value"))
copySecretValue(id: string) {
SecretsListComponent.copySecretValue(
id,
this.platformUtilsService,
this.i18nService,
this.secretService
);
}

21
bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts
View File

@ -17,6 +17,7 @@ import {
SecretOperation,
} from "../../secrets/dialog/secret-dialog.component";
import { SecretService } from "../../secrets/secret.service";
import { SecretsListComponent } from "../../shared/secrets-list.component";
@Component({
selector: "sm-project-secrets",
@ -81,21 +82,15 @@ export class ProjectSecretsComponent {
}
copySecretName(name: string) {
this.platformUtilsService.copyToClipboard(name);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("name"))
);
SecretsListComponent.copySecretName(name, this.platformUtilsService, this.i18nService);
}
async copySecretValue(id: string) {
const secret = await this.secretService.getBySecretId(id);
this.platformUtilsService.copyToClipboard(secret.value);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("value"))
copySecretValue(id: string) {
SecretsListComponent.copySecretValue(
id,
this.platformUtilsService,
this.i18nService,
this.secretService
);
}
}

21
bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
View File

@ -7,6 +7,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
import { DialogService } from "@bitwarden/components";
import { SecretListView } from "../models/view/secret-list.view";
import { SecretsListComponent } from "../shared/secrets-list.component";
import {
SecretDeleteDialogComponent,
@ -84,21 +85,15 @@ export class SecretsComponent implements OnInit {
}
copySecretName(name: string) {
this.platformUtilsService.copyToClipboard(name);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("name"))
);
SecretsListComponent.copySecretName(name, this.platformUtilsService, this.i18nService);
}
async copySecretValue(id: string) {
const secret = await this.secretService.getBySecretId(id);
this.platformUtilsService.copyToClipboard(secret.value);
this.platformUtilsService.showToast(
"success",
null,
this.i18nService.t("valueCopied", this.i18nService.t("value"))
copySecretValue(id: string) {
SecretsListComponent.copySecretValue(
id,
this.platformUtilsService,
this.i18nService,
this.secretService
);
}
}

56
bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
View File

@ -2,9 +2,12 @@ import { SelectionModel } from "@angular/cdk/collections";
import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core";
import { Subject, takeUntil } from "rxjs";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { TableDataSource } from "@bitwarden/components";
import { SecretListView } from "../models/view/secret-list.view";
import { SecretService } from "../secrets/secret.service";
@Component({
selector: "sm-secrets-list",
@ -89,4 +92,57 @@ export class SecretsListComponent implements OnDestroy {
return aProjects[0]?.name.localeCompare(bProjects[0].name);
};
/**
* TODO: Refactor to smart component and remove
*/
static copySecretName(
name: string,
platformUtilsService: PlatformUtilsService,
i18nService: I18nService
) {
platformUtilsService.copyToClipboard(name);
platformUtilsService.showToast(
"success",
null,
i18nService.t("valueCopied", i18nService.t("name"))
);
}
/**
* TODO: Refactor to smart component and remove
*/
static copySecretValue(
id: string,
platformUtilsService: PlatformUtilsService,
i18nService: I18nService,
secretService: SecretService
) {
const value = secretService.getBySecretId(id).then((secret) => secret.value);
SecretsListComponent.copyToClipboardAsync(value, platformUtilsService).then(() => {
platformUtilsService.showToast(
"success",
null,
i18nService.t("valueCopied", i18nService.t("value"))
);
});
}
/**
* TODO: Remove in favor of updating `PlatformUtilsService.copyToClipboard`
*/
private static copyToClipboardAsync(
text: Promise<string>,
platformUtilsService: PlatformUtilsService
) {
if (platformUtilsService.isSafari()) {
return navigator.clipboard.write([
new ClipboardItem({
["text/plain"]: text,
}),
]);
}
return text.then((t) => platformUtilsService.copyToClipboard(t));
}
}