From 4334d45e7eda281542ce12a18171080713cf7940 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 25 Nov 2025 11:20:32 +0100 Subject: [PATCH] Apply feedback --- .../browser-platform-utils.service.ts | 16 ++++++++-------- .../services/cli-platform-utils.service.ts | 4 ++-- .../services/electron-platform-utils.service.ts | 14 +++++++------- .../src/app/core/web-platform-utils.service.ts | 4 ++-- .../abstractions/platform-utils.service.ts | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts index c4f69c18304..c3dd3adb8ce 100644 --- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts +++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts @@ -329,22 +329,22 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic return autofillCommand; } - packageType(): Promise { + async packageType(): Promise { switch (this.getDevice()) { case DeviceType.ChromeExtension: - return Promise.resolve("Chrome Extension"); + return "Chrome Extension"; case DeviceType.FirefoxExtension: - return Promise.resolve("Firefox Extension"); + return "Firefox Extension"; case DeviceType.OperaExtension: - return Promise.resolve("Opera Extension"); + return "Opera Extension"; case DeviceType.EdgeExtension: - return Promise.resolve("Edge Extension"); + return "Edge Extension"; case DeviceType.VivaldiExtension: - return Promise.resolve("Vivaldi Extension"); + return "Vivaldi Extension"; case DeviceType.SafariExtension: - return Promise.resolve("Safari Extension"); + return "Safari Extension"; default: - return Promise.resolve("Browser Extension"); + return "Unknown Browser Extension"; } } diff --git a/apps/cli/src/platform/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts index a92b568b338..acd2009a6d9 100644 --- a/apps/cli/src/platform/services/cli-platform-utils.service.ts +++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts @@ -153,7 +153,7 @@ export class CliPlatformUtilsService implements PlatformUtilsService { return null; } - packageType(): Promise { - return Promise.resolve("Cli"); + async packageType(): Promise { + return null; } } diff --git a/apps/desktop/src/platform/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts index caa982dbdd4..9377ac567ec 100644 --- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts +++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts @@ -153,18 +153,18 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService { } async packageType(): Promise { - let packageType = "Unknown"; if (ipc.platform.isMacAppStore) { - packageType = "MacAppStore"; + return "MacAppStore"; } else if (ipc.platform.isWindowsStore) { - packageType = "WindowsStore"; + return "WindowsStore"; } else if (ipc.platform.isAppImage) { - packageType = "AppImage"; + return "AppImage"; } else if (ipc.platform.isSnapStore) { - packageType = "Snap"; + return "Snap"; } else if (ipc.platform.isFlatpak) { - packageType = "Flatpak"; + return "Flatpak"; + } else { + return "Unknown"; } - return `Bitwarden-Desktop/${await this.getApplicationVersion()} (${packageType})`; } } diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts index feb5fad10ea..037ee0f9060 100644 --- a/apps/web/src/app/core/web-platform-utils.service.ts +++ b/apps/web/src/app/core/web-platform-utils.service.ts @@ -220,7 +220,7 @@ export class WebPlatformUtilsService implements PlatformUtilsService { return null; } - packageType(): Promise { - return Promise.resolve("Web"); + packageType(): Promise { + return null; } } diff --git a/libs/common/src/platform/abstractions/platform-utils.service.ts b/libs/common/src/platform/abstractions/platform-utils.service.ts index f0639df91c0..0aabd7aa5a1 100644 --- a/libs/common/src/platform/abstractions/platform-utils.service.ts +++ b/libs/common/src/platform/abstractions/platform-utils.service.ts @@ -55,5 +55,5 @@ export abstract class PlatformUtilsService { abstract readFromClipboard(): Promise; abstract supportsSecureStorage(): boolean; abstract getAutofillKeyboardShortcut(): Promise; - abstract packageType(): Promise; + abstract packageType(): Promise; }