chore: upgrade snjs deps

standardnotes · May 2, 2022 · c2adf74 · c2adf74
1 parent 99d83af
commit c2adf74
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 84 deletions.
diff --git a/app/assets/javascripts/Database.ts b/app/assets/javascripts/Database.ts
@@ -1,4 +1,4 @@
-import { SNAlertService } from '@standardnotes/snjs'
+import { isString, AlertService } from '@standardnotes/snjs'
 
 const STORE_NAME = 'items'
 const READ_WRITE = 'readwrite'
@@ -19,7 +19,7 @@ export class Database {
   private locked = true
   private db?: IDBDatabase
 
-  constructor(public databaseName: string, private alertService: SNAlertService) {}
+  constructor(public databaseName: string, private alertService: AlertService) {}
 
   public deinit() {
     ;(this.alertService as any) = undefined
@@ -113,6 +113,28 @@ export class Database {
     })
   }
 
+  public async getAllKeys(): Promise<string[]> {
+    const db = (await this.openDatabase()) as IDBDatabase
+
+    return new Promise((resolve) => {
+      const objectStore = db.transaction(STORE_NAME).objectStore(STORE_NAME)
+      const getAllKeysRequest = objectStore.getAllKeys()
+      getAllKeysRequest.onsuccess = function () {
+        const result = getAllKeysRequest.result
+
+        const strings = result.map((key) => {
+          if (isString(key)) {
+            return key
+          } else {
+            return JSON.stringify(key)
+          }
+        })
+
+        resolve(strings)
+      }
+    })
+  }
+
   public async savePayload(payload: any): Promise<void> {
     return this.savePayloads([payload])
   }

diff --git a/app/assets/javascripts/Device/WebOrDesktopDevice.ts b/app/assets/javascripts/Device/WebOrDesktopDevice.ts
@@ -6,6 +6,7 @@ import {
   RawKeychainValue,
   TransferPayload,
   NamespacedRootKeyInKeychain,
+  extendArray,
 } from '@standardnotes/snjs'
 import { Database } from '../Database'
 import { WebOrDesktopDeviceInterface } from './WebOrDesktopDeviceInterface'
@@ -126,10 +127,17 @@ export abstract class WebOrDesktopDevice implements WebOrDesktopDeviceInterface
     return keychain[identifier]
   }
 
