Initial work into multi-tenancy removal, experiencing issues with test cases at this point.
This commit is contained in:
mike12345567
parent
752d4c1ae0
commit
ea03d099b3
|
|
@ -718,15 +718,6 @@
|
|||
svelte-flatpickr "^2.4.0"
|
||||
svelte-portal "^1.0.0"
|
||||
|
||||
"@budibase/client@^0.2.6":
|
||||
version "0.2.6"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.2.6.tgz#de1b4872c7956d386a3b08969eda509bd39d1a64"
|
||||
integrity sha512-sSoGN0k2Tcc5GewBjFMN+G3h21O9JvakYI33kBKgEVGrdEQLBbry7vRKb+lALeW2Bz65gafZL2joZzL8vnH0lw==
|
||||
dependencies:
|
||||
deep-equal "^2.0.1"
|
||||
mustache "^4.0.1"
|
||||
regexparam "^1.3.0"
|
||||
|
||||
"@budibase/colorpicker@^1.0.1":
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/@budibase/colorpicker/-/colorpicker-1.0.1.tgz#940c180e7ebba0cb0756c4c8ef13f5dfab58e810"
|
||||
|
|
@ -1415,11 +1406,6 @@ array-equal@^1.0.0:
|
|||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
|
||||
|
||||
array-filter@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
|
||||
integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
|
||||
|
||||
array-union@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
|
||||
|
|
@ -1474,13 +1460,6 @@ atob@^2.1.2:
|
|||
version "2.1.2"
|
||||
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
|
||||
|
||||
available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
|
||||
integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
|
||||
dependencies:
|
||||
array-filter "^1.0.0"
|
||||
|
||||
aws-sign2@~0.7.0:
|
||||
version "0.7.0"
|
||||
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
|
||||
|
|
@ -2430,26 +2409,6 @@ decode-uri-component@^0.2.0:
|
|||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
|
||||
|
||||
deep-equal@^2.0.1:
|
||||
version "2.0.4"
|
||||
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.4.tgz#6b0b407a074666033169df3acaf128e1c6f3eab6"
|
||||
integrity sha512-BUfaXrVoCfgkOQY/b09QdO9L3XNoF2XH0A3aY9IQwQL/ZjLOe8FQgCNVl1wiolhsFo8kFdO9zdPViCPbmaJA5w==
|
||||
dependencies:
|
||||
es-abstract "^1.18.0-next.1"
|
||||
es-get-iterator "^1.1.0"
|
||||
is-arguments "^1.0.4"
|
||||
is-date-object "^1.0.2"
|
||||
is-regex "^1.1.1"
|
||||
isarray "^2.0.5"
|
||||
object-is "^1.1.3"
|
||||
object-keys "^1.1.1"
|
||||
object.assign "^4.1.1"
|
||||
regexp.prototype.flags "^1.3.0"
|
||||
side-channel "^1.0.3"
|
||||
which-boxed-primitive "^1.0.1"
|
||||
which-collection "^1.0.1"
|
||||
which-typed-array "^1.1.2"
|
||||
|
||||
deep-is@~0.1.3:
|
||||
version "0.1.3"
|
||||
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
|
||||
|
|
@ -2619,54 +2578,6 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
|
|||
string.prototype.trimleft "^2.1.1"
|
||||
string.prototype.trimright "^2.1.1"
|
||||
|
||||
es-abstract@^1.17.4:
|
||||
version "1.17.7"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
|
||||
integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
|
||||
dependencies:
|
||||
es-to-primitive "^1.2.1"
|
||||
function-bind "^1.1.1"
|
||||
has "^1.0.3"
|
||||
has-symbols "^1.0.1"
|
||||
is-callable "^1.2.2"
|
||||
is-regex "^1.1.1"
|
||||
object-inspect "^1.8.0"
|
||||
object-keys "^1.1.1"
|
||||
object.assign "^4.1.1"
|
||||
string.prototype.trimend "^1.0.1"
|
||||
string.prototype.trimstart "^1.0.1"
|
||||
|
||||
es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
|
||||
version "1.18.0-next.1"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
|
||||
integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
|
||||
dependencies:
|
||||
es-to-primitive "^1.2.1"
|
||||
function-bind "^1.1.1"
|
||||
has "^1.0.3"
|
||||
has-symbols "^1.0.1"
|
||||
is-callable "^1.2.2"
|
||||
is-negative-zero "^2.0.0"
|
||||
is-regex "^1.1.1"
|
||||
object-inspect "^1.8.0"
|
||||
object-keys "^1.1.1"
|
||||
object.assign "^4.1.1"
|
||||
string.prototype.trimend "^1.0.1"
|
||||
string.prototype.trimstart "^1.0.1"
|
||||
|
||||
es-get-iterator@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
|
||||
integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
|
||||
dependencies:
|
||||
es-abstract "^1.17.4"
|
||||
has-symbols "^1.0.1"
|
||||
is-arguments "^1.0.4"
|
||||
is-map "^2.0.1"
|
||||
is-set "^2.0.1"
|
||||
is-string "^1.0.5"
|
||||
isarray "^2.0.5"
|
||||
|
||||
es-to-primitive@^1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
|
||||
|
|
@ -2973,7 +2884,7 @@ for-in@^1.0.2:
|
|||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
|
||||
|
||||
foreach@^2.0.5, foreach@~2.0.1:
|
||||
foreach@~2.0.1:
|
||||
version "2.0.5"
|
||||
resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
|
||||
integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
|
||||
|
|
@ -3347,31 +3258,16 @@ is-accessor-descriptor@^1.0.0:
|
|||
dependencies:
|
||||
kind-of "^6.0.0"
|
||||
|
||||
is-arguments@^1.0.4:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
|
||||
integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
|
||||
|
||||
is-arrayish@^0.2.1:
|
||||
version "0.2.1"
|
||||
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
|
||||
|
||||
is-bigint@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
|
||||
integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
|
||||
|
||||
is-binary-path@~2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
|
||||
dependencies:
|
||||
binary-extensions "^2.0.0"
|
||||
|
||||
is-boolean-object@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
|
||||
integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
|
||||
|
||||
is-buffer@^1.1.5:
|
||||
version "1.1.6"
|
||||
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
|
||||
|
|
@ -3380,11 +3276,6 @@ is-callable@^1.1.4, is-callable@^1.1.5:
|
|||
version "1.1.5"
|
||||
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
|
||||
|
||||
is-callable@^1.2.2:
|
||||
version "1.2.2"
|
||||
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
|
||||
integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
|
||||
|
||||
is-ci@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
|
||||
|
|
@ -3403,7 +3294,7 @@ is-data-descriptor@^1.0.0:
|
|||
dependencies:
|
||||
kind-of "^6.0.0"
|
||||
|
||||
is-date-object@^1.0.1, is-date-object@^1.0.2:
|
||||
is-date-object@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
|
||||
|
||||
|
|
@ -3468,25 +3359,10 @@ is-installed-globally@^0.3.2:
|
|||
global-dirs "^2.0.1"
|
||||
is-path-inside "^3.0.1"
|
||||
|
||||
is-map@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
|
||||
integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
|
||||
|
||||
is-module@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
|
||||
|
||||
is-negative-zero@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
|
||||
integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
|
||||
|
||||
is-number-object@^1.0.3:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
|
||||
integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
|
||||
|
||||
is-number@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
|
||||
|
|
@ -3543,18 +3419,6 @@ is-regex@^1.0.5:
|
|||
dependencies:
|
||||
has "^1.0.3"
|
||||
|
||||
is-regex@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
|
||||
integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
|
||||
dependencies:
|
||||
has-symbols "^1.0.1"
|
||||
|
||||
is-set@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
|
||||
integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
|
||||
|
||||
is-stream@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
|
||||
|
|
@ -3563,41 +3427,16 @@ is-stream@^2.0.0:
|
|||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
|
||||
|
||||
is-string@^1.0.4, is-string@^1.0.5:
|
||||
version "1.0.5"
|
||||
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
|
||||
integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
|
||||
|
||||
is-symbol@^1.0.2:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
|
||||
dependencies:
|
||||
has-symbols "^1.0.1"
|
||||
|
||||
is-typed-array@^1.1.3:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
|
||||
integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==
|
||||
dependencies:
|
||||
available-typed-arrays "^1.0.0"
|
||||
es-abstract "^1.17.4"
|
||||
foreach "^2.0.5"
|
||||
has-symbols "^1.0.1"
|
||||
|
||||
is-typedarray@~1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
|
||||
|
||||
is-weakmap@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
|
||||
integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
|
||||
|
||||
is-weakset@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
|
||||
integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
|
||||
|
||||
is-windows@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
|
||||
|
|
@ -3618,11 +3457,6 @@ isarray@1.0.0, isarray@~1.0.0:
|
|||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
|
||||
|
||||
isarray@^2.0.5:
|
||||
version "2.0.5"
|
||||
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
|
||||
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
|
||||
|
||||
isbuffer@~0.0.0:
|
||||
version "0.0.0"
|
||||
resolved "https://registry.yarnpkg.com/isbuffer/-/isbuffer-0.0.0.tgz#38c146d9df528b8bf9b0701c3d43cf12df3fc39b"
|
||||
|
|
@ -4742,19 +4576,6 @@ object-inspect@^1.7.0:
|
|||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
|
||||
|
||||
object-inspect@^1.8.0:
|
||||
version "1.8.0"
|
||||
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
|
||||
integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
|
||||
|
||||
object-is@^1.1.3:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
|
||||
integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
|
||||
dependencies:
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
|
||||
|
|
@ -4786,16 +4607,6 @@ object.assign@^4.1.0:
|
|||
has-symbols "^1.0.0"
|
||||
object-keys "^1.0.11"
|
||||
|
||||
object.assign@^4.1.1:
|
||||
version "4.1.1"
|
||||
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
|
||||
integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
|
||||
dependencies:
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.0"
|
||||
has-symbols "^1.0.1"
|
||||
object-keys "^1.1.1"
|
||||
|
||||
object.getownpropertydescriptors@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
|
||||
|
|
@ -5276,19 +5087,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
|
|||
extend-shallow "^3.0.2"
|
||||
safe-regex "^1.1.0"
|
||||
|
||||
regexp.prototype.flags@^1.3.0:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
|
||||
integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
|
||||
dependencies:
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.0-next.1"
|
||||
|
||||
regexparam@^1.3.0:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
|
||||
integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
|
||||
|
||||
regexpu-core@^4.7.0:
|
||||
version "4.7.0"
|
||||
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
|
||||
|
|
@ -5701,14 +5499,6 @@ shortid@^2.2.15:
|
|||
dependencies:
|
||||
nanoid "^2.1.0"
|
||||
|
||||
side-channel@^1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
|
||||
integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
|
||||
dependencies:
|
||||
es-abstract "^1.18.0-next.0"
|
||||
object-inspect "^1.8.0"
|
||||
|
||||
signal-exit@^3.0.0, signal-exit@^3.0.2:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
|
||||
|
|
@ -5942,14 +5732,6 @@ string.prototype.trimend@^1.0.0:
|
|||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.5"
|
||||
|
||||
string.prototype.trimend@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
|
||||
integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
|
||||
dependencies:
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string.prototype.trimleft@^2.1.1:
|
||||
version "2.1.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
|
||||
|
|
@ -5973,14 +5755,6 @@ string.prototype.trimstart@^1.0.0:
|
|||
define-properties "^1.1.3"
|
||||
es-abstract "^1.17.5"
|
||||
|
||||
string.prototype.trimstart@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
|
||||
integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
|
||||
dependencies:
|
||||
define-properties "^1.1.3"
|
||||
es-abstract "^1.18.0-next.1"
|
||||
|
||||
string_decoder@^1.1.1:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
|
||||
|
|
@ -6430,43 +6204,10 @@ whatwg-url@^8.0.0:
|
|||
tr46 "^2.0.2"
|
||||
webidl-conversions "^5.0.0"
|
||||
|
||||
which-boxed-primitive@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
|
||||
integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==
|
||||
dependencies:
|
||||
is-bigint "^1.0.0"
|
||||
is-boolean-object "^1.0.0"
|
||||
is-number-object "^1.0.3"
|
||||
is-string "^1.0.4"
|
||||
is-symbol "^1.0.2"
|
||||
|
||||
which-collection@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
|
||||
integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
|
||||
dependencies:
|
||||
is-map "^2.0.1"
|
||||
is-set "^2.0.1"
|
||||
is-weakmap "^2.0.1"
|
||||
is-weakset "^2.0.1"
|
||||
|
||||
which-module@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
|
||||
|
||||
which-typed-array@^1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
|
||||
integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==
|
||||
dependencies:
|
||||
available-typed-arrays "^1.0.2"
|
||||
es-abstract "^1.17.5"
|
||||
foreach "^2.0.5"
|
||||
function-bind "^1.1.1"
|
||||
has-symbols "^1.0.1"
|
||||
is-typed-array "^1.1.3"
|
||||
|
||||
which@^1.2.9, which@^1.3.0:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// THIS will create API Keys and App Ids input in a local Dynamo instance if it is running
|
||||
const dynamoClient = require("../src/db/dynamoClient")
|
||||
const env = require("../src/environment")
|
||||
|
||||
if (process.argv[2] == null || process.argv[3] == null) {
|
||||
console.error(
|
||||
|
|
@ -11,8 +12,8 @@ if (process.argv[2] == null || process.argv[3] == null) {
|
|||
const FAKE_STRING = "fakestring"
|
||||
|
||||
// set fake credentials for local dynamo to actually work
|
||||
process.env.AWS_ACCESS_KEY_ID = "KEY_ID"
|
||||
process.env.AWS_SECRET_ACCESS_KEY = "SECRET_KEY"
|
||||
env._set("AWS_ACCESS_KEY_ID", "KEY_ID")
|
||||
env._set("AWS_SECRET_ACCESS_KEY", "SECRET_KEY")
|
||||
dynamoClient.init("http://localhost:8333")
|
||||
|
||||
async function run() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
const { tmpdir } = require("os")
|
||||
const env = require("../src/environment")
|
||||
|
||||
process.env.NODE_ENV = "jest"
|
||||
process.env.JWT_SECRET = "test-jwtsecret"
|
||||
process.env.CLIENT_ID = "test-client-id"
|
||||
process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
|
||||
process.env.LOG_LEVEL = "silent"
|
||||
env._set("NODE_ENV", "jest")
|
||||
env._set("JWT_SECRET", "test-jwtsecret")
|
||||
env._set("CLIENT_ID", "test-client-id")
|
||||
env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
|
||||
env._set("LOG_LEVEL", "silent")
|
||||
|
|
|
|||
|
|
@ -5,14 +5,7 @@
|
|||
* e.g. node scripts/replicateApp Mike http://admin:password@127.0.0.1:5984
|
||||
*/
|
||||
|
||||
const { resolve, join } = require("path")
|
||||
const { homedir } = require("os")
|
||||
const budibaseDir = join(homedir(), ".budibase")
|
||||
process.env.BUDIBASE_DIR = budibaseDir
|
||||
require("dotenv").config({ path: resolve(budibaseDir, ".env") })
|
||||
const env = require("../src/environment")
|
||||
const CouchDB = require("../src/db")
|
||||
const clientDbName = require("../src/db/clientDb").name(env.CLIENT_ID)
|
||||
|
||||
const appName = process.argv[2].toLowerCase()
|
||||
const remoteUrl = process.argv[3]
|
||||
|
|
@ -20,27 +13,26 @@ const remoteUrl = process.argv[3]
|
|||
console.log(`Replicating from ${appName} to ${remoteUrl}/${appName}`)
|
||||
|
||||
const run = async () => {
|
||||
const clientDb = new CouchDB(clientDbName)
|
||||
|
||||
const body = await clientDb.query("client/by_type", {
|
||||
include_docs: true,
|
||||
key: ["app"],
|
||||
})
|
||||
|
||||
const app = body.rows
|
||||
.map(r => r.doc)
|
||||
.find(a => a.name == appName || a.name.toLowerCase() === appName)
|
||||
const allDbs = await CouchDB.allDbs()
|
||||
const appDbNames = allDbs.filter(dbName => dbName.startsWith("inst_app"))
|
||||
let apps = []
|
||||
for (let dbName of appDbNames) {
|
||||
const db = new CouchDB(dbName)
|
||||
apps.push(db.get(dbName))
|
||||
}
|
||||
apps = await Promise.all(apps)
|
||||
const app = apps.find(
|
||||
a => a.name === appName || a.name.toLowerCase() === appName
|
||||
)
|
||||
|
||||
if (!app) {
|
||||
console.log(
|
||||
`Could not find app... apps: ${body.rows.map(r => r.doc.name).join(", ")}`
|
||||
`Could not find app... apps: ${apps.map(app => app.name).join(", ")}`
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const devInstance = app.instances.find(i => i.name === `dev-${env.CLIENT_ID}`)
|
||||
|
||||
const instanceDb = new CouchDB(devInstance._id)
|
||||
const instanceDb = new CouchDB(app._id)
|
||||
const remoteDb = new CouchDB(`${remoteUrl}/${appName}`)
|
||||
|
||||
instanceDb.replicate
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
const env = require("../../environment")
|
||||
|
||||
exports.isEnabled = async function(ctx) {
|
||||
ctx.body = JSON.stringify(process.env.ENABLE_ANALYTICS === "true")
|
||||
ctx.body = JSON.stringify(env.ENABLE_ANALYTICS === "true")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,21 +2,23 @@ const fs = require("fs")
|
|||
const { join } = require("../../utilities/centralPath")
|
||||
const readline = require("readline")
|
||||
const { budibaseAppsDir } = require("../../utilities/budibaseDir")
|
||||
const env = require("../../environment")
|
||||
const ENV_FILE_PATH = "/.env"
|
||||
|
||||
exports.fetch = async function(ctx) {
|
||||
ctx.status = 200
|
||||
ctx.body = {
|
||||
budibase: process.env.BUDIBASE_API_KEY,
|
||||
userId: process.env.USERID_API_KEY,
|
||||
budibase: env.BUDIBASE_API_KEY,
|
||||
userId: env.USERID_API_KEY,
|
||||
}
|
||||
}
|
||||
|
||||
exports.update = async function(ctx) {
|
||||
const key = `${ctx.params.key.toUpperCase()}_API_KEY`
|
||||
const value = ctx.request.body.value
|
||||
// Set process.env
|
||||
process.env[key] = value
|
||||
|
||||
// set environment variables
|
||||
env._set(key, value)
|
||||
|
||||
// Write to file
|
||||
await updateValues([key, value])
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const CouchDB = require("../../db")
|
||||
const ClientDb = require("../../db/clientDb")
|
||||
const { getPackageForBuilder, buildPage } = require("../../utilities/builder")
|
||||
const env = require("../../environment")
|
||||
const instanceController = require("./instance")
|
||||
|
|
@ -11,89 +10,59 @@ const fs = require("fs-extra")
|
|||
const { join, resolve } = require("../../utilities/centralPath")
|
||||
const { promisify } = require("util")
|
||||
const chmodr = require("chmodr")
|
||||
const { generateAppID, getAppParams } = require("../../db/utils")
|
||||
const packageJson = require("../../../package.json")
|
||||
const { DocumentTypes, SEPARATOR } = require("../../db/utils")
|
||||
const {
|
||||
downloadExtractComponentLibraries,
|
||||
} = require("../../utilities/createAppPackage")
|
||||
const APP_PREFIX = DocumentTypes.APP + SEPARATOR
|
||||
|
||||
exports.fetch = async function(ctx) {
|
||||
const db = new CouchDB(ClientDb.name(getClientId(ctx)))
|
||||
const body = await db.allDocs(
|
||||
getAppParams(null, {
|
||||
include_docs: true,
|
||||
})
|
||||
)
|
||||
ctx.body = body.rows.map(row => row.doc)
|
||||
let allDbs = await CouchDB.allDbs()
|
||||
const appDbNames = allDbs.filter(dbName => dbName.startsWith(APP_PREFIX))
|
||||
const apps = []
|
||||
for (let dbName of appDbNames) {
|
||||
const db = new CouchDB(dbName)
|
||||
apps.push(db.get(dbName))
|
||||
}
|
||||
if (apps.length === 0) {
|
||||
ctx.body = []
|
||||
} else {
|
||||
ctx.body = await Promise.all(apps)
|
||||
}
|
||||
}
|
||||
|
||||
exports.fetchAppPackage = async function(ctx) {
|
||||
const clientId = await lookupClientId(ctx.params.applicationId)
|
||||
const db = new CouchDB(ClientDb.name(clientId))
|
||||
const application = await db.get(ctx.params.applicationId)
|
||||
const db = new CouchDB(ctx.params.instanceId)
|
||||
const application = await db.get(ctx.params.instanceId)
|
||||
ctx.body = await getPackageForBuilder(ctx.config, application)
|
||||
/*
|
||||
instance is hardcoded now - this can only change when we move
|
||||
pages and screens into the database
|
||||
*/
|
||||
const devInstance = application.instances.find(
|
||||
i => i.name === `dev-${clientId}`
|
||||
)
|
||||
setBuilderToken(
|
||||
ctx,
|
||||
ctx.params.applicationId,
|
||||
devInstance._id,
|
||||
application.version
|
||||
)
|
||||
setBuilderToken(ctx, ctx.params.instanceId, application.version)
|
||||
}
|
||||
|
||||
exports.create = async function(ctx) {
|
||||
const clientId =
|
||||
(ctx.request.body && ctx.request.body.clientId) || env.CLIENT_ID
|
||||
|
||||
if (!clientId) {
|
||||
ctx.throw(400, "ClientId not suplied")
|
||||
const createInstCtx = {
|
||||
request: {
|
||||
body: {
|
||||
template: ctx.request.body.template,
|
||||
},
|
||||
},
|
||||
}
|
||||
const appId = generateAppID()
|
||||
// insert an appId -> clientId lookup
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
|
||||
await masterDb.put({
|
||||
_id: appId,
|
||||
clientId,
|
||||
})
|
||||
|
||||
const db = new CouchDB(ClientDb.name(clientId))
|
||||
|
||||
await instanceController.create(createInstCtx)
|
||||
const instanceId = createInstCtx.body._id
|
||||
const newApplication = {
|
||||
_id: appId,
|
||||
_id: instanceId,
|
||||
type: "app",
|
||||
instances: [],
|
||||
userInstanceMap: {},
|
||||
version: packageJson.version,
|
||||
componentLibraries: ["@budibase/standard-components"],
|
||||
name: ctx.request.body.name,
|
||||
template: ctx.request.body.template,
|
||||
instances: [createInstCtx.body],
|
||||
}
|
||||
const instanceDb = new CouchDB(instanceId)
|
||||
await instanceDb.put(newApplication)
|
||||
|
||||
const { rev } = await db.put(newApplication)
|
||||
newApplication._rev = rev
|
||||
const createInstCtx = {
|
||||
user: {
|
||||
appId: newApplication._id,
|
||||
},
|
||||
request: {
|
||||
body: {
|
||||
name: `dev-${clientId}`,
|
||||
template: ctx.request.body.template,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
await instanceController.create(createInstCtx)
|
||||
newApplication.instances.push(createInstCtx.body)
|
||||
|
||||
if (process.env.NODE_ENV !== "jest") {
|
||||
if (env.NODE_ENV !== "jest") {
|
||||
const newAppFolder = await createEmptyAppPackage(ctx, newApplication)
|
||||
await downloadExtractComponentLibraries(newAppFolder)
|
||||
}
|
||||
|
|
@ -104,9 +73,8 @@ exports.create = async function(ctx) {
|
|||
}
|
||||
|
||||
exports.update = async function(ctx) {
|
||||
const clientId = await lookupClientId(ctx.params.applicationId)
|
||||
const db = new CouchDB(ClientDb.name(clientId))
|
||||
const application = await db.get(ctx.params.applicationId)
|
||||
const db = new CouchDB(ctx.params.instanceId)
|
||||
const application = await db.get(ctx.params.instanceId)
|
||||
|
||||
const data = ctx.request.body
|
||||
const newData = { ...application, ...data }
|
||||
|
|
@ -120,16 +88,12 @@ exports.update = async function(ctx) {
|
|||
}
|
||||
|
||||
exports.delete = async function(ctx) {
|
||||
const db = new CouchDB(ClientDb.name(getClientId(ctx)))
|
||||
const app = await db.get(ctx.params.applicationId)
|
||||
const result = await db.remove(app)
|
||||
for (let instance of app.instances) {
|
||||
const instanceDb = new CouchDB(instance._id)
|
||||
await instanceDb.destroy()
|
||||
}
|
||||
const db = new CouchDB(ctx.params.instanceId)
|
||||
const app = await db.get(ctx.params.instanceId)
|
||||
const result = await db.destroy()
|
||||
|
||||
// remove top level directory
|
||||
await fs.rmdir(join(budibaseAppsDir(), ctx.params.applicationId), {
|
||||
await fs.rmdir(join(budibaseAppsDir(), ctx.params.instanceId), {
|
||||
recursive: true,
|
||||
})
|
||||
|
||||
|
|
@ -222,24 +186,6 @@ const loadScreens = async (appFolder, page) => {
|
|||
return screens
|
||||
}
|
||||
|
||||
const lookupClientId = async appId => {
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
const { clientId } = await masterDb.get(appId)
|
||||
return clientId
|
||||
}
|
||||
|
||||
const getClientId = ctx => {
|
||||
const clientId =
|
||||
(ctx.request.body && ctx.request.body.clientId) ||
|
||||
(ctx.query && ctx.query.clientId) ||
|
||||
env.CLIENT_ID
|
||||
|
||||
if (!clientId) {
|
||||
ctx.throw(400, "ClientId not supplied")
|
||||
}
|
||||
return clientId
|
||||
}
|
||||
|
||||
const updateJsonFile = async (filePath, app) => {
|
||||
const json = await readFile(filePath, "utf8")
|
||||
const newJson = sqrl.Render(json, app)
|
||||
|
|
|
|||
|
|
@ -1,44 +1,26 @@
|
|||
const jwt = require("jsonwebtoken")
|
||||
const CouchDB = require("../../db")
|
||||
const ClientDb = require("../../db/clientDb")
|
||||
const bcrypt = require("../../utilities/bcrypt")
|
||||
const environment = require("../../environment")
|
||||
const env = require("../../environment")
|
||||
const { getAPIKey } = require("../../utilities/usageQuota")
|
||||
const { generateUserID } = require("../../db/utils")
|
||||
|
||||
exports.authenticate = async ctx => {
|
||||
if (!ctx.user.appId) ctx.throw(400, "No appId")
|
||||
const instanceId = ctx.user.instanceId
|
||||
if (!instanceId) ctx.throw(400, "No instanceId")
|
||||
|
||||
const { username, password } = ctx.request.body
|
||||
|
||||
if (!username) ctx.throw(400, "Username Required.")
|
||||
if (!password) ctx.throw(400, "Password Required")
|
||||
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
|
||||
const { clientId } = await masterDb.get(ctx.user.appId)
|
||||
|
||||
if (!clientId) {
|
||||
ctx.throw(400, "ClientId not supplied")
|
||||
}
|
||||
// find the instance that the user is associated with
|
||||
const db = new CouchDB(ClientDb.name(clientId))
|
||||
const app = await db.get(ctx.user.appId)
|
||||
const instanceId = app.userInstanceMap[username]
|
||||
|
||||
if (!instanceId)
|
||||
ctx.throw(
|
||||
500,
|
||||
"User is not associated with an instance of app",
|
||||
ctx.user.appId
|
||||
)
|
||||
if (!password) ctx.throw(400, "Password Required.")
|
||||
|
||||
// Check the user exists in the instance DB by username
|
||||
const instanceDb = new CouchDB(instanceId)
|
||||
const db = new CouchDB(instanceId)
|
||||
const app = await db.get(instanceId)
|
||||
|
||||
let dbUser
|
||||
try {
|
||||
dbUser = await instanceDb.get(generateUserID(username))
|
||||
dbUser = await db.get(generateUserID(username))
|
||||
} catch (_) {
|
||||
// do not want to throw a 404 - as this could be
|
||||
// used to determine valid usernames
|
||||
|
|
@ -55,7 +37,7 @@ exports.authenticate = async ctx => {
|
|||
instanceId,
|
||||
}
|
||||
// if in cloud add the user api key
|
||||
if (environment.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
const { apiKey } = await getAPIKey(ctx.user.appId)
|
||||
payload.apiKey = apiKey
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
const { create, destroy } = require("../../db/clientDb")
|
||||
const env = require("../../environment")
|
||||
|
||||
exports.getClientId = async function(ctx) {
|
||||
ctx.body = env.CLIENT_ID
|
||||
}
|
||||
|
||||
exports.create = async function(ctx) {
|
||||
const clientId = getClientId(ctx)
|
||||
await create(clientId)
|
||||
ctx.status = 200
|
||||
ctx.message = `Client Database ${clientId} successfully provisioned.`
|
||||
}
|
||||
|
||||
exports.destroy = async function(ctx) {
|
||||
const clientId = getClientId(ctx)
|
||||
await destroy(clientId)
|
||||
ctx.status = 200
|
||||
ctx.message = `Client Database ${clientId} successfully deleted.`
|
||||
}
|
||||
|
||||
const getClientId = ctx => {
|
||||
const clientId =
|
||||
(ctx.query && ctx.query.clientId) ||
|
||||
(ctx.body && ctx.body.clientId) ||
|
||||
env.CLIENT_ID
|
||||
if (!clientId) {
|
||||
ctx.throw(400, "ClientId not supplied")
|
||||
}
|
||||
return clientId
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
const CouchDB = require("../../db")
|
||||
const ClientDb = require("../../db/clientDb")
|
||||
const { resolve, join } = require("../../utilities/centralPath")
|
||||
const {
|
||||
budibaseTempDir,
|
||||
|
|
@ -7,49 +6,42 @@ const {
|
|||
} = require("../../utilities/budibaseDir")
|
||||
|
||||
exports.fetchAppComponentDefinitions = async function(ctx) {
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
const { clientId } = await masterDb.get(ctx.params.appId)
|
||||
const db = new CouchDB(ClientDb.name(clientId))
|
||||
const app = await db.get(ctx.params.appId)
|
||||
const db = new CouchDB(ctx.params.instanceId)
|
||||
const app = await db.get(ctx.params.instanceId)
|
||||
|
||||
const componentDefinitions = app.componentLibraries.reduce(
|
||||
(acc, componentLibrary) => {
|
||||
let appDirectory = resolve(
|
||||
budibaseAppsDir(),
|
||||
ctx.params.appId,
|
||||
"node_modules"
|
||||
)
|
||||
ctx.body = app.componentLibraries.reduce((acc, componentLibrary) => {
|
||||
let appDirectory = resolve(
|
||||
budibaseAppsDir(),
|
||||
ctx.params.instanceId,
|
||||
"node_modules"
|
||||
)
|
||||
|
||||
if (ctx.isDev) {
|
||||
appDirectory = budibaseTempDir()
|
||||
if (ctx.isDev) {
|
||||
appDirectory = budibaseTempDir()
|
||||
}
|
||||
|
||||
const componentJson = require(join(
|
||||
appDirectory,
|
||||
componentLibrary,
|
||||
ctx.isDev ? "" : "package",
|
||||
"components.json"
|
||||
))
|
||||
|
||||
const result = {}
|
||||
|
||||
// map over the components.json and add the library identifier as a key
|
||||
// button -> @budibase/standard-components/button
|
||||
for (let key of Object.keys(componentJson)) {
|
||||
const fullComponentName = `${componentLibrary}/${key}`
|
||||
result[fullComponentName] = {
|
||||
_component: fullComponentName,
|
||||
...componentJson[key],
|
||||
}
|
||||
}
|
||||
|
||||
const componentJson = require(join(
|
||||
appDirectory,
|
||||
componentLibrary,
|
||||
ctx.isDev ? "" : "package",
|
||||
"components.json"
|
||||
))
|
||||
|
||||
const result = {}
|
||||
|
||||
// map over the components.json and add the library identifier as a key
|
||||
// button -> @budibase/standard-components/button
|
||||
for (key in componentJson) {
|
||||
const fullComponentName = `${componentLibrary}/${key}`
|
||||
result[fullComponentName] = {
|
||||
_component: fullComponentName,
|
||||
...componentJson[key],
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
...acc,
|
||||
...result,
|
||||
}
|
||||
},
|
||||
{}
|
||||
)
|
||||
|
||||
ctx.body = componentDefinitions
|
||||
return {
|
||||
...acc,
|
||||
...result,
|
||||
}
|
||||
}, {})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ const uuid = require("uuid")
|
|||
const sanitize = require("sanitize-s3-objectkey")
|
||||
const { budibaseAppsDir } = require("../../../utilities/budibaseDir")
|
||||
const PouchDB = require("../../../db")
|
||||
const environment = require("../../../environment")
|
||||
const env = require("../../../environment")
|
||||
|
||||
async function invalidateCDN(cfDistribution, appId) {
|
||||
const cf = new AWS.CloudFront({})
|
||||
|
|
@ -44,12 +44,12 @@ exports.isInvalidationComplete = async function(
|
|||
|
||||
exports.updateDeploymentQuota = async function(quota) {
|
||||
const DEPLOYMENT_SUCCESS_URL =
|
||||
environment.DEPLOYMENT_CREDENTIALS_URL + "deploy/success"
|
||||
env.DEPLOYMENT_CREDENTIALS_URL + "deploy/success"
|
||||
|
||||
const response = await fetch(DEPLOYMENT_SUCCESS_URL, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
apiKey: process.env.BUDIBASE_API_KEY,
|
||||
apiKey: env.BUDIBASE_API_KEY,
|
||||
quota,
|
||||
}),
|
||||
headers: {
|
||||
|
|
@ -75,10 +75,10 @@ exports.updateDeploymentQuota = async function(quota) {
|
|||
* @param {quota} quota - current quota being changed with this application
|
||||
*/
|
||||
exports.verifyDeployment = async function({ instanceId, appId, quota }) {
|
||||
const response = await fetch(process.env.DEPLOYMENT_CREDENTIALS_URL, {
|
||||
const response = await fetch(env.DEPLOYMENT_CREDENTIALS_URL, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
apiKey: process.env.BUDIBASE_API_KEY,
|
||||
apiKey: env.BUDIBASE_API_KEY,
|
||||
instanceId,
|
||||
appId,
|
||||
quota,
|
||||
|
|
@ -87,7 +87,7 @@ exports.verifyDeployment = async function({ instanceId, appId, quota }) {
|
|||
|
||||
if (response.status !== 200) {
|
||||
throw new Error(
|
||||
`Error fetching temporary credentials for api key: ${process.env.BUDIBASE_API_KEY}`
|
||||
`Error fetching temporary credentials for api key: ${env.BUDIBASE_API_KEY}`
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ const {
|
|||
} = require("./aws")
|
||||
const { DocumentTypes, SEPARATOR, UNICODE_MAX } = require("../../../db/utils")
|
||||
const newid = require("../../../db/newid")
|
||||
const env = require("../../../environment")
|
||||
|
||||
// the max time we can wait for an invalidation to complete before considering it failed
|
||||
const MAX_PENDING_TIME_MS = 30 * 60000
|
||||
|
|
@ -80,25 +81,16 @@ function replicate(local, remote) {
|
|||
})
|
||||
}
|
||||
|
||||
async function replicateCouch({ instanceId, clientId, session }) {
|
||||
const databases = [`client_${clientId}`, "client_app_lookup", instanceId]
|
||||
|
||||
const replications = databases.map(localDbName => {
|
||||
const localDb = new PouchDB(localDbName)
|
||||
const remoteDb = new CouchDB(
|
||||
`${process.env.DEPLOYMENT_DB_URL}/${localDbName}`,
|
||||
{
|
||||
fetch: function(url, opts) {
|
||||
opts.headers.set("Cookie", `${session};`)
|
||||
return CouchDB.fetch(url, opts)
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
return replicate(localDb, remoteDb)
|
||||
async function replicateCouch({ instanceId, session }) {
|
||||
const localDb = new PouchDB(instanceId)
|
||||
const remoteDb = new CouchDB(`${env.DEPLOYMENT_DB_URL}/${instanceId}`, {
|
||||
fetch: function(url, opts) {
|
||||
opts.headers.set("Cookie", `${session};`)
|
||||
return CouchDB.fetch(url, opts)
|
||||
},
|
||||
})
|
||||
|
||||
await Promise.all(replications)
|
||||
return replicate(localDb, remoteDb)
|
||||
}
|
||||
|
||||
async function getCurrentInstanceQuota(instanceId) {
|
||||
|
|
@ -155,7 +147,7 @@ async function storeLocalDeploymentHistory(deployment) {
|
|||
}
|
||||
}
|
||||
|
||||
async function deployApp({ instanceId, appId, clientId, deploymentId }) {
|
||||
async function deployApp({ instanceId, appId, deploymentId }) {
|
||||
try {
|
||||
const instanceQuota = await getCurrentInstanceQuota(instanceId)
|
||||
const verification = await verifyDeployment({
|
||||
|
|
@ -167,7 +159,6 @@ async function deployApp({ instanceId, appId, clientId, deploymentId }) {
|
|||
console.log(`Uploading assets for appID ${appId} assets to s3..`)
|
||||
|
||||
const invalidationId = await uploadAppAssets({
|
||||
clientId,
|
||||
appId,
|
||||
instanceId,
|
||||
...verification,
|
||||
|
|
@ -177,7 +168,6 @@ async function deployApp({ instanceId, appId, clientId, deploymentId }) {
|
|||
console.log("Replicating local PouchDB to remote..")
|
||||
await replicateCouch({
|
||||
instanceId,
|
||||
clientId,
|
||||
session: verification.couchDbSession,
|
||||
})
|
||||
|
||||
|
|
@ -233,9 +223,6 @@ exports.deploymentProgress = async function(ctx) {
|
|||
}
|
||||
|
||||
exports.deployApp = async function(ctx) {
|
||||
const clientAppLookupDB = new PouchDB("client_app_lookup")
|
||||
const { clientId } = await clientAppLookupDB.get(ctx.user.appId)
|
||||
|
||||
const deployment = await storeLocalDeploymentHistory({
|
||||
instanceId: ctx.user.instanceId,
|
||||
appId: ctx.user.appId,
|
||||
|
|
@ -244,7 +231,6 @@ exports.deployApp = async function(ctx) {
|
|||
|
||||
await deployApp({
|
||||
...ctx.user,
|
||||
clientId,
|
||||
deploymentId: deployment._id,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +1,18 @@
|
|||
const fs = require("fs")
|
||||
const CouchDB = require("../../db")
|
||||
const client = require("../../db/clientDb")
|
||||
const newid = require("../../db/newid")
|
||||
const { createLinkView } = require("../../db/linkedRows")
|
||||
const { join } = require("../../utilities/centralPath")
|
||||
const { downloadTemplate } = require("../../utilities/templates")
|
||||
const { generateAppID } = require("../../db/utils")
|
||||
|
||||
exports.create = async function(ctx) {
|
||||
const instanceName = ctx.request.body.name
|
||||
const template = ctx.request.body.template
|
||||
const { appId } = ctx.user
|
||||
const appShortId = appId.substring(0, 7)
|
||||
const instanceId = `inst_${appShortId}_${newid()}`
|
||||
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
const { clientId } = await masterDb.get(appId)
|
||||
const instanceId = generateAppID()
|
||||
|
||||
const db = new CouchDB(instanceId)
|
||||
await db.put({
|
||||
_id: "_design/database",
|
||||
metadata: {
|
||||
clientId,
|
||||
applicationId: appId,
|
||||
},
|
||||
// view collation information, read before writing any complex views:
|
||||
// https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification
|
||||
views: {},
|
||||
|
|
@ -30,13 +20,6 @@ exports.create = async function(ctx) {
|
|||
// add view for linked rows
|
||||
await createLinkView(instanceId)
|
||||
|
||||
// Add the new instance under the app clientDB
|
||||
const clientDb = new CouchDB(client.name(clientId))
|
||||
const budibaseApp = await clientDb.get(appId)
|
||||
const instance = { _id: instanceId, name: instanceName }
|
||||
budibaseApp.instances.push(instance)
|
||||
await clientDb.put(budibaseApp)
|
||||
|
||||
// replicate the template data to the instance DB
|
||||
if (template) {
|
||||
const templatePath = await downloadTemplate(...template.key.split("/"))
|
||||
|
|
@ -51,23 +34,13 @@ exports.create = async function(ctx) {
|
|||
|
||||
ctx.status = 200
|
||||
ctx.message = `Instance Database ${instanceName} successfully provisioned.`
|
||||
ctx.body = instance
|
||||
ctx.body = { _id: instanceId, name: instanceName }
|
||||
}
|
||||
|
||||
exports.destroy = async function(ctx) {
|
||||
const db = new CouchDB(ctx.params.instanceId)
|
||||
const designDoc = await db.get("_design/database")
|
||||
await db.destroy()
|
||||
|
||||
// remove instance from client application document
|
||||
const { metadata } = designDoc
|
||||
const clientDb = new CouchDB(client.name(metadata.clientId))
|
||||
const budibaseApp = await clientDb.get(metadata.applicationId)
|
||||
budibaseApp.instances = budibaseApp.instances.filter(
|
||||
instance => instance !== ctx.params.instanceId
|
||||
)
|
||||
await clientDb.put(budibaseApp)
|
||||
|
||||
ctx.status = 200
|
||||
ctx.message = `Instance Database ${ctx.params.instanceId} successfully destroyed.`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ const CouchDB = require("../../db")
|
|||
const setBuilderToken = require("../../utilities/builder/setBuilderToken")
|
||||
const fileProcessor = require("../../utilities/fileProcessor")
|
||||
const { AuthTypes } = require("../../constants")
|
||||
const env = require("../../environment")
|
||||
|
||||
// this was the version before we started versioning the component library
|
||||
const COMP_LIB_BASE_APP_VERSION = "0.2.5"
|
||||
|
|
@ -38,7 +39,7 @@ exports.uploadFile = async function(ctx) {
|
|||
"attachments"
|
||||
)
|
||||
|
||||
if (process.env.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
// remote upload
|
||||
const s3 = new AWS.S3({
|
||||
params: {
|
||||
|
|
@ -150,7 +151,7 @@ exports.serveApp = async function(ctx) {
|
|||
|
||||
const appId = ctx.user.appId
|
||||
|
||||
if (process.env.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
const S3_URL = `https://${appId}.app.budi.live/assets/${appId}/${mainOrAuth}/${ctx.file ||
|
||||
"index.production.html"}`
|
||||
|
||||
|
|
@ -168,7 +169,7 @@ exports.serveAttachment = async function(ctx) {
|
|||
const attachmentsPath = resolve(budibaseAppsDir(), appId, "attachments")
|
||||
|
||||
// Serve from CloudFront
|
||||
if (process.env.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
const S3_URL = `https://cdn.app.budi.live/assets/${appId}/attachments/${ctx.file}`
|
||||
const response = await fetch(S3_URL)
|
||||
const body = await response.text()
|
||||
|
|
@ -187,7 +188,7 @@ exports.serveAppAsset = async function(ctx) {
|
|||
|
||||
const appPath = resolve(
|
||||
budibaseAppsDir(),
|
||||
ctx.user.appId,
|
||||
ctx.user.instanceId,
|
||||
"public",
|
||||
mainOrAuth
|
||||
)
|
||||
|
|
@ -214,7 +215,7 @@ exports.serveComponentLibrary = async function(ctx) {
|
|||
)
|
||||
}
|
||||
|
||||
if (process.env.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
let componentLib = "componentlibrary"
|
||||
if (ctx.user.version) {
|
||||
componentLib += `-${ctx.user.version}`
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const CouchDB = require("../../db")
|
||||
const clientDb = require("../../db/clientDb")
|
||||
const bcrypt = require("../../utilities/bcrypt")
|
||||
const { generateUserID, getUserParams } = require("../../db/utils")
|
||||
const {
|
||||
|
|
@ -18,15 +17,14 @@ exports.fetch = async function(ctx) {
|
|||
}
|
||||
|
||||
exports.create = async function(ctx) {
|
||||
const database = new CouchDB(ctx.user.instanceId)
|
||||
const appId = (await database.get("_design/database")).metadata.applicationId
|
||||
const db = new CouchDB(ctx.user.instanceId)
|
||||
const { username, password, name, accessLevelId } = ctx.request.body
|
||||
|
||||
if (!username || !password) {
|
||||
ctx.throw(400, "Username and Password Required.")
|
||||
}
|
||||
|
||||
const accessLevel = await checkAccessLevel(database, accessLevelId)
|
||||
const accessLevel = await checkAccessLevel(db, accessLevelId)
|
||||
|
||||
if (!accessLevel) ctx.throw(400, "Invalid Access Level")
|
||||
|
||||
|
|
@ -39,15 +37,9 @@ exports.create = async function(ctx) {
|
|||
accessLevelId,
|
||||
}
|
||||
|
||||
const response = await database.post(user)
|
||||
|
||||
const masterDb = new CouchDB("client_app_lookup")
|
||||
const { clientId } = await masterDb.get(appId)
|
||||
|
||||
// the clientDB needs to store a map of users against the app
|
||||
const db = new CouchDB(clientDb.name(clientId))
|
||||
const app = await db.get(appId)
|
||||
const response = await db.post(user)
|
||||
|
||||
const app = await db.get(ctx.user.instanceId)
|
||||
app.userInstanceMap = {
|
||||
...app.userInstanceMap,
|
||||
[username]: ctx.user.instanceId,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ const {
|
|||
userRoutes,
|
||||
deployRoutes,
|
||||
instanceRoutes,
|
||||
clientRoutes,
|
||||
applicationRoutes,
|
||||
rowRoutes,
|
||||
tableRoutes,
|
||||
|
|
@ -108,9 +107,6 @@ router.use(applicationRoutes.allowedMethods())
|
|||
router.use(componentRoutes.routes())
|
||||
router.use(componentRoutes.allowedMethods())
|
||||
|
||||
router.use(clientRoutes.routes())
|
||||
router.use(clientRoutes.allowedMethods())
|
||||
|
||||
router.use(accesslevelRoutes.routes())
|
||||
router.use(accesslevelRoutes.allowedMethods())
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ const router = Router()
|
|||
router
|
||||
.get("/api/applications", authorized(BUILDER), controller.fetch)
|
||||
.get(
|
||||
"/api/:applicationId/appPackage",
|
||||
"/api/:instanceId/appPackage",
|
||||
authorized(BUILDER),
|
||||
controller.fetchAppPackage
|
||||
)
|
||||
.put("/api/:applicationId", authorized(BUILDER), controller.update)
|
||||
.put("/api/:instanceId", authorized(BUILDER), controller.update)
|
||||
.post("/api/applications", authorized(BUILDER), controller.create)
|
||||
.delete("/api/:applicationId", authorized(BUILDER), controller.delete)
|
||||
.delete("/api/:instanceId", authorized(BUILDER), controller.delete)
|
||||
|
||||
module.exports = router
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
const Router = require("@koa/router")
|
||||
const controller = require("../controllers/client")
|
||||
const authorized = require("../../middleware/authorized")
|
||||
const { BUILDER } = require("../../utilities/accessLevels")
|
||||
|
||||
const router = Router()
|
||||
|
||||
router.get("/api/client/id", authorized(BUILDER), controller.getClientId)
|
||||
|
||||
module.exports = router
|
||||
|
|
@ -6,7 +6,7 @@ const { BUILDER } = require("../../utilities/accessLevels")
|
|||
const router = Router()
|
||||
|
||||
router.get(
|
||||
"/:appId/components/definitions",
|
||||
"/:instanceId/components/definitions",
|
||||
authorized(BUILDER),
|
||||
controller.fetchAppComponentDefinitions
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ const authRoutes = require("./auth")
|
|||
const pageRoutes = require("./pages")
|
||||
const userRoutes = require("./user")
|
||||
const instanceRoutes = require("./instance")
|
||||
const clientRoutes = require("./client")
|
||||
const applicationRoutes = require("./application")
|
||||
const tableRoutes = require("./table")
|
||||
const rowRoutes = require("./row")
|
||||
|
|
@ -23,7 +22,6 @@ module.exports = {
|
|||
pageRoutes,
|
||||
userRoutes,
|
||||
instanceRoutes,
|
||||
clientRoutes,
|
||||
applicationRoutes,
|
||||
rowRoutes,
|
||||
tableRoutes,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
const {
|
||||
createInstance,
|
||||
createClientDatabase,
|
||||
createApplication,
|
||||
createTable,
|
||||
createView,
|
||||
|
|
@ -17,7 +15,6 @@ const {
|
|||
} = require("../../../utilities/accessLevels")
|
||||
|
||||
describe("/accesslevels", () => {
|
||||
let appId
|
||||
let server
|
||||
let request
|
||||
let instanceId
|
||||
|
|
@ -26,18 +23,18 @@ describe("/accesslevels", () => {
|
|||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request);
|
||||
appId = (await createApplication(request))._id
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
server.close();
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
process.exit(0)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
instanceId = (await createInstance(request, appId))._id
|
||||
table = await createTable(request, appId, instanceId)
|
||||
view = await createView(request, appId, instanceId, table._id)
|
||||
let app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
table = await createTable(request, instanceId)
|
||||
view = await createView(request, instanceId, table._id)
|
||||
})
|
||||
|
||||
describe("create", () => {
|
||||
|
|
@ -46,7 +43,7 @@ describe("/accesslevels", () => {
|
|||
const res = await request
|
||||
.post(`/api/accesslevels`)
|
||||
.send({ name: "user" })
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -64,7 +61,7 @@ describe("/accesslevels", () => {
|
|||
const createRes = await request
|
||||
.post(`/api/accesslevels`)
|
||||
.send({ name: "user", permissions: [ { itemId: table._id, name: READ_TABLE }] })
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -72,7 +69,7 @@ describe("/accesslevels", () => {
|
|||
|
||||
const res = await request
|
||||
.get(`/api/accesslevels`)
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -97,7 +94,7 @@ describe("/accesslevels", () => {
|
|||
const createRes = await request
|
||||
.post(`/api/accesslevels`)
|
||||
.send({ name: "user", permissions: [ { itemId: table._id, name: READ_TABLE } ] })
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -105,12 +102,12 @@ describe("/accesslevels", () => {
|
|||
|
||||
await request
|
||||
.delete(`/api/accesslevels/${customLevel._id}/${customLevel._rev}`)
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect(200)
|
||||
|
||||
await request
|
||||
.get(`/api/accesslevels/${customLevel._id}`)
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect(404)
|
||||
})
|
||||
})
|
||||
|
|
@ -120,7 +117,7 @@ describe("/accesslevels", () => {
|
|||
const createRes = await request
|
||||
.post(`/api/accesslevels`)
|
||||
.send({ name: "user", permissions: [ { itemId: table._id, name: READ_TABLE }] })
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -132,13 +129,13 @@ describe("/accesslevels", () => {
|
|||
_rev: customLevel._rev,
|
||||
addedPermissions: [ { itemId: table._id, name: WRITE_TABLE } ]
|
||||
})
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
const finalRes = await request
|
||||
.get(`/api/accesslevels/${customLevel._id}`)
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect(200)
|
||||
|
||||
expect(finalRes.body.permissions.length).toBe(2)
|
||||
|
|
@ -156,7 +153,7 @@ describe("/accesslevels", () => {
|
|||
{ itemId: table._id, name: WRITE_TABLE },
|
||||
]
|
||||
})
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -168,13 +165,13 @@ describe("/accesslevels", () => {
|
|||
_rev: customLevel._rev,
|
||||
removedPermissions: [ { itemId: table._id, name: WRITE_TABLE }]
|
||||
})
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
const finalRes = await request
|
||||
.get(`/api/accesslevels/${customLevel._id}`)
|
||||
.set(defaultHeaders(appId, instanceId))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect(200)
|
||||
|
||||
expect(finalRes.body.permissions.length).toBe(1)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
const {
|
||||
createClientDatabase,
|
||||
const {
|
||||
createApplication,
|
||||
createInstance,
|
||||
destroyClientDatabase,
|
||||
builderEndpointShouldBlockNormalUsers,
|
||||
supertest,
|
||||
TEST_CLIENT_ID,
|
||||
clearApplications,
|
||||
defaultHeaders,
|
||||
} = require("./couchTestUtils")
|
||||
|
||||
|
|
@ -18,15 +15,12 @@ describe("/applications", () => {
|
|||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
await createClientDatabase()
|
||||
await clearApplications(request)
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
await destroyClientDatabase()
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
server.close()
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
process.exit(0)
|
||||
})
|
||||
|
||||
describe("create", () => {
|
||||
|
|
@ -42,14 +36,13 @@ describe("/applications", () => {
|
|||
})
|
||||
|
||||
it("should apply authorization to endpoint", async () => {
|
||||
const otherApplication = await createApplication(request)
|
||||
const instance = await createInstance(request, otherApplication._id)
|
||||
const otherApplication = await createApplication(request)
|
||||
const instanceId = otherApplication.instances[0]._id
|
||||
await builderEndpointShouldBlockNormalUsers({
|
||||
request,
|
||||
method: "POST",
|
||||
url: `/api/applications`,
|
||||
instanceId: instance._id,
|
||||
appId: otherApplication._id,
|
||||
instanceId: instanceId,
|
||||
body: { name: "My App" }
|
||||
})
|
||||
})
|
||||
|
|
@ -58,7 +51,6 @@ describe("/applications", () => {
|
|||
|
||||
describe("fetch", () => {
|
||||
it("lists all applications", async () => {
|
||||
|
||||
await createApplication(request, "app1")
|
||||
await createApplication(request, "app2")
|
||||
|
||||
|
|
@ -71,46 +63,14 @@ describe("/applications", () => {
|
|||
expect(res.body.length).toBe(2)
|
||||
})
|
||||
|
||||
it("lists only applications in requested client databse", async () => {
|
||||
await createApplication(request, "app1")
|
||||
await createClientDatabase("new_client")
|
||||
|
||||
const blah = await request
|
||||
.post("/api/applications")
|
||||
.send({ name: "app2", clientId: "new_client"})
|
||||
.set(defaultHeaders())
|
||||
.expect('Content-Type', /json/)
|
||||
//.expect(200)
|
||||
|
||||
const client1Res = await request
|
||||
.get(`/api/applications?clientId=${TEST_CLIENT_ID}`)
|
||||
.set(defaultHeaders())
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
expect(client1Res.body.length).toBe(1)
|
||||
expect(client1Res.body[0].name).toBe("app1")
|
||||
|
||||
const client2Res = await request
|
||||
.get(`/api/applications?clientId=new_client`)
|
||||
.set(defaultHeaders())
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
expect(client2Res.body.length).toBe(1)
|
||||
expect(client2Res.body[0].name).toBe("app2")
|
||||
|
||||
})
|
||||
|
||||
it("should apply authorization to endpoint", async () => {
|
||||
const otherApplication = await createApplication(request)
|
||||
const instance = await createInstance(request, otherApplication._id)
|
||||
const otherApplication = await createApplication(request)
|
||||
const instanceId = otherApplication.instances[0]._id
|
||||
await builderEndpointShouldBlockNormalUsers({
|
||||
request,
|
||||
method: "GET",
|
||||
url: `/api/applications`,
|
||||
instanceId: instance._id,
|
||||
appId: otherApplication._id,
|
||||
instanceId: instanceId,
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
const {
|
||||
createClientDatabase,
|
||||
const {
|
||||
createApplication,
|
||||
createInstance,
|
||||
createTable,
|
||||
getAllFromTable,
|
||||
defaultHeaders,
|
||||
|
|
@ -41,27 +39,27 @@ describe("/automations", () => {
|
|||
let request
|
||||
let server
|
||||
let app
|
||||
let instance
|
||||
let instanceId
|
||||
let automation
|
||||
let automationId
|
||||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request)
|
||||
app = await createApplication(request)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
if (automation) await destroyDocument(automation.id)
|
||||
instance = await createInstance(request, app._id)
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
server.close()
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
process.exit(0)
|
||||
})
|
||||
|
||||
const createAutomation = async () => {
|
||||
automation = await insertDocument(instance._id, {
|
||||
automation = await insertDocument(instanceId, {
|
||||
type: "automation",
|
||||
...TEST_AUTOMATION
|
||||
})
|
||||
|
|
@ -72,7 +70,7 @@ describe("/automations", () => {
|
|||
return await request
|
||||
.post(`/api/automations/${automationId}/trigger`)
|
||||
.send({ name: "Test", description: "TEST" })
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
}
|
||||
|
|
@ -81,7 +79,7 @@ describe("/automations", () => {
|
|||
it("returns a list of definitions for actions", async () => {
|
||||
const res = await request
|
||||
.get(`/api/automations/action/list`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -92,7 +90,7 @@ describe("/automations", () => {
|
|||
it("returns a list of definitions for triggers", async () => {
|
||||
const res = await request
|
||||
.get(`/api/automations/trigger/list`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -103,7 +101,7 @@ describe("/automations", () => {
|
|||
it("returns a list of definitions for actions", async () => {
|
||||
const res = await request
|
||||
.get(`/api/automations/logic/list`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -114,7 +112,7 @@ describe("/automations", () => {
|
|||
it("returns all of the definitions in one", async () => {
|
||||
const res = await request
|
||||
.get(`/api/automations/definitions/list`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -142,7 +140,7 @@ describe("/automations", () => {
|
|||
it("returns a success message when the automation is successfully created", async () => {
|
||||
const res = await request
|
||||
.post(`/api/automations`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.send(TEST_AUTOMATION)
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
|
@ -158,8 +156,7 @@ describe("/automations", () => {
|
|||
request,
|
||||
method: "POST",
|
||||
url: `/api/automations`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
body: TEST_AUTOMATION
|
||||
})
|
||||
})
|
||||
|
|
@ -167,7 +164,7 @@ describe("/automations", () => {
|
|||
|
||||
describe("trigger", () => {
|
||||
it("trigger the automation successfully", async () => {
|
||||
let table = await createTable(request, app._id, instance._id)
|
||||
let table = await createTable(request, instanceId)
|
||||
TEST_AUTOMATION.definition.trigger.inputs.tableId = table._id
|
||||
TEST_AUTOMATION.definition.steps[0].inputs.row.tableId = table._id
|
||||
await createAutomation()
|
||||
|
|
@ -180,7 +177,7 @@ describe("/automations", () => {
|
|||
expect(res.body.message).toEqual(`Automation ${automation._id} has been triggered.`)
|
||||
expect(res.body.automation.name).toEqual(TEST_AUTOMATION.name)
|
||||
await delay(500)
|
||||
let elements = await getAllFromTable(request, app._id, instance._id, table._id)
|
||||
let elements = await getAllFromTable(request, instanceId, table._id)
|
||||
// don't test it unless there are values to test
|
||||
if (elements.length === 1) {
|
||||
expect(elements.length).toEqual(1)
|
||||
|
|
@ -203,7 +200,7 @@ describe("/automations", () => {
|
|||
|
||||
const res = await request
|
||||
.put(`/api/automations`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.send(automation)
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
|
@ -218,7 +215,7 @@ describe("/automations", () => {
|
|||
await createAutomation()
|
||||
const res = await request
|
||||
.get(`/api/automations`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -230,8 +227,7 @@ describe("/automations", () => {
|
|||
request,
|
||||
method: "GET",
|
||||
url: `/api/automations`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
@ -241,7 +237,7 @@ describe("/automations", () => {
|
|||
await createAutomation()
|
||||
const res = await request
|
||||
.delete(`/api/automations/${automation.id}/${automation.rev}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -254,8 +250,7 @@ describe("/automations", () => {
|
|||
request,
|
||||
method: "DELETE",
|
||||
url: `/api/automations/${automation.id}/${automation._rev}`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const CouchDB = require("../../../db")
|
||||
const { create, destroy } = require("../../../db/clientDb")
|
||||
const supertest = require("supertest")
|
||||
const {
|
||||
POWERUSER_LEVEL_ID,
|
||||
|
|
@ -16,19 +15,18 @@ const TEST_CLIENT_ID = "test-client-id"
|
|||
exports.TEST_CLIENT_ID = TEST_CLIENT_ID
|
||||
exports.supertest = async () => {
|
||||
let request
|
||||
let server
|
||||
process.env.PORT = 4002
|
||||
server = require("../../../app")
|
||||
let app
|
||||
env.PORT = 4002
|
||||
app = require("../../../app")
|
||||
|
||||
request = supertest(server)
|
||||
return { request, server }
|
||||
request = supertest(app)
|
||||
return { request, app }
|
||||
}
|
||||
|
||||
exports.defaultHeaders = (appId, instanceId) => {
|
||||
exports.defaultHeaders = instanceId => {
|
||||
const builderUser = {
|
||||
userId: "BUILDER",
|
||||
accessLevelId: BUILDER_LEVEL_ID,
|
||||
appId,
|
||||
instanceId,
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +38,7 @@ exports.defaultHeaders = (appId, instanceId) => {
|
|||
}
|
||||
}
|
||||
|
||||
exports.createTable = async (request, appId, instanceId, table) => {
|
||||
exports.createTable = async (request, instanceId, table) => {
|
||||
if (table != null && table._id) {
|
||||
delete table._id
|
||||
}
|
||||
|
|
@ -66,19 +64,19 @@ exports.createTable = async (request, appId, instanceId, table) => {
|
|||
|
||||
const res = await request
|
||||
.post(`/api/tables`)
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
.send(table)
|
||||
return res.body
|
||||
}
|
||||
|
||||
exports.getAllFromTable = async (request, appId, instanceId, tableId) => {
|
||||
exports.getAllFromTable = async (request, instanceId, tableId) => {
|
||||
const res = await request
|
||||
.get(`/api/${tableId}/rows`)
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
return res.body
|
||||
}
|
||||
|
||||
exports.createView = async (request, appId, instanceId, tableId, view) => {
|
||||
exports.createView = async (request, instanceId, tableId, view) => {
|
||||
view = view || {
|
||||
map: "function(doc) { emit(doc[doc.key], doc._id); } ",
|
||||
tableId: tableId,
|
||||
|
|
@ -86,13 +84,11 @@ exports.createView = async (request, appId, instanceId, tableId, view) => {
|
|||
|
||||
const res = await request
|
||||
.post(`/api/views`)
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
.send(view)
|
||||
return res.body
|
||||
}
|
||||
|
||||
exports.createClientDatabase = async id => await create(id || TEST_CLIENT_ID)
|
||||
|
||||
exports.createApplication = async (request, name = "test_application") => {
|
||||
const res = await request
|
||||
.post("/api/applications")
|
||||
|
|
@ -103,28 +99,35 @@ exports.createApplication = async (request, name = "test_application") => {
|
|||
return res.body
|
||||
}
|
||||
|
||||
exports.destroyClientDatabase = async () => await destroy(TEST_CLIENT_ID)
|
||||
exports.clearApplications = async request => {
|
||||
const res = await request
|
||||
.get("/api/applications")
|
||||
.set(exports.defaultHeaders())
|
||||
for (let app of res.body) {
|
||||
const appId = app._id
|
||||
await request.delete(`/api/${appId}`).set(exports.defaultHeaders(appId))
|
||||
}
|
||||
}
|
||||
|
||||
exports.createInstance = async (request, appId) => {
|
||||
exports.createInstance = async request => {
|
||||
const res = await request
|
||||
.post(`/api/instances`)
|
||||
.send({
|
||||
name: "test-instance2",
|
||||
})
|
||||
.set(exports.defaultHeaders(appId))
|
||||
.set(exports.defaultHeaders())
|
||||
return res.body
|
||||
}
|
||||
|
||||
exports.createUser = async (
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
username = "babs",
|
||||
password = "babs_password"
|
||||
) => {
|
||||
const res = await request
|
||||
.post(`/api/users`)
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
.send({
|
||||
name: "Bill",
|
||||
username,
|
||||
|
|
@ -136,7 +139,6 @@ exports.createUser = async (
|
|||
|
||||
const createUserWithOnePermission = async (
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permName,
|
||||
itemId
|
||||
|
|
@ -148,19 +150,17 @@ const createUserWithOnePermission = async (
|
|||
|
||||
return await createUserWithPermissions(
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissions,
|
||||
"onePermOnlyUser"
|
||||
)
|
||||
}
|
||||
|
||||
const createUserWithAdminPermissions = async (request, appId, instanceId) => {
|
||||
const createUserWithAdminPermissions = async (request, instanceId) => {
|
||||
let permissions = await generateAdminPermissions(instanceId)
|
||||
|
||||
return await createUserWithPermissions(
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissions,
|
||||
"adminUser"
|
||||
|
|
@ -169,7 +169,6 @@ const createUserWithAdminPermissions = async (request, appId, instanceId) => {
|
|||
|
||||
const createUserWithAllPermissionExceptOne = async (
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permName,
|
||||
itemId
|
||||
|
|
@ -181,7 +180,6 @@ const createUserWithAllPermissionExceptOne = async (
|
|||
|
||||
return await createUserWithPermissions(
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissions,
|
||||
"allPermsExceptOneUser"
|
||||
|
|
@ -190,7 +188,6 @@ const createUserWithAllPermissionExceptOne = async (
|
|||
|
||||
const createUserWithPermissions = async (
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissions,
|
||||
username
|
||||
|
|
@ -198,12 +195,12 @@ const createUserWithPermissions = async (
|
|||
const accessRes = await request
|
||||
.post(`/api/accesslevels`)
|
||||
.send({ name: "TestLevel", permissions })
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
|
||||
const password = `password_${username}`
|
||||
await request
|
||||
.post(`/api/users`)
|
||||
.set(exports.defaultHeaders(appId, instanceId))
|
||||
.set(exports.defaultHeaders(instanceId))
|
||||
.send({
|
||||
name: username,
|
||||
username,
|
||||
|
|
@ -214,7 +211,7 @@ const createUserWithPermissions = async (
|
|||
const anonUser = {
|
||||
userId: "ANON",
|
||||
accessLevelId: ANON_LEVEL_ID,
|
||||
appId: appId,
|
||||
instanceId: instanceId,
|
||||
version: packageJson.version,
|
||||
}
|
||||
|
||||
|
|
@ -237,14 +234,12 @@ exports.testPermissionsForEndpoint = async ({
|
|||
method,
|
||||
url,
|
||||
body,
|
||||
appId,
|
||||
instanceId,
|
||||
permissionName,
|
||||
itemId,
|
||||
}) => {
|
||||
const headers = await createUserWithOnePermission(
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissionName,
|
||||
itemId
|
||||
|
|
@ -256,7 +251,6 @@ exports.testPermissionsForEndpoint = async ({
|
|||
|
||||
const noPermsHeaders = await createUserWithAllPermissionExceptOne(
|
||||
request,
|
||||
appId,
|
||||
instanceId,
|
||||
permissionName,
|
||||
itemId
|
||||
|
|
@ -272,14 +266,9 @@ exports.builderEndpointShouldBlockNormalUsers = async ({
|
|||
method,
|
||||
url,
|
||||
body,
|
||||
appId,
|
||||
instanceId,
|
||||
}) => {
|
||||
const headers = await createUserWithAdminPermissions(
|
||||
request,
|
||||
appId,
|
||||
instanceId
|
||||
)
|
||||
const headers = await createUserWithAdminPermissions(request, instanceId)
|
||||
|
||||
await createRequest(request, method, url, body)
|
||||
.set(headers)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
const {
|
||||
createInstance,
|
||||
createClientDatabase,
|
||||
createInstance,
|
||||
createApplication,
|
||||
supertest,
|
||||
defaultHeaders
|
||||
|
|
@ -12,12 +11,11 @@ describe("/instances", () => {
|
|||
let request
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request);
|
||||
TEST_APP_ID = (await createApplication(request))._id
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
server.close();
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
})
|
||||
|
||||
describe("create", () => {
|
||||
|
|
@ -26,7 +24,7 @@ describe("/instances", () => {
|
|||
const res = await request
|
||||
.post(`/api/instances`)
|
||||
.send({ name: "test-instance" })
|
||||
.set(defaultHeaders(TEST_APP_ID))
|
||||
.set(defaultHeaders())
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -42,7 +40,7 @@ describe("/instances", () => {
|
|||
const instance = await createInstance(request, TEST_APP_ID);
|
||||
const res = await request
|
||||
.delete(`/api/instances/${instance._id}`)
|
||||
.set(defaultHeaders(TEST_APP_ID))
|
||||
.set(defaultHeaders())
|
||||
.expect(200)
|
||||
|
||||
expect(res.res.statusMessage).toEqual(`Instance Database ${instance._id} successfully destroyed.`);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
const {
|
||||
createApplication,
|
||||
createClientDatabase,
|
||||
createInstance,
|
||||
createTable,
|
||||
supertest,
|
||||
defaultHeaders,
|
||||
|
|
@ -10,24 +8,24 @@ const {
|
|||
describe("/rows", () => {
|
||||
let request
|
||||
let server
|
||||
let instance
|
||||
let instanceId
|
||||
let table
|
||||
let row
|
||||
let app
|
||||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request)
|
||||
app = await createApplication(request)
|
||||
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
server.close();
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id)
|
||||
table = await createTable(request, app._id, instance._id)
|
||||
app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
table = await createTable(request, instanceId)
|
||||
row = {
|
||||
name: "Test Contact",
|
||||
description: "original description",
|
||||
|
|
@ -40,14 +38,14 @@ describe("/rows", () => {
|
|||
await request
|
||||
.post(`/api/${r ? r.tableId : row.tableId}/rows`)
|
||||
.send(r || row)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
const loadRow = async id =>
|
||||
await request
|
||||
.get(`/api/${table._id}/rows/${id}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -74,7 +72,7 @@ describe("/rows", () => {
|
|||
tableId: table._id,
|
||||
name: "Updated Name",
|
||||
})
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -88,7 +86,7 @@ describe("/rows", () => {
|
|||
|
||||
const res = await request
|
||||
.get(`/api/${table._id}/rows/${existing._id}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -111,7 +109,7 @@ describe("/rows", () => {
|
|||
|
||||
const res = await request
|
||||
.get(`/api/${table._id}/rows`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -133,7 +131,7 @@ describe("/rows", () => {
|
|||
|
||||
const res = await request
|
||||
.post(`/api/rows/search`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.send({
|
||||
keys: rowIds
|
||||
})
|
||||
|
|
@ -148,7 +146,7 @@ describe("/rows", () => {
|
|||
await createRow()
|
||||
await request
|
||||
.get(`/api/${table._id}/rows/not-a-valid-id`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(404)
|
||||
})
|
||||
|
|
@ -160,7 +158,7 @@ describe("/rows", () => {
|
|||
const number = {type:"number", constraints: { type: "number", presence: false }}
|
||||
const datetime = {type:"datetime", constraints: { type: "string", presence: false, datetime: {earliest:"", latest: ""} }}
|
||||
|
||||
table = await createTable(request, app._id, instance._id, {
|
||||
table = await createTable(request, instanceId, {
|
||||
name: "TestTable2",
|
||||
type: "table",
|
||||
key: "name",
|
||||
|
|
@ -256,7 +254,7 @@ describe("/rows", () => {
|
|||
tableId: table._id,
|
||||
name: "Updated Name",
|
||||
})
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -277,7 +275,7 @@ describe("/rows", () => {
|
|||
const result = await request
|
||||
.post(`/api/${table._id}/rows/validate`)
|
||||
.send({ name: "ivan" })
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -289,7 +287,7 @@ describe("/rows", () => {
|
|||
const result = await request
|
||||
.post(`/api/${table._id}/rows/validate`)
|
||||
.send({ name: 1 })
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
const {
|
||||
createInstance,
|
||||
createTable,
|
||||
supertest,
|
||||
createClientDatabase,
|
||||
createTable,
|
||||
supertest,
|
||||
createApplication,
|
||||
defaultHeaders,
|
||||
builderEndpointShouldBlockNormalUsers,
|
||||
|
|
@ -13,23 +11,22 @@ describe("/tables", () => {
|
|||
let request
|
||||
let server
|
||||
let app
|
||||
let instance
|
||||
let instanceId
|
||||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request)
|
||||
app = await createApplication(request)
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
server.close();
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
})
|
||||
|
||||
describe("create", () => {
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id);
|
||||
});
|
||||
beforeEach(async () => {
|
||||
app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
});
|
||||
|
||||
describe("create", () => {
|
||||
it("returns a success message when the table is successfully created", done => {
|
||||
request
|
||||
.post(`/api/tables`)
|
||||
|
|
@ -40,7 +37,7 @@ describe("/tables", () => {
|
|||
name: { type: "string" }
|
||||
}
|
||||
})
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
.end(async (err, res) => {
|
||||
|
|
@ -51,14 +48,14 @@ describe("/tables", () => {
|
|||
})
|
||||
|
||||
it("renames all the row fields for a table when a schema key is renamed", async () => {
|
||||
const testTable = await createTable(request, app._id, instance._id);
|
||||
const testTable = await createTable(request, instanceId);
|
||||
|
||||
const testRow = await request
|
||||
.post(`/api/${testTable._id}/rows`)
|
||||
.send({
|
||||
name: "test"
|
||||
})
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -77,7 +74,7 @@ describe("/tables", () => {
|
|||
updatedName: { type: "string" }
|
||||
}
|
||||
})
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -86,7 +83,7 @@ describe("/tables", () => {
|
|||
|
||||
const res = await request
|
||||
.get(`/api/${testTable._id}/rows/${testRow.body._id}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -99,8 +96,7 @@ describe("/tables", () => {
|
|||
request,
|
||||
method: "POST",
|
||||
url: `/api/tables`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
body: {
|
||||
name: "TestTable",
|
||||
key: "name",
|
||||
|
|
@ -116,8 +112,7 @@ describe("/tables", () => {
|
|||
let testTable
|
||||
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id)
|
||||
testTable = await createTable(request, app._id, instance._id, testTable)
|
||||
testTable = await createTable(request, instanceId, testTable)
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
|
@ -127,7 +122,7 @@ describe("/tables", () => {
|
|||
it("returns all the tables for that instance in the response body", done => {
|
||||
request
|
||||
.get(`/api/tables`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
.end(async (_, res) => {
|
||||
|
|
@ -143,8 +138,7 @@ describe("/tables", () => {
|
|||
request,
|
||||
method: "GET",
|
||||
url: `/api/tables`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
})
|
||||
})
|
||||
});
|
||||
|
|
@ -153,8 +147,7 @@ describe("/tables", () => {
|
|||
let testTable;
|
||||
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id)
|
||||
testTable = await createTable(request, app._id, instance._id, testTable)
|
||||
testTable = await createTable(request, instanceId, testTable)
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
|
@ -164,7 +157,7 @@ describe("/tables", () => {
|
|||
it("returns a success response when a table is deleted.", async done => {
|
||||
request
|
||||
.delete(`/api/tables/${testTable._id}/${testTable._rev}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
.end(async (_, res) => {
|
||||
|
|
@ -174,7 +167,7 @@ describe("/tables", () => {
|
|||
})
|
||||
|
||||
it("deletes linked references to the table after deletion", async done => {
|
||||
const linkedTable = await createTable(request, app._id, instance._id, {
|
||||
const linkedTable = await createTable(request, instanceId, {
|
||||
name: "LinkedTable",
|
||||
type: "table",
|
||||
key: "name",
|
||||
|
|
@ -197,12 +190,12 @@ describe("/tables", () => {
|
|||
|
||||
request
|
||||
.delete(`/api/tables/${testTable._id}/${testTable._rev}`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
.end(async (_, res) => {
|
||||
expect(res.res.statusMessage).toEqual(`Table ${testTable._id} deleted.`);
|
||||
const dependentTable = await getDocument(instance._id, linkedTable._id)
|
||||
const dependentTable = await getDocument(instanceId, linkedTable._id)
|
||||
expect(dependentTable.schema.TestTable).not.toBeDefined();
|
||||
done();
|
||||
});
|
||||
|
|
@ -213,8 +206,7 @@ describe("/tables", () => {
|
|||
request,
|
||||
method: "DELETE",
|
||||
url: `/api/tables/${testTable._id}/${testTable._rev}`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
const {
|
||||
createClientDatabase,
|
||||
const {
|
||||
createApplication,
|
||||
createInstance,
|
||||
supertest,
|
||||
defaultHeaders,
|
||||
createUser,
|
||||
|
|
@ -17,30 +15,24 @@ describe("/users", () => {
|
|||
let request
|
||||
let server
|
||||
let app
|
||||
let instance
|
||||
let instanceId
|
||||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest(server))
|
||||
await createClientDatabase(request)
|
||||
app = await createApplication(request)
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id)
|
||||
app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
server.close();
|
||||
})
|
||||
|
||||
describe("fetch", () => {
|
||||
|
||||
describe("fetch", () => {
|
||||
it("returns a list of users from an instance db", async () => {
|
||||
await createUser(request, app._id, instance._id, "brenda", "brendas_password")
|
||||
await createUser(request, app._id, instance._id, "pam", "pam_password")
|
||||
await createUser(request, instanceId, "brenda", "brendas_password")
|
||||
await createUser(request, instanceId, "pam", "pam_password")
|
||||
const res = await request
|
||||
.get(`/api/users`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
@ -50,13 +42,12 @@ describe("/users", () => {
|
|||
})
|
||||
|
||||
it("should apply authorization to endpoint", async () => {
|
||||
await createUser(request, app._id, instance._id, "brenda", "brendas_password")
|
||||
await createUser(request, instanceId, "brenda", "brendas_password")
|
||||
await testPermissionsForEndpoint({
|
||||
request,
|
||||
method: "GET",
|
||||
url: `/api/users`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
permissionName: LIST_USERS,
|
||||
})
|
||||
})
|
||||
|
|
@ -68,7 +59,7 @@ describe("/users", () => {
|
|||
it("returns a success message when a user is successfully created", async () => {
|
||||
const res = await request
|
||||
.post(`/api/users`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.send({ name: "Bill", username: "bill", password: "bills_password", accessLevelId: POWERUSER_LEVEL_ID })
|
||||
.expect(200)
|
||||
.expect('Content-Type', /json/)
|
||||
|
|
@ -83,8 +74,7 @@ describe("/users", () => {
|
|||
method: "POST",
|
||||
body: { name: "brandNewUser", username: "brandNewUser", password: "yeeooo", accessLevelId: POWERUSER_LEVEL_ID },
|
||||
url: `/api/users`,
|
||||
instanceId: instance._id,
|
||||
appId: app._id,
|
||||
instanceId: instanceId,
|
||||
permissionName: USER_MANAGEMENT,
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
const {
|
||||
createClientDatabase,
|
||||
const {
|
||||
createApplication,
|
||||
createInstance,
|
||||
createTable,
|
||||
supertest,
|
||||
defaultHeaders,
|
||||
|
|
@ -12,7 +10,7 @@ describe("/views", () => {
|
|||
let request
|
||||
let server
|
||||
let app
|
||||
let instance
|
||||
let instanceId
|
||||
let table
|
||||
|
||||
const createView = async (config = {
|
||||
|
|
@ -24,34 +22,33 @@ describe("/views", () => {
|
|||
await request
|
||||
.post(`/api/views`)
|
||||
.send(config)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
const createRow = async row => request
|
||||
.post(`/api/${table._id}/rows`)
|
||||
.send(row)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
beforeAll(async () => {
|
||||
({ request, server } = await supertest())
|
||||
await createClientDatabase(request)
|
||||
app = await createApplication(request)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
instance = await createInstance(request, app._id)
|
||||
app = await createApplication(request)
|
||||
instanceId = app.instances[0]._id
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
server.close()
|
||||
afterAll(done => {
|
||||
server.close(done)
|
||||
})
|
||||
|
||||
describe("create", () => {
|
||||
beforeEach(async () => {
|
||||
table = await createTable(request, app._id, instance._id);
|
||||
table = await createTable(request, instanceId);
|
||||
})
|
||||
|
||||
it("returns a success message when the view is successfully created", async () => {
|
||||
|
|
@ -62,7 +59,7 @@ describe("/views", () => {
|
|||
it("updates the table row with the new view metadata", async () => {
|
||||
const res = await createView()
|
||||
expect(res.res.statusMessage).toEqual("View TestView saved successfully.");
|
||||
const updatedTable = await getDocument(instance._id, table._id)
|
||||
const updatedTable = await getDocument(instanceId, table._id)
|
||||
expect(updatedTable.views).toEqual({
|
||||
TestView: {
|
||||
field: "Price",
|
||||
|
|
@ -99,14 +96,14 @@ describe("/views", () => {
|
|||
|
||||
describe("fetch", () => {
|
||||
beforeEach(async () => {
|
||||
table = await createTable(request, app._id, instance._id);
|
||||
table = await createTable(request, instanceId);
|
||||
});
|
||||
|
||||
it("returns only custom views", async () => {
|
||||
await createView()
|
||||
const res = await request
|
||||
.get(`/api/views`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
expect(res.body.length).toBe(1)
|
||||
|
|
@ -116,7 +113,7 @@ describe("/views", () => {
|
|||
|
||||
describe("query", () => {
|
||||
beforeEach(async () => {
|
||||
table = await createTable(request, app._id, instance._id);
|
||||
table = await createTable(request, instanceId);
|
||||
});
|
||||
|
||||
it("returns data for the created view", async () => {
|
||||
|
|
@ -135,7 +132,7 @@ describe("/views", () => {
|
|||
})
|
||||
const res = await request
|
||||
.get(`/api/views/TestView?calculation=stats`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
expect(res.body.length).toBe(1)
|
||||
|
|
@ -167,7 +164,7 @@ describe("/views", () => {
|
|||
})
|
||||
const res = await request
|
||||
.get(`/api/views/TestView?calculation=stats&group=Category`)
|
||||
.set(defaultHeaders(app._id, instance._id))
|
||||
.set(defaultHeaders(instanceId))
|
||||
.expect('Content-Type', /json/)
|
||||
.expect(200)
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ app.context.auth = {}
|
|||
app.use(api.routes())
|
||||
|
||||
if (electron.app && electron.app.isPackaged) {
|
||||
process.env.NODE_ENV = "production"
|
||||
env._set("NODE_ENV", "production")
|
||||
Sentry.init()
|
||||
|
||||
app.on("error", (err, ctx) => {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ const updateRow = require("./steps/updateRow")
|
|||
const deleteRow = require("./steps/deleteRow")
|
||||
const createUser = require("./steps/createUser")
|
||||
const outgoingWebhook = require("./steps/outgoingWebhook")
|
||||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
const download = require("download")
|
||||
const fetch = require("node-fetch")
|
||||
const { join } = require("../utilities/centralPath")
|
||||
|
|
@ -33,8 +33,8 @@ const BUILTIN_DEFINITIONS = {
|
|||
OUTGOING_WEBHOOK: outgoingWebhook.definition,
|
||||
}
|
||||
|
||||
let AUTOMATION_BUCKET = environment.AUTOMATION_BUCKET
|
||||
let AUTOMATION_DIRECTORY = environment.AUTOMATION_DIRECTORY
|
||||
let AUTOMATION_BUCKET = env.AUTOMATION_BUCKET
|
||||
let AUTOMATION_DIRECTORY = env.AUTOMATION_DIRECTORY
|
||||
let MANIFEST = null
|
||||
|
||||
function buildBundleName(pkgName, version) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const triggers = require("./triggers")
|
||||
const actions = require("./actions")
|
||||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
const workerFarm = require("worker-farm")
|
||||
const singleThread = require("./thread")
|
||||
const { getAPIKey, update, Properties } = require("../utilities/usageQuota")
|
||||
|
|
@ -34,10 +34,10 @@ module.exports.init = function() {
|
|||
actions.init().then(() => {
|
||||
triggers.automationQueue.process(async job => {
|
||||
try {
|
||||
if (environment.CLOUD && job.data.automation) {
|
||||
if (env.CLOUD && job.data.automation) {
|
||||
job.data.automation.apiKey = await updateQuota(job.data.automation)
|
||||
}
|
||||
if (environment.BUDIBASE_ENVIRONMENT === "PRODUCTION") {
|
||||
if (env.BUDIBASE_ENVIRONMENT === "PRODUCTION") {
|
||||
await runWorker(job)
|
||||
} else {
|
||||
await singleThread(job)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const rowController = require("../../api/controllers/row")
|
||||
const automationUtils = require("../automationUtils")
|
||||
const environment = require("../../environment")
|
||||
const env = require("../../environment")
|
||||
const usage = require("../../utilities/usageQuota")
|
||||
|
||||
module.exports.definition = {
|
||||
|
|
@ -80,7 +80,7 @@ module.exports.run = async function({ inputs, instanceId, apiKey }) {
|
|||
}
|
||||
|
||||
try {
|
||||
if (environment.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
await usage.update(apiKey, usage.Properties.ROW, 1)
|
||||
}
|
||||
await rowController.save(ctx)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const accessLevels = require("../../utilities/accessLevels")
|
||||
const userController = require("../../api/controllers/user")
|
||||
const environment = require("../../environment")
|
||||
const env = require("../../environment")
|
||||
const usage = require("../../utilities/usageQuota")
|
||||
|
||||
module.exports.definition = {
|
||||
|
|
@ -70,7 +70,7 @@ module.exports.run = async function({ inputs, instanceId, apiKey }) {
|
|||
}
|
||||
|
||||
try {
|
||||
if (environment.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
await usage.update(apiKey, usage.Properties.USER, 1)
|
||||
}
|
||||
await userController.create(ctx)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
const rowController = require("../../api/controllers/row")
|
||||
const environment = require("../../environment")
|
||||
const env = require("../../environment")
|
||||
const usage = require("../../utilities/usageQuota")
|
||||
|
||||
module.exports.definition = {
|
||||
|
|
@ -65,7 +65,7 @@ module.exports.run = async function({ inputs, instanceId, apiKey }) {
|
|||
}
|
||||
|
||||
try {
|
||||
if (environment.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
await usage.update(apiKey, usage.Properties.ROW, -1)
|
||||
}
|
||||
await rowController.destroy(ctx)
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
const CouchDB = require("./client")
|
||||
|
||||
exports.create = async clientId => {
|
||||
const dbId = exports.name(clientId)
|
||||
const db = new CouchDB(dbId)
|
||||
await db.put({
|
||||
_id: "_design/client",
|
||||
views: {
|
||||
by_type: {
|
||||
map: `function(doc) {
|
||||
emit([doc.type], doc._id)
|
||||
}`,
|
||||
},
|
||||
},
|
||||
})
|
||||
return db
|
||||
}
|
||||
|
||||
exports.destroy = async function(clientId) {
|
||||
const dbId = exports.name(clientId)
|
||||
await new CouchDB(dbId).destroy()
|
||||
}
|
||||
|
||||
exports.name = function(clientId) {
|
||||
return `client_${clientId}`
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
let _ = require("lodash")
|
||||
let environment = require("../environment")
|
||||
let env = require("../environment")
|
||||
|
||||
const AWS_REGION = environment.AWS_REGION ? environment.AWS_REGION : "eu-west-1"
|
||||
const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1"
|
||||
|
||||
const TableInfo = {
|
||||
API_KEYS: {
|
||||
|
|
@ -110,8 +110,8 @@ exports.init = endpoint => {
|
|||
}
|
||||
if (endpoint) {
|
||||
docClientParams.endpoint = endpoint
|
||||
} else if (environment.DYNAMO_ENDPOINT) {
|
||||
docClientParams.endpoint = environment.DYNAMO_ENDPOINT
|
||||
} else if (env.DYNAMO_ENDPOINT) {
|
||||
docClientParams.endpoint = env.DYNAMO_ENDPOINT
|
||||
}
|
||||
docClient = new AWS.DynamoDB.DocumentClient(docClientParams)
|
||||
}
|
||||
|
|
@ -119,10 +119,10 @@ exports.init = endpoint => {
|
|||
exports.apiKeyTable = new Table(TableInfo.API_KEYS)
|
||||
exports.userTable = new Table(TableInfo.USERS)
|
||||
|
||||
if (environment.CLOUD) {
|
||||
if (env.CLOUD) {
|
||||
exports.init(`https://dynamodb.${AWS_REGION}.amazonaws.com`)
|
||||
} else {
|
||||
process.env.AWS_ACCESS_KEY_ID = "KEY_ID"
|
||||
process.env.AWS_SECRET_ACCESS_KEY = "SECRET_KEY"
|
||||
env._set("AWS_ACCESS_KEY_ID", "KEY_ID")
|
||||
env._set("AWS_SECRET_ACCESS_KEY", "SECRET_KEY")
|
||||
exports.init("http://localhost:8333")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ const DocumentTypes = {
|
|||
APP: "app",
|
||||
ACCESS_LEVEL: "ac",
|
||||
WEBHOOK: "wh",
|
||||
INSTANCE: "inst",
|
||||
}
|
||||
|
||||
exports.DocumentTypes = DocumentTypes
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ module.exports = {
|
|||
COUCH_DB_URL: process.env.COUCH_DB_URL,
|
||||
SALT_ROUNDS: process.env.SALT_ROUNDS,
|
||||
LOGGER: process.env.LOGGER,
|
||||
LOG_LEVEL: process.env.LOG_LEVEL,
|
||||
AUTOMATION_DIRECTORY: process.env.AUTOMATION_DIRECTORY,
|
||||
AUTOMATION_BUCKET: process.env.AUTOMATION_BUCKET,
|
||||
BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
|
||||
|
|
@ -30,4 +31,11 @@ module.exports = {
|
|||
AWS_REGION: process.env.AWS_REGION,
|
||||
DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
|
||||
BUDIBASE_API_KEY: process.env.BUDIBASE_API_KEY,
|
||||
USERID_API_KEY: process.env.USERID_API_KEY,
|
||||
ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
|
||||
DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL,
|
||||
_set(key, value) {
|
||||
process.env[key] = value
|
||||
exports[key] = value
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ const {
|
|||
BUILDER_LEVEL_ID,
|
||||
ANON_LEVEL_ID,
|
||||
} = require("../utilities/accessLevels")
|
||||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
const { AuthTypes } = require("../constants")
|
||||
|
||||
module.exports = async (ctx, next) => {
|
||||
|
|
@ -21,7 +21,7 @@ module.exports = async (ctx, next) => {
|
|||
|
||||
let token
|
||||
// if running locally in the builder itself
|
||||
if (!environment.CLOUD && !appToken) {
|
||||
if (!env.CLOUD && !appToken) {
|
||||
token = builderToken
|
||||
ctx.auth.authenticated = AuthTypes.BUILDER
|
||||
} else {
|
||||
|
|
@ -32,7 +32,7 @@ module.exports = async (ctx, next) => {
|
|||
if (!token) {
|
||||
ctx.auth.authenticated = false
|
||||
|
||||
let appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
|
||||
let appId = env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
|
||||
|
||||
// if appId can't be determined from path param or subdomain
|
||||
if (!appId && ctx.request.headers.referer) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ const {
|
|||
BUILDER_LEVEL_ID,
|
||||
BUILDER,
|
||||
} = require("../utilities/accessLevels")
|
||||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
const { apiKeyTable } = require("../db/dynamoClient")
|
||||
const { AuthTypes } = require("../constants")
|
||||
|
||||
|
|
@ -13,14 +13,10 @@ const LOCAL_PASS = new RegExp(["webhooks/trigger", "webhooks/schema"].join("|"))
|
|||
|
||||
module.exports = (permName, getItemId) => async (ctx, next) => {
|
||||
// webhooks can pass locally
|
||||
if (!environment.CLOUD && LOCAL_PASS.test(ctx.request.url)) {
|
||||
if (!env.CLOUD && LOCAL_PASS.test(ctx.request.url)) {
|
||||
return next()
|
||||
}
|
||||
if (
|
||||
environment.CLOUD &&
|
||||
ctx.headers["x-api-key"] &&
|
||||
ctx.headers["x-instanceid"]
|
||||
) {
|
||||
if (env.CLOUD && ctx.headers["x-api-key"] && ctx.headers["x-instanceid"]) {
|
||||
// api key header passed by external webhook
|
||||
const apiKeyInfo = await apiKeyTable.get({
|
||||
primary: ctx.headers["x-api-key"],
|
||||
|
|
@ -41,7 +37,7 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
|
|||
}
|
||||
|
||||
// don't expose builder endpoints in the cloud
|
||||
if (environment.CLOUD && permName === BUILDER) return
|
||||
if (env.CLOUD && permName === BUILDER) return
|
||||
|
||||
if (!ctx.auth.authenticated) {
|
||||
ctx.throw(403, "Session not authenticated")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const CouchDB = require("../db")
|
||||
const usageQuota = require("../utilities/usageQuota")
|
||||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
|
||||
// currently only counting new writes and deletes
|
||||
const METHOD_MAP = {
|
||||
|
|
@ -51,7 +51,7 @@ module.exports = async (ctx, next) => {
|
|||
: [ctx.request.files.file]
|
||||
usage = files.map(file => file.size).reduce((total, size) => total + size)
|
||||
}
|
||||
if (!environment.CLOUD) {
|
||||
if (!env.CLOUD) {
|
||||
return next()
|
||||
}
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -30,10 +30,7 @@ module.exports.getPackageForBuilder = async (config, application) => {
|
|||
|
||||
return {
|
||||
pages,
|
||||
|
||||
application,
|
||||
|
||||
clientId: env.CLIENT_ID,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
const { BUILDER_LEVEL_ID } = require("../accessLevels")
|
||||
const environment = require("../../environment")
|
||||
const env = require("../../environment")
|
||||
const jwt = require("jsonwebtoken")
|
||||
|
||||
module.exports = (ctx, appId, instanceId, version) => {
|
||||
module.exports = (ctx, instanceId, version) => {
|
||||
const builderUser = {
|
||||
userId: "BUILDER",
|
||||
accessLevelId: BUILDER_LEVEL_ID,
|
||||
|
|
@ -10,8 +10,8 @@ module.exports = (ctx, appId, instanceId, version) => {
|
|||
appId,
|
||||
version,
|
||||
}
|
||||
if (environment.BUDIBASE_API_KEY) {
|
||||
builderUser.apiKey = environment.BUDIBASE_API_KEY
|
||||
if (env.BUDIBASE_API_KEY) {
|
||||
builderUser.apiKey = env.BUDIBASE_API_KEY
|
||||
}
|
||||
const token = jwt.sign(builderUser, ctx.config.jwtSecret, {
|
||||
expiresIn: "30 days",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
const env = require("../environment")
|
||||
|
||||
exports.wait = ms => new Promise(resolve => setTimeout(resolve, ms))
|
||||
|
||||
exports.isDev = () => {
|
||||
return (
|
||||
process.env.NODE_ENV !== "production" &&
|
||||
process.env.NODE_ENV !== "jest" &&
|
||||
process.env.NODE_ENV !== "cypress"
|
||||
env.NODE_ENV !== "production" &&
|
||||
env.NODE_ENV !== "jest" &&
|
||||
env.NODE_ENV !== "cypress"
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,7 @@ module.exports = async opts => {
|
|||
await ensureDir(opts.dir)
|
||||
await setCouchDbUrl(opts)
|
||||
|
||||
// need an env file to create the client database
|
||||
await createDevEnvFile(opts)
|
||||
await createClientDatabase(opts)
|
||||
|
||||
// need to recreate the env file, as we only now have a client id
|
||||
// quiet flag will force overwrite of config
|
||||
opts.quiet = true
|
||||
// need an env file
|
||||
await createDevEnvFile(opts)
|
||||
}
|
||||
|
||||
|
|
@ -41,15 +35,3 @@ const createDevEnvFile = async opts => {
|
|||
await writeFile(destConfigFile, config, { flag: "w+" })
|
||||
}
|
||||
}
|
||||
|
||||
const createClientDatabase = async opts => {
|
||||
// cannot be a top level require as it
|
||||
// will cause environment module to be loaded prematurely
|
||||
const clientDb = require("../db/clientDb")
|
||||
|
||||
if (!opts.clientId || opts.clientId === "new") {
|
||||
opts.clientId = uuid.v4()
|
||||
}
|
||||
|
||||
await clientDb.create(opts.clientId)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const environment = require("../environment")
|
||||
const env = require("../environment")
|
||||
const { apiKeyTable } = require("../db/dynamoClient")
|
||||
|
||||
const DEFAULT_USAGE = {
|
||||
|
|
@ -63,7 +63,7 @@ exports.getAPIKey = async appId => {
|
|||
*/
|
||||
exports.update = async (apiKey, property, usage) => {
|
||||
// don't try validate in builder
|
||||
if (!environment.CLOUD) {
|
||||
if (!env.CLOUD) {
|
||||
return
|
||||
}
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -1352,13 +1352,6 @@ axios@^0.19.2:
|
|||
dependencies:
|
||||
follow-redirects "1.5.10"
|
||||
|
||||
axios@^0.21.0:
|
||||
version "0.21.0"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca"
|
||||
integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==
|
||||
dependencies:
|
||||
follow-redirects "^1.10.0"
|
||||
|
||||
babel-jest@^24.9.0:
|
||||
version "24.9.0"
|
||||
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
|
||||
|
|
@ -3185,11 +3178,6 @@ follow-redirects@1.5.10:
|
|||
dependencies:
|
||||
debug "=3.1.0"
|
||||
|
||||
follow-redirects@^1.10.0:
|
||||
version "1.13.0"
|
||||
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
|
||||
integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
|
||||
|
||||
for-in@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
|
||||
|
|
|
|||
Loading…
Reference in New Issue