Bumped version to 2.9.10 (#232)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 7776009a31)

package-lock.json

@@ -55,7 +55,6 @@
         "electron-notarize": "^1.1.1",
         "electron-rebuild": "^3.2.5",
         "electron-reload": "^1.5.0",
-        "font-awesome": "4.7.0",
         "html-loader": "^3.0.1",
         "html-webpack-plugin": "^5.5.0",
         "husky": "^7.0.4",
@@ -4529,15 +4528,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
     "node_modules/forcefocus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/forcefocus/-/forcefocus-1.1.0.tgz",
@@ -14157,12 +14147,6 @@
         "path-exists": "^4.0.0"
       }
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "dev": true
-    },
     "forcefocus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/forcefocus/-/forcefocus-1.1.0.tgz",

package.json

@@ -152,7 +152,6 @@
     "electron-notarize": "^1.1.1",
     "electron-rebuild": "^3.2.5",
     "electron-reload": "^1.5.0",
-    "font-awesome": "4.7.0",
     "html-loader": "^3.0.1",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",

src/app/services/services.module.ts

@@ -45,7 +45,6 @@ import { StateMigrationService } from "../../services/stateMigration.service";
 
 import { Account } from "../../models/account";
 
-import { GlobalStateFactory } from "jslib-common/factories/globalStateFactory";
 import { StateFactory } from "jslib-common/factories/stateFactory";
 
 import { GlobalState } from "jslib-common/models/domain/globalState";
@@ -206,7 +205,7 @@ export function initFactory(
         new StateMigrationService(
           storageService,
           secureStorageService,
-          new GlobalStateFactory(GlobalState)
+          new StateFactory(GlobalState, Account)
         ),
       deps: [StorageServiceAbstraction, "SECURE_STORAGE"],
     },
@@ -223,7 +222,7 @@ export function initFactory(
           secureStorageService,
           logService,
           stateMigrationService,
-          true, // TODO: It seems like we aren't applying this from settings anywhere. Is toggling secure storage working?
+          true,
           new StateFactory(GlobalState, Account)
         ),
       deps: [

src/bwdc.ts

@@ -127,7 +127,7 @@ export class Main {
     this.stateMigrationService = new StateMigrationService(
       this.storageService,
       this.secureStorageService,
-      new GlobalStateFactory(GlobalState)
+      new StateFactory(GlobalState, Account)
     );
 
     this.stateService = new StateService(

src/package-lock.json

@@ -1,19 +1,20 @@
 {
   "name": "@bitwarden/directory-connector",
-  "version": "2.9.8",
+  "version": "2.9.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/directory-connector",
-      "version": "2.9.8",
+      "version": "2.9.9",
       "license": "GPL-3.0",
       "dependencies": {
         "browser-hrtime": "^1.1.8",
         "electron-log": "4.4.1",
         "electron-store": "8.0.1",
         "electron-updater": "4.6.1",
-        "keytar": "7.7.0"
+        "keytar": "7.7.0",
+        "rxjs": "^7.4.0"
       }
     },
     "node_modules/@types/semver": {
@@ -800,6 +801,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rxjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
+      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+      "dependencies": {
+        "tslib": "~2.1.0"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -942,6 +951,11 @@
         "node": ">= 6"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -1595,6 +1609,14 @@
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
+    "rxjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
+      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+      "requires": {
+        "tslib": "~2.1.0"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -1704,6 +1726,11 @@
         }
       }
     },
+    "tslib": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",

src/package.json

@@ -2,7 +2,7 @@
   "name": "@bitwarden/directory-connector",
   "productName": "Bitwarden Directory Connector",
   "description": "Sync your user directory to your Bitwarden organization.",
-  "version": "2.9.8",
+  "version": "2.9.10",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
@@ -16,6 +16,7 @@
     "electron-log": "4.4.1",
     "electron-store": "8.0.1",
     "electron-updater": "4.6.1",
-    "keytar": "7.7.0"
+    "keytar": "7.7.0",
+    "rxjs": "^7.4.0"
   }
 }

src/services/state.service.ts

@@ -43,14 +43,17 @@ const keys = {
 
 const StoredSecurely = "[STORED SECURELY]";
 
-export class StateService extends BaseStateService<Account> implements StateServiceAbstraction {
+export class StateService
+  extends BaseStateService<GlobalState, Account>
+  implements StateServiceAbstraction
+{
   constructor(
     protected storageService: StorageService,
     protected secureStorageService: StorageService,
     protected logService: LogService,
     protected stateMigrationService: StateMigrationService,
     private useSecureStorageForSecrets = true,
-    protected stateFactory: StateFactory<Account, GlobalState>
+    protected stateFactory: StateFactory<GlobalState, Account>
   ) {
     super(storageService, secureStorageService, logService, stateMigrationService, stateFactory);
   }

webpack.renderer.js

@@ -20,7 +20,7 @@ const common = {
       },
       {
         test: /\.(jpe?g|png|gif|svg)$/i,
-        exclude: /.*(fontawesome-webfont)\.svg/,
+        exclude: /.*(bwi-font)\.svg/,
         generator: {
           filename: "images/[name][ext]",
         },