diff --git a/.yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip b/.yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip deleted file mode 100644 index e71c9f8d2..000000000 Binary files a/.yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip and /dev/null differ diff --git a/.yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip b/.yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip new file mode 100644 index 000000000..7f200e02c Binary files /dev/null and b/.yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip differ diff --git a/.yarn/cache/@standardnotes-domain-events-npm-2.88.0-556633609b-8574ba4c7e.zip b/.yarn/cache/@standardnotes-domain-events-npm-2.88.0-556633609b-8574ba4c7e.zip deleted file mode 100644 index 62c3c08c3..000000000 Binary files a/.yarn/cache/@standardnotes-domain-events-npm-2.88.0-556633609b-8574ba4c7e.zip and /dev/null differ diff --git a/.yarn/cache/@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip b/.yarn/cache/@standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip similarity index 90% rename from .yarn/cache/@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip rename to .yarn/cache/@standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip index d12da1835..0d752f12f 100644 Binary files a/.yarn/cache/@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip and b/.yarn/cache/@standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip differ diff --git a/.yarn/cache/@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip b/.yarn/cache/@standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip similarity index 80% rename from .yarn/cache/@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip rename to .yarn/cache/@standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip index 48d1c248c..e47c76834 100644 Binary files a/.yarn/cache/@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip and b/.yarn/cache/@standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip differ diff --git a/.yarn/cache/jsonwebtoken-npm-9.0.0-36fd1594c0-b9181cecf9.zip b/.yarn/cache/jsonwebtoken-npm-9.0.0-36fd1594c0-b9181cecf9.zip new file mode 100644 index 000000000..0654b0bb3 Binary files /dev/null and b/.yarn/cache/jsonwebtoken-npm-9.0.0-36fd1594c0-b9181cecf9.zip differ diff --git a/packages/api/package.json b/packages/api/package.json index e1c65a4d3..9c94304e6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -41,7 +41,7 @@ "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", - "@standardnotes/security": "^1.7.0", + "@standardnotes/security": "^1.7.5", "@standardnotes/utils": "workspace:*", "reflect-metadata": "^0.1.13" } diff --git a/packages/features/package.json b/packages/features/package.json index 7dc44c66b..d7a8a6689 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -25,10 +25,9 @@ "test": "jest" }, "dependencies": { - "@standardnotes/auth": "^3.19.4", "@standardnotes/common": "^1.46.3", "@standardnotes/domain-core": "^1.11.1", - "@standardnotes/security": "^1.7.0", + "@standardnotes/security": "^1.7.5", "reflect-metadata": "^0.1.13" }, "devDependencies": { diff --git a/packages/responses/package.json b/packages/responses/package.json index ee7a1c771..79d4996d5 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -35,7 +35,7 @@ "dependencies": { "@standardnotes/common": "^1.46.3", "@standardnotes/features": "workspace:*", - "@standardnotes/security": "^1.7.0", + "@standardnotes/security": "^1.7.5", "reflect-metadata": "^0.1.13" } } diff --git a/packages/services/package.json b/packages/services/package.json index f97aefa98..e5417246a 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -17,14 +17,13 @@ }, "dependencies": { "@standardnotes/api": "workspace:^", - "@standardnotes/auth": "^3.19.4", "@standardnotes/common": "^1.46.3", "@standardnotes/domain-core": "^1.11.1", "@standardnotes/encryption": "workspace:^", "@standardnotes/files": "workspace:^", "@standardnotes/models": "workspace:^", "@standardnotes/responses": "workspace:*", - "@standardnotes/security": "^1.7.0", + "@standardnotes/security": "^1.7.5", "@standardnotes/sncrypto-common": "workspace:^", "@standardnotes/utils": "workspace:*", "reflect-metadata": "^0.1.13" diff --git a/packages/services/src/Domain/Api/ApiServiceInterface.ts b/packages/services/src/Domain/Api/ApiServiceInterface.ts index 24c71ba01..33e8d4914 100644 --- a/packages/services/src/Domain/Api/ApiServiceInterface.ts +++ b/packages/services/src/Domain/Api/ApiServiceInterface.ts @@ -1,7 +1,7 @@ import { Either } from '@standardnotes/common' -import { Role } from '@standardnotes/auth' import { FilesApiInterface } from '@standardnotes/files' import { Session } from '@standardnotes/domain-core' +import { Role } from '@standardnotes/security' import { AbstractService } from '../Service/AbstractService' diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 5e3946d92..c639a8ca7 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -37,13 +37,13 @@ "@babel/preset-env": "*", "@standardnotes/api": "workspace:*", "@standardnotes/common": "^1.46.3", - "@standardnotes/domain-events": "^2.88.0", + "@standardnotes/domain-events": "^2.106.0", "@standardnotes/encryption": "workspace:*", "@standardnotes/features": "workspace:*", "@standardnotes/files": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", - "@standardnotes/security": "^1.7.0", + "@standardnotes/security": "^1.7.5", "@standardnotes/services": "workspace:*", "@standardnotes/settings": "^1.19.0", "@standardnotes/sncrypto-common": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 47201be67..c2932ccbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4377,7 +4377,7 @@ __metadata: "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" - "@standardnotes/security": ^1.7.0 + "@standardnotes/security": ^1.7.5 "@standardnotes/utils": "workspace:*" "@types/jest": ^29.2.3 "@types/lodash": ^4.14.189 @@ -4494,15 +4494,6 @@ __metadata: languageName: node linkType: hard -"@standardnotes/common@npm:1.45.0": - version: 1.45.0 - resolution: "@standardnotes/common@npm:1.45.0" - dependencies: - reflect-metadata: ^0.1.13 - checksum: 3bf1dd805ba7a864caebd25d5390bdbf4fb6b7cd06b3c064ad19cda6e5a709b7eb8f22314a5f393fa5c21a50722056f6c4e40308c43ca8c112db3260cd17b45f - languageName: node - linkType: hard - "@standardnotes/common@npm:^1.43.0": version: 1.43.0 resolution: "@standardnotes/common@npm:1.43.0" @@ -4606,16 +4597,14 @@ __metadata: languageName: node linkType: hard -"@standardnotes/domain-events@npm:^2.88.0": - version: 2.88.0 - resolution: "@standardnotes/domain-events@npm:2.88.0" +"@standardnotes/domain-events@npm:^2.106.0": + version: 2.106.0 + resolution: "@standardnotes/domain-events@npm:2.106.0" dependencies: - "@standardnotes/common": 1.45.0 - "@standardnotes/features": ^1.52.1 - "@standardnotes/predicates": 1.6.0 - "@standardnotes/security": 1.7.0 - reflect-metadata: ^0.1.13 - checksum: 8574ba4c7efe96ff7bb98612d4b5f0ceef3e81d5e9c401396bd5b3a8bc1d6382d059958261b88a117fe6eaf5c96fed3dd5969efe67fe3669d7badd2113ed47fb + "@standardnotes/features": ^1.58.1 + "@standardnotes/predicates": 1.6.4 + "@standardnotes/security": 1.7.5 + checksum: db98a6b4ef5181a02862a3989df2d8f0a4929044456583c9ffda767c31c5dec676a4da82d1fe581ffc6e35a977a05b071a2a8646fee2a4bdbdf1b265ccbb70d8 languageName: node linkType: hard @@ -4669,14 +4658,13 @@ __metadata: languageName: unknown linkType: soft -"@standardnotes/features@^1.52.1, @standardnotes/features@workspace:*, @standardnotes/features@workspace:^, @standardnotes/features@workspace:packages/features": +"@standardnotes/features@^1.58.1, @standardnotes/features@workspace:*, @standardnotes/features@workspace:^, @standardnotes/features@workspace:packages/features": version: 0.0.0-use.local resolution: "@standardnotes/features@workspace:packages/features" dependencies: - "@standardnotes/auth": ^3.19.4 "@standardnotes/common": ^1.46.3 "@standardnotes/domain-core": ^1.11.1 - "@standardnotes/security": ^1.7.0 + "@standardnotes/security": ^1.7.5 "@types/jest": ^29.2.3 "@typescript-eslint/eslint-plugin": "*" eslint: "*" @@ -4905,13 +4893,10 @@ __metadata: languageName: unknown linkType: soft -"@standardnotes/predicates@npm:1.6.0": - version: 1.6.0 - resolution: "@standardnotes/predicates@npm:1.6.0" - dependencies: - "@standardnotes/common": 1.45.0 - reflect-metadata: ^0.1.13 - checksum: 020e2206c75e6b964bf400314a116b29ece5f9e662a5dd6704de8864aaec1689256b008334db5f2983addc039d3b7f4a8108c87789e61d37a8ba9161ea93cfa0 +"@standardnotes/predicates@npm:1.6.4": + version: 1.6.4 + resolution: "@standardnotes/predicates@npm:1.6.4" + checksum: 6d7235896a6d591f6e33d2d0b89c58850d357095d26e1d74264db1d77164a8f1f6673f4095c660719992f2aa8411cfbfe79781f004c3eb2aa82a761e34827f60 languageName: node linkType: hard @@ -4940,7 +4925,7 @@ __metadata: dependencies: "@standardnotes/common": ^1.46.3 "@standardnotes/features": "workspace:*" - "@standardnotes/security": ^1.7.0 + "@standardnotes/security": ^1.7.5 "@types/jest": ^29.2.3 "@typescript-eslint/eslint-plugin": "*" eslint: "*" @@ -4961,14 +4946,13 @@ __metadata: languageName: node linkType: hard -"@standardnotes/security@npm:1.7.0, @standardnotes/security@npm:^1.7.0": - version: 1.7.0 - resolution: "@standardnotes/security@npm:1.7.0" +"@standardnotes/security@npm:1.7.5, @standardnotes/security@npm:^1.7.5": + version: 1.7.5 + resolution: "@standardnotes/security@npm:1.7.5" dependencies: - "@standardnotes/common": 1.45.0 - jsonwebtoken: ^8.5.1 + jsonwebtoken: ^9.0.0 reflect-metadata: ^0.1.13 - checksum: c053af16e620c29e8b9233212e5b220cebc7e71c195b5c63cd6fb68b617465c935ae1c926ebc6a4c9aff32487e538e949a3fe4a9e281d082c2fddcc9d17fa3a7 + checksum: 69d180d25936cad64ee19d8932aedff60b91f4a25f96084e0a686b228773aba856f50c3da265d426d64160dff28f20d9d7980a625bce00fc6a47416caa4e130e languageName: node linkType: hard @@ -4988,14 +4972,13 @@ __metadata: resolution: "@standardnotes/services@workspace:packages/services" dependencies: "@standardnotes/api": "workspace:^" - "@standardnotes/auth": ^3.19.4 "@standardnotes/common": ^1.46.3 "@standardnotes/domain-core": ^1.11.1 "@standardnotes/encryption": "workspace:^" "@standardnotes/files": "workspace:^" "@standardnotes/models": "workspace:^" "@standardnotes/responses": "workspace:*" - "@standardnotes/security": ^1.7.0 + "@standardnotes/security": ^1.7.5 "@standardnotes/sncrypto-common": "workspace:^" "@standardnotes/utils": "workspace:*" "@types/jest": ^29.2.3 @@ -5088,13 +5071,13 @@ __metadata: "@standardnotes/api": "workspace:*" "@standardnotes/common": ^1.46.3 "@standardnotes/domain-core": ^1.11.1 - "@standardnotes/domain-events": ^2.88.0 + "@standardnotes/domain-events": ^2.106.0 "@standardnotes/encryption": "workspace:*" "@standardnotes/features": "workspace:*" "@standardnotes/files": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" - "@standardnotes/security": ^1.7.0 + "@standardnotes/security": ^1.7.5 "@standardnotes/services": "workspace:*" "@standardnotes/settings": ^1.19.0 "@standardnotes/sncrypto-common": "workspace:*" @@ -14999,6 +14982,18 @@ __metadata: languageName: node linkType: hard +"jsonwebtoken@npm:^9.0.0": + version: 9.0.0 + resolution: "jsonwebtoken@npm:9.0.0" + dependencies: + jws: ^3.2.2 + lodash: ^4.17.21 + ms: ^2.1.1 + semver: ^7.3.8 + checksum: b9181cecf9df99f1dc0253f91ba000a1aa4d91f5816d1608c0dba61a5623726a0bfe200b51df25de18c1a6000825d231ad7ce2788aa54fd48dcb760ad9eb9514 + languageName: node + linkType: hard + "jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.3.3 resolution: "jsx-ast-utils@npm:3.3.3"