-  async setNamespacedKeychainValue(
-    value: NamespacedRootKeyInKeychain,
-    identifier: ApplicationIdentifier,
-  ) {
+  async getDatabaseKeys(): Promise<string[]> {
+    const keys: string[] = []
+
+    for (const database of this.databases) {
+      extendArray(keys, await database.getAllKeys())
+    }
+
+    return keys
+  }
+
+  async setNamespacedKeychainValue(value: NamespacedRootKeyInKeychain, identifier: ApplicationIdentifier) {
     let keychain = await this.getKeychainValue()
 
     if (!keychain) {

diff --git a/app/assets/javascripts/Services/AlertService.ts b/app/assets/javascripts/Services/AlertService.ts
@@ -1,4 +1,4 @@
-import { SNAlertService, ButtonType, sanitizeHtmlString } from '@standardnotes/snjs'
+import { AlertService, ButtonType, sanitizeHtmlString } from '@standardnotes/snjs'
 import { SKAlert } from '@standardnotes/stylekit'
 
 /** @returns a promise resolving to true if the user confirmed, false if they canceled */
@@ -65,7 +65,7 @@ export function alertDialog({
   })
 }
 
-export class AlertService extends SNAlertService {
+export class WebAlertService extends AlertService {
   alert(text: string, title?: string, closeButtonText?: string) {
     return alertDialog({ text, title, closeButtonText })
   }

diff --git a/app/assets/javascripts/UIModels/Application.ts b/app/assets/javascripts/UIModels/Application.ts
@@ -1,5 +1,5 @@
 import { WebCrypto } from '@/Crypto'
-import { AlertService } from '@/Services/AlertService'
+import { WebAlertService } from '@/Services/AlertService'
 import { ArchiveManager } from '@/Services/ArchiveManager'
 import { AutolockService } from '@/Services/AutolockService'
 import { DesktopDeviceInterface, isDesktopDevice } from '@/Device/DesktopDeviceInterface'
@@ -56,7 +56,7 @@ export class WebApplication extends SNApplication {
       platform: platform,
       deviceInterface: deviceInterface,
       crypto: WebCrypto,
-      alertService: new AlertService(),
+      alertService: new WebAlertService(),
       identifier,
       defaultHost: defaultSyncServerHost,
       appVersion: deviceInterface.appVersion,

diff --git a/package.json b/package.json
@@ -70,10 +70,10 @@
     "@reach/tooltip": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
     "@standardnotes/components": "1.7.15",
-    "@standardnotes/filepicker": "1.13.3",
-    "@standardnotes/sncrypto-web": "1.8.4",
-    "@standardnotes/snjs": "2.103.0",
-    "@standardnotes/stylekit": "5.23.0",
+    "@standardnotes/filepicker": "1.13.4",
+    "@standardnotes/sncrypto-web": "1.9.0",
+    "@standardnotes/snjs": "2.105.2",
+    "@standardnotes/stylekit": "5.24.1",
     "@zip.js/zip.js": "^2.4.10",
     "mobx": "^6.5.0",
     "mobx-react-lite": "^3.3.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2450,108 +2450,120 @@
     "@typescript-eslint/eslint-plugin" "^5.12.1"
     "@typescript-eslint/parser" "^5.12.1"
 
-"@standardnotes/domain-events@^2.27.12":
-  version "2.27.12"
-  resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.27.12.tgz#6eb8e484273e7e8b6bb1b40a791cfee24bd6d383"
-  integrity sha512-Sr4KASWYITVpSnE9a8awGyjqeQ9U0e0kpl1jgGYdbkRIWvcxs8bnYWOuwffmD2SfV7PeCbtpUXEyvYDVIsZijA==
+"@standardnotes/domain-events@^2.27.13":
+  version "2.27.13"
+  resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.27.13.tgz#ebe9d06b154fa8f40cbda6e4da507856f052f8d0"
+  integrity sha512-Cc+bDNtHFqLnNyr3freB9DmGWDVl1zrWPHHaEahfQyA8RnBkGrQ28xz5+0Q5lKLTsBjGppi7Py/VPD+QMvdNmg==
   dependencies:
     "@standardnotes/auth" "^3.18.11"
-    "@standardnotes/features" "^1.38.1"
+    "@standardnotes/features" "^1.39.0"
 
-"@standardnotes/encryption@^1.4.13":
-  version "1.4.13"
-  resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.4.13.tgz#056880bd82f2dcb5ca6bb2e38650b1f6004db35c"
-  integrity sha512-0AXjs15UKKjTEIyZTzTqny5yd/5lVGxZOtxAkO8/z8Qx1lK/J3KTUlWz2h0JBsRyA4PaTyLSNVKoF51mE8Bd1w==
+"@standardnotes/encryption@^1.6.1":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.6.1.tgz#51d1d69a1c45e95d5486adfa624af4766fbb94a8"
+  integrity sha512-qKg5An1ZHY+gDHb96T8zEIQl5TcRaZNPeCP2zULQBEyLzhFDlyoz8MMRiZPa6yjiCDEODfwG87gQwlaFGkFR3Q==
   dependencies:
-    "@standardnotes/models" "^1.6.0"
-    "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/services" "^1.9.14"
+    "@standardnotes/models" "^1.6.2"
+    "@standardnotes/responses" "^1.6.13"
+    "@standardnotes/services" "^1.10.1"
 
-"@standardnotes/features@^1.38.1":
-  version "1.38.1"
-  resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.38.1.tgz#5ee52ab91f02be2d2762dcee49db17d1040a7bf8"
-  integrity sha512-rSQ8ClG7os3w9AddP0VZbvkIpEHCKGzCLiHum0D90ogjFFXgr8+EvonOfFQEc3pa9hdyq1fofhedNQRJsdo14Q==
+"@standardnotes/features@^1.39.0":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.39.0.tgz#d2234eec2664fbe8fc3946e2349d6d2c7348c2f1"
+  integrity sha512-r5vuJoDsi6W/ZomOYMMe0DC3YJLbhYDn9NkYglsi0/F5aQUciIg9hLUb0aRrQm/q9zQ5+zEJ8ukN6f5sJGYYcw==
   dependencies:
     "@standardnotes/auth" "^3.18.11"
     "@standardnotes/common" "^1.19.6"
 
-"@standardnotes/filepicker@1.13.3", "@standardnotes/filepicker@^1.13.3":
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.13.3.tgz#fa4aee37432ec189a9be0dbbdb655ebdf9e33cbf"
-  integrity sha512-og2eU0PasZviLKfm55j6ZC6LfTJnVqTF+brEosgeJdcc5mOLmbRZ9aLhYT5N3qkjJdlRSXiwWQ7mYiYQ/rF4Kw==
+"@standardnotes/filepicker@1.13.4", "@standardnotes/filepicker@^1.13.4":
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.13.4.tgz#92107587ef3d37d5d54b65e6ce589b96a2723c70"
+  integrity sha512-v7xk1PmuehCjKGv4hEiQkhqtdlbH9tv1D8GE737V9JZU/09b9t96wJ6kYDm2Nwl72/5gipI6LoLuwAcc/jD/GQ==
   dependencies:
     "@standardnotes/common" "^1.19.6"
-    "@standardnotes/utils" "^1.6.2"
+    "@standardnotes/utils" "^1.6.3"
 
-"@standardnotes/models@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/models/-/models-1.6.0.tgz#63cab950b2e533bbe3feab1fad8deddc51c66ae9"
-  integrity sha512-tO7YpRQXHsJkF06BNxOwI89Rhk5G3thkcfv6/dKaxG274F91XYBzoFGaRvs3EczEKDfqkOyb1H7wM02T8LXIvw==
+"@standardnotes/files@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@standardnotes/files/-/files-1.0.4.tgz#bd0a565498fffe6e079863907d233df64df0fc15"
+  integrity sha512-soj7zpb/UWOtx9Fc/cG5cq3fHh4m3+LmLUOje+Zh78f7eA9LkbPGGn7XajCINCBSAcHKlia5mhTu3NnwH9S3Ww==
+  dependencies:
+    "@standardnotes/models" "^1.6.2"
+    "@standardnotes/responses" "^1.6.13"
+    "@standardnotes/services" "^1.10.1"
+    "@standardnotes/utils" "^1.6.3"
+
+"@standardnotes/models@^1.6.2":
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/@standardnotes/models/-/models-1.6.2.tgz#45ae19246ba1ac476ed26bbe3f9fa6e3ce6c9271"
+  integrity sha512-WJtlDi2tj+HkG10VQygFbzUfon76N7gV73wuryocJ1LE5LiJT7O+LlQvrVM96QWxDdbjUXxA4fz++W0v4c6m7w==
   dependencies:
-    "@standardnotes/features" "^1.38.1"
-    "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/utils" "^1.6.2"
+    "@standardnotes/features" "^1.39.0"
+    "@standardnotes/responses" "^1.6.13"
+    "@standardnotes/utils" "^1.6.3"
 
-"@standardnotes/responses@^1.6.12":
-  version "1.6.12"
-  resolved "https://registry.yarnpkg.com/@standardnotes/responses/-/responses-1.6.12.tgz#99090e407f10d430cf5bea548a9314472c00a1c7"
-  integrity sha512-WqPcxI7BeuSwbemI5Hag6tK0Rzf/OxyX1aeRWGXWrQOQJjv4tpyUSjT0gdutsslqkIehI3oLG+B9DLUNe6Wddg==
+"@standardnotes/responses@^1.6.13":
+  version "1.6.13"
+  resolved "https://registry.yarnpkg.com/@standardnotes/responses/-/responses-1.6.13.tgz#aac7da9c9f158150d23e41238eade5fa6fe98b76"
+  integrity sha512-ponGQwqcZlt/5h8QzXnG5gJLiLG7uq6cYmsyQKVigLSSllv4eN/I7WLp1HWdZGcPPyh/+HCYk5z6YgSJM2Rulg==
   dependencies:
     "@standardnotes/auth" "^3.18.11"
     "@standardnotes/common" "^1.19.6"
-    "@standardnotes/features" "^1.38.1"
+    "@standardnotes/features" "^1.39.0"
 
-"@standardnotes/services@^1.9.14":
-  version "1.9.14"
-  resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.9.14.tgz#6bc692ce58c2db3573474c7efd44b3586a59d52e"
-  integrity sha512-9Z62AP+zcOpmQfRiOFYUZnYIsHgTVsV6x3DcvE800xvBkQkHbkx5VeeDzV9r06iJzIl4f2BGvss3rjj3PC/R3Q==
+"@standardnotes/services@^1.10.1":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.10.1.tgz#ef166ead223d91b7124b9e0f134ae46e4479159c"
+  integrity sha512-Q55OMJXJS/HZpQ5Iwl20u3594kkE7VF9M/yap0H9kFQJcKlyYlsSF1W7QdyFCx5keHT0JLRzjY88muBcb9o9fA==
   dependencies:
+    "@standardnotes/auth" "^3.18.11"
     "@standardnotes/common" "^1.19.6"
-    "@standardnotes/models" "^1.6.0"
-    "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/utils" "^1.6.2"
+    "@standardnotes/models" "^1.6.2"
+    "@standardnotes/responses" "^1.6.13"
+    "@standardnotes/utils" "^1.6.3"
 
 "@standardnotes/settings@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.14.1.tgz#8b6c84e2eeeab274a557bad25cb16a62d60916ec"
   integrity sha512-zRRBoflI77Zqa5ejZcXFPnvwVKf/gbLNtutB/pQE5SYlDMUgWtg6Qm8r4667Ue/nBUWZixCH0sznEN8XK8rCBw==
 
-"@standardnotes/sncrypto-common@^1.7.7":
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.7.7.tgz#5970bbf09dc541a9894fec1101d5c92be5822ad1"
-  integrity sha512-ncpzrurFtgupbQvv6+aDts9Cebx57MMI78Dl2KnJJbFm+G47UJuxfX11q2aomBJdp2XdbWhQxCKOQPl5mmwWPQ==
+"@standardnotes/sncrypto-common@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.8.0.tgz#7904e5c9eb907e2db3fa3c1a0c364607b3057243"
+  integrity sha512-+of+U+mTCV0LJVsCIzALLx2TvgGkqriT2NTcHjnIawbz7eoUZGXqWw/mSshhboDLtINje9Wz8qqRyYPmacu9VA==
 
-"@standardnotes/sncrypto-web@1.8.4":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.8.4.tgz#82259f6b0210625a9188427f229b20c5ab9204ac"
-  integrity sha512-n/9uxI2KxYSohilPwgAJOW0zAaPEs97EB7kQ1An0YByIQue4D/+5HHIksqQXUmXlw8KZFTau6jd+v7l7L3dvOQ==
+"@standardnotes/sncrypto-web@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.9.0.tgz#6ea796fb95948bed94463da3f3eeaf64db0b9e9a"
+  integrity sha512-c3iVBiUE3JMX7Q9exsD8RxnwVNVp9ttG20BsPSiX2z2svoncTBXI0HKTpKpnBoJJqCD/YizQ8uJ2L73Wj03AyA==
   dependencies:
-    "@standardnotes/sncrypto-common" "^1.7.7"
+    "@standardnotes/sncrypto-common" "^1.8.0"
     buffer "^6.0.3"
     libsodium-wrappers "^0.7.9"
 
-"@standardnotes/snjs@2.103.0":
-  version "2.103.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.103.0.tgz#708d39780b685b9e27478cb70900d71e89d6ec57"
-  integrity sha512-ak89W+ShM2kNxlW+eMA86AgjGGMUkyy+4zOa5G0KWdQJEHcevFnLVyn4ZPhvywxJWAnNZi0gGEQFuLd5IunyLQ==
+"@standardnotes/snjs@2.105.2":
+  version "2.105.2"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.105.2.tgz#fd2ac92c84010225f3f66dc143979f1360790476"
+  integrity sha512-ihRp4Z6XEakJwEg9UWJxMgda5LvN+k+EEGBVU2eG5CTjeBI3cQyu0K+iRpZD5jzg2/Vvis1gEdIrZPfPJj1mCQ==
   dependencies:
     "@standardnotes/auth" "^3.18.11"
     "@standardnotes/common" "^1.19.6"
-    "@standardnotes/domain-events" "^2.27.12"
-    "@standardnotes/encryption" "^1.4.13"
-    "@standardnotes/features" "^1.38.1"
-    "@standardnotes/filepicker" "^1.13.3"
-    "@standardnotes/models" "^1.6.0"
-    "@standardnotes/responses" "^1.6.12"
-    "@standardnotes/services" "^1.9.14"
+    "@standardnotes/domain-events" "^2.27.13"
+    "@standardnotes/encryption" "^1.6.1"
+    "@standardnotes/features" "^1.39.0"
+    "@standardnotes/filepicker" "^1.13.4"
+    "@standardnotes/files" "^1.0.4"
+    "@standardnotes/models" "^1.6.2"
+    "@standardnotes/responses" "^1.6.13"
+    "@standardnotes/services" "^1.10.1"
     "@standardnotes/settings" "^1.14.1"
-    "@standardnotes/sncrypto-common" "^1.7.7"
-    "@standardnotes/utils" "^1.6.2"
+    "@standardnotes/sncrypto-common" "^1.8.0"
+    "@standardnotes/utils" "^1.6.3"
 
-"@standardnotes/stylekit@5.23.0":
-  version "5.23.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.23.0.tgz#13da411b3b8903dd1f5cfda67ae86383b1a6a519"
-  integrity sha512-mU0dO83jMfl+IOO8QXZjA/woieqpL27RfsR7P2VOwqFVS3T+tlwr06VQLix0pF24inkZ0JdfGdYRhu4M71mFPg==
+"@standardnotes/stylekit@5.24.1":
+  version "5.24.1"
+  resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.24.1.tgz#9ebc3afde31ce4263e83ef59392120aaa932d638"
+  integrity sha512-niYMW8Mpj2gOloI2SSGoZvV8kSGGcujB09ti9uoicK1c9WD9s/vkjhoyzdSa3FmAjXbzVq/iwI9boSu7MLcpHw==
   dependencies:
     "@nanostores/preact" "^0.1.3"
     "@reach/listbox" "^0.16.2"
@@ -2561,10 +2573,10 @@
     nanostores "^0.5.10"
     prop-types "^15.8.1"
 
-"@standardnotes/utils@^1.6.2":
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.6.2.tgz#c118b6e7b23c4618d664e7894b3c49c702f656df"
-  integrity sha512-huU/t93Dy940bsB1JTfK3joqcZDT8toZfAtuktvHHHloTI7o5Wb0q9BtsmfGLRf1ohTq5ya0xkHFO5QVaAlV3g==
+"@standardnotes/utils@^1.6.3":
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.6.3.tgz#29486e4fd2d83e9a2616102244d747d9ae8e0597"
+  integrity sha512-cb46bd/b8Xo919BceWDoN347VE8/jKb74I9U8IUO1sTPAIi/YDNYRiBouqotuvgif3SxNBdst+ad6NElhhgm2Q==
   dependencies:
     "@standardnotes/common" "^1.19.6"
     dompurify "^2.3.6"