From 5af53b3c042f5d692fe08aa3ddd03f3f69a240a6 Mon Sep 17 00:00:00 2001 From: mifi Date: Thu, 1 Jun 2023 00:08:59 -0400 Subject: [PATCH] Working! --- package.json | 6 +- src/db/index.ts | 3 - src/settings/index.ts | 5 +- yarn.lock | 169 +++++++++++++++++++++++++++++++++++------- 4 files changed, 148 insertions(+), 35 deletions(-) delete mode 100644 src/db/index.ts diff --git a/package.json b/package.json index 228b0b2..f96f8a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mifi/auth-common", - "version": "1.0.5", + "version": "1.0.15", "author": "mifi (Mike Fitzpatrick)", "license": "MIT", "scripts": { @@ -48,8 +48,8 @@ }, "packageManager": "yarn@3.5.1", "dependencies": { - "@mifi/breakerbox-db": "^1.0.3", - "@mifi/services-common": "^1.0.11", + "@mifi/breakerbox-db": "^1.0.13", + "@mifi/services-common": "^1.0.16", "jsonwebtoken": "^9.0.0" } } diff --git a/src/db/index.ts b/src/db/index.ts deleted file mode 100644 index 71a1156..0000000 --- a/src/db/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { Breakerbox } from '@mifi/breakerbox-db/lib/index'; - -export const breakerbox = Breakerbox.getInstance({ path: 'auth-service-settings.yml', storageType: 'yaml' }); diff --git a/src/settings/index.ts b/src/settings/index.ts index 7cffc09..11af602 100644 --- a/src/settings/index.ts +++ b/src/settings/index.ts @@ -1,8 +1,7 @@ import { getEnvVar } from '@mifi/services-common/lib/utils/getEnvVar'; +import { breakerbox } from '@mifi/breakerbox-db/lib'; -import { breakerbox } from '../db'; - -export const REQUIRE_VERIFICATION = breakerbox.getValue( +export const REQUIRE_VERIFICATION = breakerbox.getOrSetValue( 'REQUIRE_VERIFICATION', getEnvVar('REQUIRE_VERIFICATION', true), true, diff --git a/yarn.lock b/yarn.lock index b4c2c57..b3908f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2745,8 +2745,8 @@ __metadata: "@babel/preset-env": ^7.21.5 "@babel/preset-typescript": ^7.21.5 "@mifi/auth-db": ^1.0.10 - "@mifi/breakerbox-db": ^1.0.3 - "@mifi/services-common": ^1.0.11 + "@mifi/breakerbox-db": ^1.0.13 + "@mifi/services-common": ^1.0.16 "@tsconfig/node16": ^1.0.4 "@types/jest": ^29.5.1 "@types/jsonwebtoken": ^9.0.2 @@ -2785,23 +2785,30 @@ __metadata: languageName: node linkType: hard -"@mifi/breakerbox-db@npm:^1.0.3": - version: 1.0.3 - resolution: "@mifi/breakerbox-db@npm:1.0.3::__archiveUrl=https%3A%2F%2Fgit.mifi.dev%2Fapi%2Fpackages%2Fmifi%2Fnpm%2F%2540mifi%252Fbreakerbox-db%2F-%2F1.0.3%2Fbreakerbox-db-1.0.3.tgz" +"@mifi/breakerbox-db@npm:^1.0.13": + version: 1.0.13 + resolution: "@mifi/breakerbox-db@npm:1.0.13::__archiveUrl=https%3A%2F%2Fgit.mifi.dev%2Fapi%2Fpackages%2Fmifi%2Fnpm%2F%2540mifi%252Fbreakerbox-db%2F-%2F1.0.13%2Fbreakerbox-db-1.0.13.tgz" dependencies: - lowdb: ^6.0.1 + level: ^8.0.0 yaml: ^2.3.1 - checksum: 16f2f841d4d1f87f29ddcbec222076d4186038cbd22b9116deb941c07bd0aca1473a5aa66ae113c0cb01c3ded866ef9ec4bbeda055b054d47c3696cb16cfeb62 + checksum: 57d431249b2b20387faea8e99546ff67b60b543636d1bf80479e9443f1bda71364cb890ef1d2c8d6cf28623c2b208e68c44076a03c4080417c0b072188362b9c languageName: node linkType: hard -"@mifi/services-common@npm:1.x.x, @mifi/services-common@npm:^1.0.11": +"@mifi/services-common@npm:1.x.x": version: 1.0.11 resolution: "@mifi/services-common@npm:1.0.11::__archiveUrl=https%3A%2F%2Fgit.mifi.dev%2Fapi%2Fpackages%2Fmifi%2Fnpm%2F%2540mifi%252Fservices-common%2F-%2F1.0.11%2Fservices-common-1.0.11.tgz" checksum: 3faeba975bbf35f532826da658545c1faa04f2a90c4f5a428474628aa3d9a3a03690b9caa216ed78be87aa4564dbe78195945b3de6a234ad6de9fac0768ac999 languageName: node linkType: hard +"@mifi/services-common@npm:^1.0.16": + version: 1.0.16 + resolution: "@mifi/services-common@npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.mifi.dev%2Fapi%2Fpackages%2Fmifi%2Fnpm%2F%2540mifi%252Fservices-common%2F-%2F1.0.16%2Fservices-common-1.0.16.tgz" + checksum: 9ef5aae54cfdc21b2f1ee78366767890d0fbda0d2459783ffba0af239a7a7a27e52dc2cb2dc82318763a5ecc8ec1bac0570a79f0973b620bd8a5c911a65768bc + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -3443,6 +3450,21 @@ __metadata: languageName: node linkType: hard +"abstract-level@npm:^1.0.2": + version: 1.0.3 + resolution: "abstract-level@npm:1.0.3" + dependencies: + buffer: ^6.0.3 + catering: ^2.1.0 + is-buffer: ^2.0.5 + level-supports: ^4.0.0 + level-transcoder: ^1.0.1 + module-error: ^1.0.1 + queue-microtask: ^1.2.3 + checksum: 70d61a3924526ebc257b138992052f9ff571a6cee5a7660836e37a1cc7081273c3acf465dd2f5e1897b38dc743a6fd9dba14a5d8a2a9d39e5787cd3da99f301d + languageName: node + linkType: hard + "accepts@npm:^1.3.5": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -3891,6 +3913,18 @@ __metadata: languageName: node linkType: hard +"browser-level@npm:^1.0.1": + version: 1.0.1 + resolution: "browser-level@npm:1.0.1" + dependencies: + abstract-level: ^1.0.2 + catering: ^2.1.1 + module-error: ^1.0.2 + run-parallel-limit: ^1.1.0 + checksum: 67fbc77ce832940bfa25073eccff279f512ad56f545deb996a5b23b02316f5e76f4a79d381acc27eda983f5c9a2566aaf9c97e4fdd0748288c4407307537a29b + languageName: node + linkType: hard + "browserslist@npm:^4.21.3, browserslist@npm:^4.21.5": version: 4.21.7 resolution: "browserslist@npm:4.21.7" @@ -3947,6 +3981,16 @@ __metadata: languageName: node linkType: hard +"buffer@npm:^6.0.3": + version: 6.0.3 + resolution: "buffer@npm:6.0.3" + dependencies: + base64-js: ^1.3.1 + ieee754: ^1.2.1 + checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9 + languageName: node + linkType: hard + "builtins@npm:^5.0.1": version: 5.0.1 resolution: "builtins@npm:5.0.1" @@ -4051,6 +4095,13 @@ __metadata: languageName: node linkType: hard +"catering@npm:^2.1.0, catering@npm:^2.1.1": + version: 2.1.1 + resolution: "catering@npm:2.1.1" + checksum: 205daefa69c935b0c19f3d8f2e0a520dd69aebe9bda55902958003f7c9cff8f967dfb90071b421bd6eb618576f657a89d2bc0986872c9bc04bbd66655e9d4bd6 + languageName: node + linkType: hard + "chalk@npm:^1.1.3": version: 1.1.3 resolution: "chalk@npm:1.1.3" @@ -4113,6 +4164,20 @@ __metadata: languageName: node linkType: hard +"classic-level@npm:^1.2.0": + version: 1.3.0 + resolution: "classic-level@npm:1.3.0" + dependencies: + abstract-level: ^1.0.2 + catering: ^2.1.0 + module-error: ^1.0.1 + napi-macros: ^2.2.2 + node-gyp: latest + node-gyp-build: ^4.3.0 + checksum: 773da48aef52a041115d413fee8340b357a4da2eb505764f327183b155edd7cc9d24819eb4f707c83dbdae8588024f5dddeb322125567c59d5d1f6f16334cdb9 + languageName: node + linkType: hard + "clean-stack@npm:^2.0.0": version: 2.2.0 resolution: "clean-stack@npm:2.2.0" @@ -5622,7 +5687,7 @@ __metadata: languageName: node linkType: hard -"ieee754@npm:^1.1.13": +"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1": version: 1.2.1 resolution: "ieee754@npm:1.2.1" checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e @@ -5751,6 +5816,13 @@ __metadata: languageName: node linkType: hard +"is-buffer@npm:^2.0.5": + version: 2.0.5 + resolution: "is-buffer@npm:2.0.5" + checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42 + languageName: node + linkType: hard + "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -6664,6 +6736,33 @@ __metadata: languageName: node linkType: hard +"level-supports@npm:^4.0.0": + version: 4.0.1 + resolution: "level-supports@npm:4.0.1" + checksum: d4552b42bb8cdeada07b0f6356c7a90fefe76279147331f291aceae26e3e56d5f927b09ce921647c0230bfe03ddfbdcef332be921e5c2194421ae2bfa3cf6368 + languageName: node + linkType: hard + +"level-transcoder@npm:^1.0.1": + version: 1.0.1 + resolution: "level-transcoder@npm:1.0.1" + dependencies: + buffer: ^6.0.3 + module-error: ^1.0.1 + checksum: 304f08d802faf3491a533b6d87ad8be3cabfd27f2713bbe9d4c633bf50fcb9460eab5a6776bf015e101ead7ba1c1853e05e7f341112f17a9d0cb37ee5a421a25 + languageName: node + linkType: hard + +"level@npm:^8.0.0": + version: 8.0.0 + resolution: "level@npm:8.0.0" + dependencies: + browser-level: ^1.0.1 + classic-level: ^1.2.0 + checksum: 13eb25bd71bfdca6cd714d1233adf9da97de9a8a4bf9f28d62a390b5c96d0250abaf983eb90eb8c4e89c7a985bb330750683d106f12670e5ea8fba1d7e608a1f + languageName: node + linkType: hard + "leven@npm:^3.1.0": version: 3.1.0 resolution: "leven@npm:3.1.0" @@ -6761,15 +6860,6 @@ __metadata: languageName: node linkType: hard -"lowdb@npm:^6.0.1": - version: 6.0.1 - resolution: "lowdb@npm:6.0.1" - dependencies: - steno: ^3.0.0 - checksum: d555a5bcc2e4a963fae89209b693a6f2b7b69bae915ff67355537b7a14a4f6e44bc273467bc3d4d7e81660c1313587ee3bfebf044d50d3213a5e95ea7f07ded4 - languageName: node - linkType: hard - "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -7037,6 +7127,13 @@ __metadata: languageName: node linkType: hard +"module-error@npm:^1.0.1, module-error@npm:^1.0.2": + version: 1.0.2 + resolution: "module-error@npm:1.0.2" + checksum: 5d653e35bd55b3e95f8aee2cdac108082ea892e71b8f651be92cde43e4ee86abee4fa8bd7fc3fe5e68b63926d42f63c54cd17b87a560c31f18739295575a3962 + languageName: node + linkType: hard + "mongodb-connection-string-url@npm:^2.5.4": version: 2.6.0 resolution: "mongodb-connection-string-url@npm:2.6.0" @@ -7117,6 +7214,13 @@ __metadata: languageName: node linkType: hard +"napi-macros@npm:^2.2.2": + version: 2.2.2 + resolution: "napi-macros@npm:2.2.2" + checksum: c6f9bd71cdbbc37ddc3535aa5be481238641d89585b8a3f4d301cb89abf459e2d294810432bb7d12056d1f9350b1a0899a5afcf460237a3da6c398cf0fec7629 + languageName: node + linkType: hard + "natural-compare-lite@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare-lite@npm:1.4.0" @@ -7138,6 +7242,17 @@ __metadata: languageName: node linkType: hard +"node-gyp-build@npm:^4.3.0": + version: 4.6.0 + resolution: "node-gyp-build@npm:4.6.0" + bin: + node-gyp-build: bin.js + node-gyp-build-optional: optional.js + node-gyp-build-test: build-test.js + checksum: 25d78c5ef1f8c24291f4a370c47ba52fcea14f39272041a90a7894cd50d766f7c8cb8fb06c0f42bf6f69b204b49d9be3c8fc344aac09714d5bdb95965499eb15 + languageName: node + linkType: hard + "node-gyp@npm:latest": version: 9.3.1 resolution: "node-gyp@npm:9.3.1" @@ -7614,7 +7729,7 @@ __metadata: languageName: node linkType: hard -"queue-microtask@npm:^1.2.2": +"queue-microtask@npm:^1.2.2, queue-microtask@npm:^1.2.3": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4 @@ -7839,6 +7954,15 @@ __metadata: languageName: node linkType: hard +"run-parallel-limit@npm:^1.1.0": + version: 1.1.0 + resolution: "run-parallel-limit@npm:1.1.0" + dependencies: + queue-microtask: ^1.2.2 + checksum: 672c3b87e7f939c684b9965222b361421db0930223ed1e43ebf0e7e48ccc1a022ea4de080bef4d5468434e2577c33b7681e3f03b7593fdc49ad250a55381123c + languageName: node + linkType: hard + "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -8080,13 +8204,6 @@ __metadata: languageName: node linkType: hard -"steno@npm:^3.0.0": - version: 3.0.0 - resolution: "steno@npm:3.0.0" - checksum: fb928451a4f96342b496b71147fbca0a20a5daf7bfd23a4a1cec8640d3c6c67176809169e9a5801ea44490d448b5b7ecb151b9fba434872c2d65549847f39460 - languageName: node - linkType: hard - "string-length@npm:^4.0.1": version: 4.0.2 resolution: "string-length@npm:4.0.2"