From b70b1a94bb60d8d78cef2257187bacea7d700ae3 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Sun, 24 Sep 2023 03:26:04 +0600 Subject: [PATCH 01/17] fix(deps): update @topcoder-framework packages for bug fixes Signed-off-by: Rakib Ansary --- package.json | 4 ++-- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 7c028194..b992d707 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.18.0", - "@topcoder-framework/lib-common": "^0.18.0", + "@topcoder-framework/domain-challenge": "^0.22.0", + "@topcoder-framework/lib-common": "^0.22.0", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index b4b8e39a..35cef421 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,35 +255,35 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.18.0": - version "0.18.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.18.0.tgz#20175617c3ac281797d7717a157159076b2578fb" - integrity sha512-JwcKcuT6w/3ydd27+doi9dVWHtuJClXOwajVOfXfHPGFhsgswfoFZ+k4kfc2kC/fioDJ1IPKdFRTeVCxycljnA== +"@topcoder-framework/client-relational@^0.22.0": + version "0.22.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.0.tgz#0e096758ffd8c9d0eb986b2f9328ed247930abfe" + integrity sha512-We0sb8pdxOZfzX8WzKxczhXl16jmZ6cN/eBgDv5jR8qpVoXhLTa2iaTLqiRYUWi9ZvHCN6vmNQ607w0IU/iRFQ== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.18.0" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.56-beta-1" + "@topcoder-framework/lib-common" "^0.22.0" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.18.0": - version "0.18.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.18.0.tgz#505d24e14a0354c900c2d55f92335bf9c5aa8d8c" - integrity sha512-+jPNhU+ZqcTjuPBCYc2mLLTUiKVg1WTUZbaySL09iYoEQpnfhpCf/t3Z/5cnC2WuLlaHp5lR7xQP5+Iz/Hl+6g== +"@topcoder-framework/domain-challenge@^0.22.0": + version "0.22.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.0.tgz#bcb7f7a602e424d9932fd0693935aa5f1f2439a4" + integrity sha512-PT2Zts56QKtntSJQxjH8slRjrYISuUGCZdYmyQcy+ak0nQL0COhQ0puqJ6mfIA9Ml3Ggi8Vmk/G9Ti12h1YNDg== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.18.0" - "@topcoder-framework/lib-common" "^0.18.0" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.56-beta-1" + "@topcoder-framework/client-relational" "^0.22.0" + "@topcoder-framework/lib-common" "^0.22.0" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.18.0": - version "0.18.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.18.0.tgz#ad06f5effbebcb67472cd0c51434ae4415fd9ba1" - integrity sha512-961jxIjgQcSlMfhQCM9bi8A4yjQV88hzAhOM/SO5k40WhnsmiazWwb4+P9asoBie86Z2TpYn1cnP0hNt1IQ3DA== +"@topcoder-framework/lib-common@^0.22.0": + version "0.22.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.0.tgz#bd3428b0199410a5151326d1d9731c404c255fb5" + integrity sha512-sHdOAyCGcNaDT9esc9Q3sNaqvVAwHPv6NCTlTAt5O9dcSpdz2AyEur8mS5WccFclKhF5ZB9BM1bbWxO8i9WXGQ== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.56-beta-1" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" tslib "^2.4.1" "@types/body-parser@*": @@ -3999,9 +3999,9 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -"topcoder-interface@github:topcoder-platform/plat-interface-definition#v0.0.56-beta-1": +"topcoder-interface@github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1": version "1.0.0" - resolved "https://codeload.github.com/topcoder-platform/plat-interface-definition/tar.gz/7d743db08b113964d5cd3d52644963af7dde5ba4" + resolved "https://codeload.github.com/topcoder-platform/plat-interface-definition/tar.gz/474bcfa1d01f0f2d0a2658de21aa835f4c824c44" topo@3.x.x: version "3.0.3" From 77e36f2090bce957932d24cc25911f6a72121324 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Sun, 24 Sep 2023 03:26:27 +0600 Subject: [PATCH 02/17] fix(deps): update @topcoder-framework packages for bug fixes Signed-off-by: Rakib Ansary --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 990cc8d7..17dcd01d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ workflows: branches: only: - dev - - feature/phase-advance + - PLAT-3491 - "build-qa": context: org-global From 355a78432f8205e3ea38bf35326bfaf8b47e7bde Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Sun, 24 Sep 2023 04:27:30 +0600 Subject: [PATCH 03/17] fix(deps): update @topcoder-framework packages for bug fixes Signed-off-by: Rakib Ansary --- package.json | 4 +- yarn.lock | 725 ++++++++++++++++++++++++++------------------------- 2 files changed, 367 insertions(+), 362 deletions(-) diff --git a/package.json b/package.json index b992d707..79a7571e 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.0", - "@topcoder-framework/lib-common": "^0.22.0", + "@topcoder-framework/domain-challenge": "^0.21.1-PLAT-3491.0", + "@topcoder-framework/lib-common": "^0.21.1-PLAT-3491.0", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 35cef421..9b60c472 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,27 +2,28 @@ # yarn lockfile v1 -"@babel/code-frame@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" - integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== +"@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== dependencies: - "@babel/highlight" "^7.22.5" + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" -"@babel/generator@^7.22.5", "@babel/generator@^7.4.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" - integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA== +"@babel/generator@^7.22.15", "@babel/generator@^7.4.0": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" + integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.22.15" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-environment-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" - integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== "@babel/helper-function-name@^7.22.5": version "7.22.5" @@ -39,10 +40,10 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08" - integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ== +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== dependencies: "@babel/types" "^7.22.5" @@ -51,64 +52,64 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" - integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== +"@babel/helper-validator-identifier@^7.22.19", "@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/highlight@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" - integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.0.0" + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.22.5", "@babel/parser@^7.4.3": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" - integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== +"@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.4.3": + version "7.22.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" + integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== "@babel/runtime@^7.15.4": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" - integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" + integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== dependencies: - regenerator-runtime "^0.13.11" + regenerator-runtime "^0.14.0" "@babel/template@^7.22.5", "@babel/template@^7.4.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" - integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" "@babel/traverse@^7.4.3": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" - integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.20.tgz#db572d9cb5c79e02d83e5618b82f6991c07584c9" + integrity sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw== dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.22.5" "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.22.16" + "@babel/types" "^7.22.19" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.22.5", "@babel/types@^7.4.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" - integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== +"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.4.0": + version "7.22.19" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684" + integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg== dependencies: "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.19" to-fast-properties "^2.0.0" "@colors/colors@1.5.0": @@ -126,22 +127,21 @@ kuler "^2.0.0" "@grpc/grpc-js@^1.8.0", "@grpc/grpc-js@^1.8.12": - version "1.8.15" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.15.tgz#17829cbc9f2bc8b3b0e22a4da59d72db2a34df5c" - integrity sha512-H2Bu/w6+oQ58DsRbQol66ERBk3V5ZIak/z/MDx0T4EgDnJWps807I6BvTjq0v6UvZtOcLO+ur+Q9wvniqu3OJA== + version "1.9.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.3.tgz#811cc49966ab7ed96efa31d213e80d671fd13839" + integrity sha512-b8iWtdrYIeT5fdZdS4Br/6h/kuk0PW5EVBUGk1amSbrpL8DlktJD43CdcCWwRdd6+jgwHhADSbL9CsNnm6EUPA== dependencies: - "@grpc/proto-loader" "^0.7.0" + "@grpc/proto-loader" "^0.7.8" "@types/node" ">=12.12.47" -"@grpc/proto-loader@^0.7.0": - version "0.7.7" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.7.tgz#d33677a77eea8407f7c66e2abd97589b60eb4b21" - integrity sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ== +"@grpc/proto-loader@^0.7.8": + version "0.7.10" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.10.tgz#6bf26742b1b54d0a473067743da5d3189d06d720" + integrity sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ== dependencies: - "@types/long" "^4.0.1" lodash.camelcase "^4.3.0" - long "^4.0.0" - protobufjs "^7.0.0" + long "^5.0.0" + protobufjs "^7.2.4" yargs "^17.7.2" "@jridgewell/gen-mapping@^0.3.2": @@ -153,38 +153,33 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== "@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@1.4.14": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" - integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== + version "0.3.19" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" + integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" "@opensearch-project/opensearch@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@opensearch-project/opensearch/-/opensearch-2.2.1.tgz#a400203afa6512ef73945663163a404763a10f5a" - integrity sha512-8zfQX1acL9eWG+ohIc9nJVT9LSqXCdbVEJs0rCPRtji3XF6ahzsiKmGNTeWLxCPDxWCjAIWq9t95xP3Y5Egi6Q== + version "2.3.1" + resolved "https://registry.yarnpkg.com/@opensearch-project/opensearch/-/opensearch-2.3.1.tgz#3596e2f1f0615a7555102f6f941f0e0ec645c2cd" + integrity sha512-Kg8tddAx6sinStnNi6IeGilfvLWlonIxaRdVNiJcNPr1yMqd0c9TSegn18zKr0Pb0IM9xBIGBSkRPuh67ZN6Hw== dependencies: aws4 "^1.11.0" debug "^4.3.1" @@ -255,54 +250,54 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.0": - version "0.22.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.0.tgz#0e096758ffd8c9d0eb986b2f9328ed247930abfe" - integrity sha512-We0sb8pdxOZfzX8WzKxczhXl16jmZ6cN/eBgDv5jR8qpVoXhLTa2iaTLqiRYUWi9ZvHCN6vmNQ607w0IU/iRFQ== +"@topcoder-framework/client-relational@^0.21.1-PLAT-3491.0": + version "0.21.1-PLAT-3491.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.21.1-PLAT-3491.0.tgz#96615eeea10585d683ce951345b60b1191dabe26" + integrity sha512-eNR3/r1Ljj/Gfx6aXdQ8rWUJsVapGNnziR4Ds8Z+xOUKrBkwJs5ioX0lzJiBS30+cVi2zUAjPvMQ9eatg9A5xw== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.0" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" + "@topcoder-framework/lib-common" "^0.21.1-PLAT-3491.0" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.59-PLAT-3491.1" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.0": - version "0.22.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.0.tgz#bcb7f7a602e424d9932fd0693935aa5f1f2439a4" - integrity sha512-PT2Zts56QKtntSJQxjH8slRjrYISuUGCZdYmyQcy+ak0nQL0COhQ0puqJ6mfIA9Ml3Ggi8Vmk/G9Ti12h1YNDg== +"@topcoder-framework/domain-challenge@^0.21.1-PLAT-3491.0": + version "0.21.1-PLAT-3491.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.21.1-PLAT-3491.0.tgz#4bd64c1ded5ddd1e29aaa4e30427ab8c58c83b42" + integrity sha512-PGTR3Fp2qOIKCO3KyGCW1LM/lObwktaGEPQw/Z+j4mbZI3kucFd7VyryQ52tsPm4a1xH0q0FCsZl9fb4TaQhAA== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.0" - "@topcoder-framework/lib-common" "^0.22.0" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" + "@topcoder-framework/client-relational" "^0.21.1-PLAT-3491.0" + "@topcoder-framework/lib-common" "^0.21.1-PLAT-3491.0" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.59-PLAT-3491.1" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.0": - version "0.22.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.0.tgz#bd3428b0199410a5151326d1d9731c404c255fb5" - integrity sha512-sHdOAyCGcNaDT9esc9Q3sNaqvVAwHPv6NCTlTAt5O9dcSpdz2AyEur8mS5WccFclKhF5ZB9BM1bbWxO8i9WXGQ== +"@topcoder-framework/lib-common@^0.21.1-PLAT-3491.0": + version "0.21.1-PLAT-3491.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.21.1-PLAT-3491.0.tgz#d70bd24bdaa3dadc5d690d5c5e8e744822dce55b" + integrity sha512-L8iaJDUj6+vPy9pUrgc7htLXu3V8J/QnSM9H9TdYsoeEgD6OG1SsAWJSJEPIxd8JI3/iUiME4VxJAvTI7YaY8w== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1" + topcoder-interface "github:topcoder-platform/plat-interface-definition#v0.0.59-PLAT-3491.1" tslib "^2.4.1" "@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + version "1.19.3" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.3.tgz#fb558014374f7d9e56c8f34bab2042a3a07d25cd" + integrity sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ== dependencies: "@types/connect" "*" "@types/node" "*" "@types/chai@4": - version "4.3.5" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b" - integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng== + version "4.3.6" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.6.tgz#7b489e8baf393d5dd1266fb203ddd4ea941259e6" + integrity sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw== "@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + version "3.4.36" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.36.tgz#e511558c15a39cb29bd5357eebb57bd1459cd1ab" + integrity sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w== dependencies: "@types/node" "*" @@ -320,9 +315,9 @@ "@types/express-unless" "*" "@types/express-serve-static-core@^4.17.33": - version "4.17.35" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" - integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== + version "4.17.37" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz#7e4b7b59da9142138a2aaa7621f5abedce8c7320" + integrity sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg== dependencies: "@types/node" "*" "@types/qs" "*" @@ -337,19 +332,19 @@ express-unless "*" "@types/express@*": - version "4.17.17" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" - integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== + version "4.17.18" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.18.tgz#efabf5c4495c1880df1bdffee604b143b29c4a95" + integrity sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.33" "@types/qs" "*" "@types/serve-static" "*" -"@types/long@^4.0.1": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" - integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== +"@types/http-errors@*": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.2.tgz#a86e00bbde8950364f8e7846687259ffcd96e8c2" + integrity sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg== "@types/mime@*": version "3.0.1" @@ -362,14 +357,14 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "20.3.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" - integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== + version "20.6.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.4.tgz#7882cb8b8adc3106c352dac9c02d4d3ebb95cf3e" + integrity sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ== "@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + version "6.9.8" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.8.tgz#f2a7de3c107b89b441e071d5472e6b726b4adf45" + integrity sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg== "@types/range-parser@*": version "1.2.4" @@ -385,10 +380,11 @@ "@types/node" "*" "@types/serve-static@*": - version "1.15.1" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" - integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== + version "1.15.2" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" + integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== dependencies: + "@types/http-errors" "*" "@types/mime" "*" "@types/node" "*" @@ -401,9 +397,9 @@ "@types/node" "*" "@types/triple-beam@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8" - integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g== + version "1.3.3" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.3.tgz#726ae98a5f6418c8f24f9b0f2a9f81a8664876ae" + integrity sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g== abab@^2.0.6: version "2.0.6" @@ -437,9 +433,9 @@ acorn-walk@^8.0.2: integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^8.1.0, acorn@^8.8.2: - version "8.9.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" - integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== agent-base@6: version "6.0.2" @@ -554,17 +550,30 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array.prototype.reduce@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" - integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q== +array.prototype.reduce@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz#63149931808c5fc1e1354814923d92d45f7d96d5" + integrity sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" +arraybuffer.prototype.slice@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" + integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-array-buffer "^3.0.2" + is-shared-array-buffer "^1.0.2" + asap@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -603,9 +612,9 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== aws-sdk@^2.1145.0: - version "2.1399.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1399.0.tgz#a3288dbd20a322bf504c3380e5ce33af91425a1a" - integrity sha512-u9G78zs4vN/jl/AI+wNA0qnId2bUmXaCUrzRjTqN8/MWMda7igXmWHbcLmUC3BKmQPrp3EzgC+jBzFWoz5QL9A== + version "2.1463.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1463.0.tgz#ae584a0ea57c73fb43ef75f4d51a5076a4aaba8b" + integrity sha512-NGJLovoHEX6uN3u9iHx0KWg9AigZfSz9YekLQssqGk5vHAEzW7TlCgRsqTu6vhGI5FzlYWapSvUpJUriQUCwMA== dependencies: buffer "4.9.2" events "1.1.1" @@ -629,9 +638,9 @@ aws4@^1.11.0, aws4@^1.8.0: integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axios-retry@^3.4.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.5.0.tgz#32206b3e6555169488eded232527e36c8ce6e545" - integrity sha512-g48qNrLX30VU6ECWltpFCPegKK6dWzMDYv2o83W2zUL/Zh/SLXbT6ksGoKqYZHtghzqeeXhZBcSXJkO1fPbCcw== + version "3.8.0" + resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.8.0.tgz#a174af633ef143a9f5642b9e4afe65c2017936b5" + integrity sha512-CfIsQyWNc5/AE7x/UEReRUadiBmQeoBpSEC+4QyGLJMswTsP1tz0GW2YYPnE7w9+ESMef5zOgLDFpHynNyEZ1w== dependencies: "@babel/runtime" "^7.15.4" is-retry-allowed "^2.2.0" @@ -826,9 +835,9 @@ chai-http@^4.2.1: superagent "^8.0.9" chai@^4.2.0: - version "4.3.7" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" - integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== + version "4.3.8" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.8.tgz#40c59718ad6928da6629c70496fe990b2bb5b17c" + integrity sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ== dependencies: assertion-error "^1.1.0" check-error "^1.0.2" @@ -849,7 +858,7 @@ chalk@^1.0.0: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1: +chalk@^2.0.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1150,14 +1159,14 @@ deep-eql@^4.1.2: type-detect "^4.0.0" deep-equal@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.1.tgz#c72ab22f3a7d3503a4ca87dde976fe9978816739" - integrity sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ== + version "2.2.2" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.2.tgz#9b2635da569a13ba8e1cc159c2f744071b115daa" + integrity sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA== dependencies: array-buffer-byte-length "^1.0.0" call-bind "^1.0.2" es-get-iterator "^1.1.3" - get-intrinsic "^1.2.0" + get-intrinsic "^1.2.1" is-arguments "^1.1.1" is-array-buffer "^3.0.2" is-date-object "^1.0.5" @@ -1173,11 +1182,6 @@ deep-equal@^2.2.0: which-collection "^1.0.1" which-typed-array "^1.1.9" -deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - default-require-extensions@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7" @@ -1185,11 +1189,21 @@ default-require-extensions@^2.0.0: dependencies: strip-bom "^3.0.0" +define-data-property@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451" + integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g== + dependencies: + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== dependencies: + define-data-property "^1.0.1" has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -1229,9 +1243,9 @@ domexception@^4.0.0: webidl-conversions "^7.0.0" dompurify@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.3.tgz#4b115d15a091ddc96f232bcef668550a2f6f1430" - integrity sha512-axQ9zieHLnAnHh0sfAamKYiqXMJAVwu+LM/alQ7WDagoWessyWvMSFyW65CqF3owufNu8HBcE4cM2Vflu7YWcQ== + version "3.0.5" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed" + integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A== dotenv@^8.2.0: version "8.6.0" @@ -1311,18 +1325,19 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2: - version "1.21.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" - integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== +es-abstract@^1.22.1: + version "1.22.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a" + integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA== dependencies: array-buffer-byte-length "^1.0.0" + arraybuffer.prototype.slice "^1.0.2" available-typed-arrays "^1.0.5" call-bind "^1.0.2" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.0" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.1" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" @@ -1337,19 +1352,23 @@ es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2: is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-typed-array "^1.1.10" + is-typed-array "^1.1.12" is-weakref "^1.0.2" object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" + regexp.prototype.flags "^1.5.1" + safe-array-concat "^1.0.1" safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" + string.prototype.trim "^1.2.8" + string.prototype.trimend "^1.0.7" + string.prototype.trimstart "^1.0.7" + typed-array-buffer "^1.0.0" + typed-array-byte-length "^1.0.0" + typed-array-byte-offset "^1.0.0" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" + which-typed-array "^1.1.11" es-array-method-boxes-properly@^1.0.0: version "1.0.0" @@ -1410,14 +1429,13 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17" + integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w== dependencies: esprima "^4.0.1" estraverse "^5.2.0" esutils "^2.0.2" - optionator "^0.8.1" optionalDependencies: source-map "~0.6.1" @@ -1532,11 +1550,6 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - fast-safe-stringify@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" @@ -1603,9 +1616,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.14.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== for-each@^0.3.3: version "0.3.3" @@ -1685,26 +1698,26 @@ fs.realpath@^1.0.0: integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== +function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" -functions-have-names@^1.2.2, functions-have-names@^1.2.3: +functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -1719,7 +1732,7 @@ get-func-name@^2.0.0: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== @@ -1881,10 +1894,10 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hash-it@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/hash-it/-/hash-it-5.0.2.tgz#8cc981944964a5124f74f1065af0c0a5d182d556" - integrity sha512-csU3E/a9QEmEgPPxoShVuMcFWM329IGioEPRvYVBv3r5BFrU8pCfnk3jGEVvriAcwqd+nl6KsNhPPjg8MUzkhQ== +hash-it@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/hash-it/-/hash-it-6.0.0.tgz#188df5a8ca2f8e036690e35f2ef88bd9417ff334" + integrity sha512-KHzmSFx1KwyMPw0kXeeUD752q/Kfbzhy6dAZrjXV9kAIXGqzGvv8vhkUqj+2MGZldTo0IBpw6v7iWE7uxsvH0w== hasha@^3.0.0: version "3.0.0" @@ -2123,10 +2136,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.11.0: - version "2.12.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" - integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== +is-core-module@^2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== dependencies: has "^1.0.3" @@ -2249,16 +2262,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.3, is-typed-array@^1.1.9: + version "1.1.12" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" + integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" + which-typed-array "^1.1.11" is-typedarray@~1.0.0: version "1.0.0" @@ -2456,14 +2465,14 @@ json-parse-better-errors@^1.0.1: integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== json-rules-engine@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/json-rules-engine/-/json-rules-engine-6.1.2.tgz#574ef455c10973fd5de07ea8414cbb72bb84d10f" - integrity sha512-+rtKuJ33HAvFywL9broh42FA9hkZNmS0l1DmgjP7nfGJ9E2i2IsfNH0BcXjyXianp/bXAyYlsSv308AfTuvBwQ== + version "6.4.2" + resolved "https://registry.yarnpkg.com/json-rules-engine/-/json-rules-engine-6.4.2.tgz#29e399dd5c07a3cc020d5a8bb6eda59347641485" + integrity sha512-D1wafl8UHDSlUCq22/jxJYLwKR7Y9YJ/ybFJff8EFw6+4wDR1lb7j4a6VpfBtiOcGcFmB8S2PO+IiUbDPv4XhQ== dependencies: clone "^2.1.2" eventemitter2 "^6.4.4" - hash-it "^5.0.0" - jsonpath-plus "^5.0.7" + hash-it "^6.0.0" + jsonpath-plus "^7.2.0" lodash.isobjectlike "^4.0.0" json-schema-traverse@^0.4.1: @@ -2486,10 +2495,10 @@ json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonpath-plus@^5.0.7: - version "5.1.0" - resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz#2fc4b2e461950626c98525425a3a3518b85af6c3" - integrity sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ== +jsonpath-plus@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz#7ad94e147b3ed42f7939c315d2b9ce490c5a3899" + integrity sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA== jsonwebtoken@^8.3.0, jsonwebtoken@^8.5.1: version "8.5.1" @@ -2555,14 +2564,6 @@ kuler@^2.0.0: resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - limiter@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2" @@ -2677,11 +2678,6 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - long@^5.0.0: version "5.2.3" resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" @@ -2900,9 +2896,9 @@ mv@~2: rimraf "~2.4.0" nan@^2.14.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" - integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== + version "2.18.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" + integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== ncp@~2.0.0: version "2.0.0" @@ -2973,9 +2969,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== nwsapi@^2.2.4: - version "2.2.5" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2" - integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ== + version "2.2.7" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" + integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== nyc@^14.0.0: version "14.1.1" @@ -3057,14 +3053,14 @@ object.assign@^4.1.4: object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3: - version "2.1.6" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312" - integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ== + version "2.1.7" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz#7a466a356cd7da4ba8b9e94ff6d35c3eeab5d56a" + integrity sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g== dependencies: - array.prototype.reduce "^1.0.5" + array.prototype.reduce "^1.0.6" call-bind "^1.0.2" define-properties "^1.2.0" - es-abstract "^1.21.2" + es-abstract "^1.22.1" safe-array-concat "^1.0.0" on-finished@2.4.1: @@ -3088,18 +3084,6 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -3218,11 +3202,6 @@ precond@0.2: resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ== -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - prettier@^2.8.1: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" @@ -3233,10 +3212,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -protobufjs@^7.0.0: - version "7.2.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2" - integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg== +protobufjs@^7.2.4: + version "7.2.5" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d" + integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -3408,19 +3387,19 @@ reconnect-core@1.3.0: dependencies: backoff "~2.5.0" -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== -regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== +regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" + integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== dependencies: call-bind "^1.0.2" define-properties "^1.2.0" - functions-have-names "^1.2.3" + set-function-name "^2.0.0" release-zalgo@^1.0.0: version "1.0.0" @@ -3476,11 +3455,11 @@ resolve-from@^4.0.0: integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== resolve@^1.10.0: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + version "1.22.6" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.6.tgz#dd209739eca3aef739c626fea1b4f3c506195362" + integrity sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw== dependencies: - is-core-module "^2.11.0" + is-core-module "^2.13.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -3510,13 +3489,13 @@ rrweb-cssom@^0.6.0: resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== -safe-array-concat@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" - integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== +safe-array-concat@^1.0.0, safe-array-concat@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c" + integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.2.0" + get-intrinsic "^1.2.1" has-symbols "^1.0.3" isarray "^2.0.5" @@ -3577,9 +3556,9 @@ secure-json-parse@^2.4.0: integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== "semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@5.0.1: version "5.0.1" @@ -3592,14 +3571,14 @@ semver@5.1.0: integrity sha512-sfKXKhcz5XVyfUZa2V4RbjK0xjOJCMLNF9H4p4v0UCo9wNHM/lH9RDuyDbGEtxWLMDlPBc8xI7AbbVLKXty+rQ== semver@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.3.8: - version "7.5.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" - integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -3642,6 +3621,15 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-function-name@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" + integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + dependencies: + define-data-property "^1.0.1" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.0" + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -3714,9 +3702,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.13" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" - integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== + version "3.0.15" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz#142460aabaca062bc7cd4cc87b7d50725ed6a4ba" + integrity sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ== sprintf-js@~1.0.2: version "1.0.3" @@ -3786,32 +3774,32 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== +string.prototype.trim@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" + integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== +string.prototype.trimend@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" + integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== +string.prototype.trimstart@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" + integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" string_decoder@^1.1.1: version "1.3.0" @@ -3882,9 +3870,9 @@ superagent@^3.8.3: readable-stream "^2.3.5" superagent@^8.0.9: - version "8.0.9" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.9.tgz#2c6fda6fadb40516515f93e9098c0eb1602e0535" - integrity sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA== + version "8.1.2" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.1.2.tgz#03cb7da3ec8b32472c9d20f6c2a57c7f3765f30b" + integrity sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA== dependencies: component-emitter "^1.3.0" cookiejar "^2.1.4" @@ -3929,9 +3917,9 @@ supports-preserve-symlinks-flag@^1.0.0: integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== swagger-ui-dist@>=4.11.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.0.0.tgz#26050eb6ae4341365ee01db18e75a5b5b347cce4" - integrity sha512-bwl6og9I9CAHKGSnYLKydjhBuH7d3oU6RX6uKN8oDCkLusTHXOW3sZMyBWjRtjGFnCMmN085oZoaR/4Wm9nIaQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.7.2.tgz#b783568cc7f494a9ad9173c9c98fd0cbbb5c851a" + integrity sha512-mVZc9QVQ6pTCV5crli3+Ng+DoMPwdtMHK8QLk2oX8Mtamp4D/hV+uYdC3lV0JZrDgpNEcjs0RrWTqMwwosuLPQ== swagger-ui-express@^4.1.3: version "4.6.3" @@ -3999,9 +3987,9 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -"topcoder-interface@github:topcoder-platform/plat-interface-definition#v0.0.58-beta-1": +"topcoder-interface@github:topcoder-platform/plat-interface-definition#v0.0.59-PLAT-3491.1": version "1.0.0" - resolved "https://codeload.github.com/topcoder-platform/plat-interface-definition/tar.gz/474bcfa1d01f0f2d0a2658de21aa835f4c824c44" + resolved "https://codeload.github.com/topcoder-platform/plat-interface-definition/tar.gz/7f024893ce167ba844a6e2f40557d1ff16b8376e" topo@3.x.x: version "3.0.3" @@ -4043,14 +4031,14 @@ tr46@^4.1.1: punycode "^2.3.0" triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" + integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== tslib@^2.4.1: - version "2.5.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" - integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== tunnel-agent@^0.6.0: version "0.6.0" @@ -4064,13 +4052,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - type-detect@^4.0.0, type-detect@^4.0.5: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" @@ -4084,6 +4065,36 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + typed-array-length@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" @@ -4257,17 +4268,16 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.2, which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== +which-typed-array@^1.1.11, which-typed-array@^1.1.2, which-typed-array@^1.1.9: + version "1.1.11" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" + integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== dependencies: available-typed-arrays "^1.0.5" call-bind "^1.0.2" for-each "^0.3.3" gopd "^1.0.1" has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" which@1.3.1, which@^1.2.9, which@^1.3.0: version "1.3.1" @@ -4293,9 +4303,9 @@ winston-transport@^4.5.0: triple-beam "^1.3.0" winston@^3.8.2: - version "3.9.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.9.0.tgz#2bbdeb8167a75fac6d9a0c6d002890cd908016c2" - integrity sha512-jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ== + version "3.10.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.10.0.tgz#d033cb7bd3ced026fed13bf9d92c55b903116803" + integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g== dependencies: "@colors/colors" "1.5.0" "@dabh/diagnostics" "^2.0.2" @@ -4309,11 +4319,6 @@ winston@^3.8.2: triple-beam "^1.3.0" winston-transport "^4.5.0" -word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -4347,9 +4352,9 @@ write-file-atomic@^2.4.2: signal-exit "^3.0.2" ws@^8.13.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + version "8.14.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" + integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== xml-name-validator@^4.0.0: version "4.0.0" From 3795b381d920839e776deaf8858dd558c6c7f293 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 2 Oct 2023 08:07:40 +0600 Subject: [PATCH 04/17] feat: upgrade @topcoder-framework/domain-challenge to support payment attribute in update messages Signed-off-by: Rakib Ansary --- package.json | 4 ++-- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 59c4ec35..4c26bdd9 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.0", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.0", + "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.1", + "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.1", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 6ac38b14..97d207cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,35 +250,35 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.0": - version "0.22.1-PLAT-3491.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.0.tgz#6810d0e93846fbcf36a064ca5de0552d52d1fc73" - integrity sha512-YR2rktsF9GNLS2fPuuBnYsl/enn1J7QRw9iuJ6hp8E/TXpSsGiYix3fabNIYhhx2X0nR4KJjQ1QG7/0KyfbwJw== +"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.1": + version "0.22.1-PLAT-3491.1" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.1.tgz#e2c995963259e0f6a3485c90cacc1e0f408643cf" + integrity sha512-o6e7NaEVfSDT1/bu09+3rxbnSfpjiJsuN9EFRq7IAvg52iT5YTj4ALA1CsJfrQHCOsODzu2XCsuPEF2jucWOKA== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.0" - topcoder-interface "0.1.0-PLAT-3491.2" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.1" + topcoder-interface "0.1.0-PLAT-3491.3" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.0": - version "0.22.1-PLAT-3491.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.0.tgz#aef296aa0ab3c313536a92189836ef44f8ea245c" - integrity sha512-zVikZ45hUtVkKYK0tYbHnpIYujEJlH82Mu1djVbfOpz01KcrRAcNEWfAwko8leiYl0OZ/h4oXjjl2WQTn6PxbA== +"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.1": + version "0.22.1-PLAT-3491.1" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.1.tgz#874a537a995a5de25b96d7ac157eabf585c124fb" + integrity sha512-N+U8brbBLXe1opUJJtdpOdXpX3YFvSy9uhVD8RgXvIsh5J4KT6UmvKzaF1+ZT3LGXxZc0BTMoTI/EzHPcj8stA== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.0" - topcoder-interface "0.1.0-PLAT-3491.2" + "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.1" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.1" + topcoder-interface "0.1.0-PLAT-3491.3" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.0": - version "0.22.1-PLAT-3491.0" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.0.tgz#f28dc049cb95ebe0ae527d62380dbb92dadd8744" - integrity sha512-BSqDCV5KdlKMM4Lu4Jf0TOMlR4aZozFfdU9vB9oZt3FWNFAVW4rtk2hf0If1eVcLjqftExd8CTN6G85kEHKIlQ== +"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.1": + version "0.22.1-PLAT-3491.1" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.1.tgz#1b40c5240cea085a6db76463b79adbcb0352094d" + integrity sha512-7/U/wo/AfDlhIwq5U9Wq6aWyVQJwT1f2JsP7rsvEaCdIgm/7FWzvDtaJwQoSX6IxgmJKASFxJhB4uYUwNkGnEQ== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-interface "0.1.0-PLAT-3491.2" + topcoder-interface "0.1.0-PLAT-3491.3" tslib "^2.4.1" "@types/body-parser@*": @@ -3989,10 +3989,10 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -topcoder-interface@0.1.0-PLAT-3491.2: - version "0.1.0-PLAT-3491.2" - resolved "https://registry.yarnpkg.com/topcoder-interface/-/topcoder-interface-0.1.0-PLAT-3491.2.tgz#399094cc8c0900f39e31adb33568476793f4b6a0" - integrity sha512-4jpv5bJ+eAPRZ41vJ4lIzGws5wu50xNJIjaZoZyIUfjLX9QZYlHkGiKPNLCf07c85hoUM0BgD2973a3mIR1GDg== +topcoder-interface@0.1.0-PLAT-3491.3: + version "0.1.0-PLAT-3491.3" + resolved "https://registry.yarnpkg.com/topcoder-interface/-/topcoder-interface-0.1.0-PLAT-3491.3.tgz#f73a5d4a69756397df4cde5bbb4cf42b1fa107cc" + integrity sha512-FlvpVdFf433VvX4TcEJxlhsaswcWFa8bXov2Zbly5cRs2r8yheDjquWxaFnqi0C9WCJkYiaF8EZKOcOKyt4iLQ== topo@3.x.x: version "3.0.3" From 1c446cb8a83077eef3a0f8ba07f25dd61a321ee3 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 3 Oct 2023 04:20:40 +0600 Subject: [PATCH 05/17] feat: include payments in challenge response * introduce versioned responses Signed-off-by: Rakib Ansary --- app-routes.js | 35 ++++++++++++++++++++++++++++ src/common/transformations.js | 24 +++++++++++++++++++ src/routes.js | 2 ++ src/services/ChallengeService.js | 14 +++++++---- src/services/ChallengeTypeService.js | 2 +- 5 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 src/common/transformations.js diff --git a/app-routes.js b/app-routes.js index 4a943233..696b5350 100644 --- a/app-routes.js +++ b/app-routes.js @@ -10,6 +10,7 @@ const helper = require("./src/common/helper"); const errors = require("./src/common/errors"); const logger = require("./src/common/logger"); const routes = require("./src/routes"); +const transformations = require("./src/common/transformations"); const authenticator = require("tc-core-library-js").middleware.jwtAuthenticator; /** @@ -17,6 +18,14 @@ const authenticator = require("tc-core-library-js").middleware.jwtAuthenticator; * @param app the express app */ module.exports = (app) => { + app.use((req, res, next) => { + req.appVersion = req.headers["app-version"] || "1.0.0"; + if (!transformations[req.appVersion]) { + req.appVersion = "1.0.0"; // default to 1.0.0 if provided version doesn't match any transformation + } + next(); + }); + // Load all routes _.each(routes, (verbs, path) => { _.each(verbs, (def, verb) => { @@ -36,6 +45,32 @@ module.exports = (app) => { next(); }); + if (def.versioned) { + actions.push((req, res, next) => { + // TODO: Overriding res.send is a temporary solution to inject version-based transformations. + // TODO: A more conventional approach in Express would be to use res.locals to pass data through middleware, + // TODO: and then send the response in a centralized middleware after all transformations are applied. + // TODO: This would require a refactor of the current controllers' response handling. + // TODO: Consider revisiting this implementation in the future for a more maintainable architecture. + + const originalSend = res.send; + + res.send = (data) => { + // Fetch the transformation function for the app version or default to "1.0.0" + const transformer = transformations[req.appVersion] || transformations["1.0.0"]; + const transformedData = transformer(data); + + // Reset the send function to its original behavior + res.send = originalSend; + + // Call the original send function with the transformed data + originalSend.call(res, transformedData); + }; + + next(); + }); + } + actions.push((req, res, next) => { if (_.get(req, "query.token")) { _.set(req, "headers.authorization", `Bearer ${_.trim(req.query.token)}`); diff --git a/src/common/transformations.js b/src/common/transformations.js new file mode 100644 index 00000000..81850d48 --- /dev/null +++ b/src/common/transformations.js @@ -0,0 +1,24 @@ +// Transformations for version 1.0.0 +function transformV1(data) { + if (Array.isArray(data)) { + return data.map((item) => { + const clonedItem = { ...item }; + delete clonedItem.payments; + return clonedItem; + }); + } else { + const clonedData = { ...data }; + delete clonedData.payments; + return clonedData; + } +} + +// Transformations for version 2.0.0 +function transformV2(data) { + return data; +} + +module.exports = { + "1.0.0": transformV1, + "2.0.0": transformV2, +}; diff --git a/src/routes.js b/src/routes.js index 74e571c8..fc425246 100644 --- a/src/routes.js +++ b/src/routes.js @@ -20,6 +20,7 @@ module.exports = { constants.UserRoles.User, ], scopes: [READ, ALL], + versioned: true, }, post: { controller: "ChallengeController", @@ -51,6 +52,7 @@ module.exports = { controller: "ChallengeController", method: "getChallenge", scopes: [READ, ALL], + versioned: true, }, // @deprecated put: { diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index 9b0fd8da..bda4510e 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -837,6 +837,10 @@ async function searchChallenges(currentUser, criteria) { if (element.status !== constants.challengeStatuses.Completed) { _.unset(element, "winners"); } + // TODO: in the long run we wanna do a finer grained filtering of the payments + if (!_hasAdminRole && !currentUser.isMachine) { + _.unset(element, "payments"); + } }); return { total, page, perPage, result }; @@ -1230,12 +1234,7 @@ async function getPhasesAndPopulate(data) { * @returns {Object} the challenge with given id */ async function getChallenge(currentUser, id, checkIfExists) { - // get challenge from Elasticsearch let challenge; - // logger.warn(JSON.stringify({ - // index: config.get('ES.ES_INDEX'), - // _id: id - // })) try { if (config.get("ES.OPENSEARCH") == "true") { challenge = ( @@ -1295,6 +1294,11 @@ async function getChallenge(currentUser, id, checkIfExists) { _.unset(challenge, "winners"); } + // TODO: in the long run we wanna do a finer grained filtering of the payments + if (!hasAdminRole(currentUser) && !currentUser.isMachine) { + _.unset(challenge, "payments"); + } + return challenge; } getChallenge.schema = { diff --git a/src/services/ChallengeTypeService.js b/src/services/ChallengeTypeService.js index 4a1afc60..454fbf4e 100644 --- a/src/services/ChallengeTypeService.js +++ b/src/services/ChallengeTypeService.js @@ -24,7 +24,7 @@ const challengeTypeDomain = new ChallengeTypeDomain( /** * Search challenge types * @param {Object} criteria the search criteria - * @returns {Object} the search result + * @returns {Promise} the search result */ async function searchChallengeTypes(criteria) { const scanCriteria = getScanCriteria(_.omit(criteria, ["page", "perPage"])); From 28c404148893e33bc2da471a513c6e891787658a Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 3 Oct 2023 16:07:00 +0600 Subject: [PATCH 06/17] fix: only transform successful responses Signed-off-by: Rakib Ansary --- app-routes.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app-routes.js b/app-routes.js index 696b5350..0b3bc880 100644 --- a/app-routes.js +++ b/app-routes.js @@ -54,17 +54,27 @@ module.exports = (app) => { // TODO: Consider revisiting this implementation in the future for a more maintainable architecture. const originalSend = res.send; + const originalStatus = res.status; + let currentStatusCode = 200; // Default status code for Express + + // Override res.status to capture the status code + res.status = function (code) { + currentStatusCode = code; + return originalStatus.apply(this, arguments); + }; res.send = (data) => { - // Fetch the transformation function for the app version or default to "1.0.0" - const transformer = transformations[req.appVersion] || transformations["1.0.0"]; - const transformedData = transformer(data); + // If the status code indicates a successful response, apply the transformation + if (currentStatusCode >= 200 && currentStatusCode < 300) { + const transformer = transformations[req.appVersion] || transformations["1.0.0"]; + data = transformer(data); + } // Reset the send function to its original behavior res.send = originalSend; - // Call the original send function with the transformed data - originalSend.call(res, transformedData); + // Call the original send function with the transformed (or original) data + originalSend.call(res, data); }; next(); From 336f6ed961d4a718b2b1c95173a491327b9b10ca Mon Sep 17 00:00:00 2001 From: eisbilir Date: Wed, 4 Oct 2023 04:32:36 +0300 Subject: [PATCH 07/17] fix: current user check --- src/services/ChallengeService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index bda4510e..ffa36b0d 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -838,7 +838,7 @@ async function searchChallenges(currentUser, criteria) { _.unset(element, "winners"); } // TODO: in the long run we wanna do a finer grained filtering of the payments - if (!_hasAdminRole && !currentUser.isMachine) { + if (!_hasAdminRole && !_.get(currentUser, "isMachine", false)) { _.unset(element, "payments"); } }); @@ -1295,7 +1295,7 @@ async function getChallenge(currentUser, id, checkIfExists) { } // TODO: in the long run we wanna do a finer grained filtering of the payments - if (!hasAdminRole(currentUser) && !currentUser.isMachine) { + if (!hasAdminRole(currentUser) && !_.get(currentUser, "isMachine", false)) { _.unset(challenge, "payments"); } From b595cca110be5b1ad458cfe75d4ef07c4c775a05 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Fri, 6 Oct 2023 14:42:21 +0600 Subject: [PATCH 08/17] update topcoder-framework/domain-challenge to support retry Signed-off-by: Rakib Ansary --- package.json | 4 ++-- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 4c26bdd9..82eab456 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.1", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.1", + "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.2", + "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.2", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 97d207cd..b8082009 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,31 +250,31 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.1": - version "0.22.1-PLAT-3491.1" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.1.tgz#e2c995963259e0f6a3485c90cacc1e0f408643cf" - integrity sha512-o6e7NaEVfSDT1/bu09+3rxbnSfpjiJsuN9EFRq7IAvg52iT5YTj4ALA1CsJfrQHCOsODzu2XCsuPEF2jucWOKA== +"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.2": + version "0.22.1-PLAT-3491.2" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.2.tgz#99632ad78231949256ce79915ea4c4443e2d77bc" + integrity sha512-WV4cxAuO3jZhqh/oB2lmmvvCEkTv7yqCpbbxLYZN3/EM54wOUhNvZh5sB13OlKYjeJNFWFUljs4QqOSOJxl7cg== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.1" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.2" topcoder-interface "0.1.0-PLAT-3491.3" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.1": - version "0.22.1-PLAT-3491.1" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.1.tgz#874a537a995a5de25b96d7ac157eabf585c124fb" - integrity sha512-N+U8brbBLXe1opUJJtdpOdXpX3YFvSy9uhVD8RgXvIsh5J4KT6UmvKzaF1+ZT3LGXxZc0BTMoTI/EzHPcj8stA== +"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.2": + version "0.22.1-PLAT-3491.2" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.2.tgz#912dc91fd459d36fefebced25749a384c61e4d98" + integrity sha512-aJIYUbwqTj9a5LH5OS8ciSWImOdboMQ2DjEefeqHNwyg8630pckhMlo8xD5Lon1Tga6KOzalT5jhwd6UdY3rpA== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.1" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.1" + "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.2" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.2" topcoder-interface "0.1.0-PLAT-3491.3" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.1": - version "0.22.1-PLAT-3491.1" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.1.tgz#1b40c5240cea085a6db76463b79adbcb0352094d" - integrity sha512-7/U/wo/AfDlhIwq5U9Wq6aWyVQJwT1f2JsP7rsvEaCdIgm/7FWzvDtaJwQoSX6IxgmJKASFxJhB4uYUwNkGnEQ== +"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.2": + version "0.22.1-PLAT-3491.2" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.2.tgz#c3d8f1abea076b3ae6bee6a9966d9b8ea1c05136" + integrity sha512-mJLODCZhnhYlz37OVOq7/7FykSXSCbkyZghJS6mggYOx54AHVfdwjE28t03se1q5vlVJmh3mTmFkAGhb8pRDmw== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" From 6940a12c210b11ada3ade7d944da77557839a303 Mon Sep 17 00:00:00 2001 From: liuliquan Date: Wed, 18 Oct 2023 22:13:05 +0800 Subject: [PATCH 09/17] feat: versioned responses via transformer --- package.json | 1 + src/common/transformer.js | 81 ++++++++++++++++++++++++++ src/controllers/ChallengeController.js | 19 +++--- yarn.lock | 5 ++ 4 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 src/common/transformer.js diff --git a/package.json b/package.json index 6a8db892..1b97984b 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "axios-retry": "^3.4.0", "bluebird": "^3.5.1", "body-parser": "^1.15.1", + "compare-versions": "^6.1.0", "config": "^3.0.1", "cors": "^2.8.5", "decimal.js": "^10.4.3", diff --git a/src/common/transformer.js b/src/common/transformer.js new file mode 100644 index 00000000..9469b4d3 --- /dev/null +++ b/src/common/transformer.js @@ -0,0 +1,81 @@ +const _ = require("lodash"); +const { compareVersions } = require("compare-versions"); +const challengeService = require("../services/ChallengeService"); + +function transformData(data, fieldsToDelete) { + if (!fieldsToDelete || !fieldsToDelete.length) { + return data; + } + + if (_.isArray(data)) { + return data.map((item) => transformData(item, fieldsToDelete)); + } else if (_.isObject(data)) { + const clonedData = { ...data }; + for (const field of fieldsToDelete) { + delete clonedData[field]; + } + if (clonedData.result) { + clonedData.result = transformData(clonedData.result, fieldsToDelete); + } + return clonedData; + } + + return data; +} + +function transformServices() { + _.each(services, (service, serviceName) => { + const serviceConfig = servicesConfig[serviceName]; + if (!serviceConfig) { + return; + } + + _.each(service, (method, methodName) => { + service[methodName] = async function () { + const args = Array.prototype.slice.call(arguments); + const data = await method.apply(this, args.slice(1)); + + // No transform need for this method + if (!serviceConfig.methods.includes(methodName)) { + return data; + } + + // args[0] is request, get version header + const apiVersion = args[0].headers["challenge-api-version"] || "1.0.0"; + + const fieldsToDelete = []; + _.each(serviceConfig.fieldsVersion, (version, field) => { + // If input version less than required version, delete fields from response + if (compareVersions(apiVersion, version) < 0) { + fieldsToDelete.push(field); + } + }); + + // Transform response data by deleting fields + return transformData(data, fieldsToDelete); + }; + service[methodName].params = ["req", ...method.params]; + }); + }); +} + +// Define the version config for services +const servicesConfig = { + challengeService: { + methods: ["searchChallenges", "getChallenge", "createChallenge", "updateChallenge"], + fieldsVersion: { + skills: "1.1.0", + payments: "2.0.0", + }, + }, +}; + +// Define the services to export +const services = { + challengeService, +}; + +// Transform services before export +transformServices(); + +module.exports = services; diff --git a/src/controllers/ChallengeController.js b/src/controllers/ChallengeController.js index fcf61e56..18c61937 100644 --- a/src/controllers/ChallengeController.js +++ b/src/controllers/ChallengeController.js @@ -2,7 +2,7 @@ * Controller for challenge endpoints */ const HttpStatus = require("http-status-codes"); -const service = require("../services/ChallengeService"); +const { challengeService: service } = require("../common/transformer"); const helper = require("../common/helper"); const logger = require("../common/logger"); @@ -12,7 +12,7 @@ const logger = require("../common/logger"); * @param {Object} res the response */ async function searchChallenges(req, res) { - let result = await service.searchChallenges(req.authUser, { + let result = await service.searchChallenges(req, req.authUser, { ...req.query, ...req.body, }); @@ -23,7 +23,7 @@ async function searchChallenges(req, res) { logger.debug(`Staring to get mm challengeId`); const legacyId = await helper.getProjectIdByRoundId(req.query.legacyId); logger.debug(`Get mm challengeId successfully ${legacyId}`); - result = await service.searchChallenges(req.authUser, { + result = await service.searchChallenges(req, req.authUser, { ...req.query, ...req.body, legacyId, @@ -50,7 +50,7 @@ async function createChallenge(req, res) { logger.debug( `createChallenge User: ${JSON.stringify(req.authUser)} - Body: ${JSON.stringify(req.body)}` ); - const result = await service.createChallenge(req.authUser, req.body, req.userToken); + const result = await service.createChallenge(req, req.authUser, req.body, req.userToken); res.status(HttpStatus.CREATED).send(result); } @@ -60,7 +60,7 @@ async function createChallenge(req, res) { * @param {Object} res the response */ async function sendNotifications(req, res) { - const result = await service.sendNotifications(req.authUser, req.params.challengeId); + const result = await service.sendNotifications(req, req.authUser, req.params.challengeId); res.status(HttpStatus.CREATED).send(result); } @@ -71,6 +71,7 @@ async function sendNotifications(req, res) { */ async function getChallenge(req, res) { const result = await service.getChallenge( + req, req.authUser, req.params.challengeId, req.query.checkIfExists @@ -84,7 +85,7 @@ async function getChallenge(req, res) { * @param {Object} res the response */ async function getChallengeStatistics(req, res) { - const result = await service.getChallengeStatistics(req.authUser, req.params.challengeId); + const result = await service.getChallengeStatistics(req, req.authUser, req.params.challengeId); res.send(result); } @@ -99,7 +100,7 @@ async function updateChallenge(req, res) { req.params.challengeId } - Body: ${JSON.stringify(req.body)}` ); - const result = await service.updateChallenge(req.authUser, req.params.challengeId, req.body); + const result = await service.updateChallenge(req, req.authUser, req.params.challengeId, req.body); res.send(result); } @@ -112,7 +113,7 @@ async function deleteChallenge(req, res) { logger.debug( `deleteChallenge User: ${JSON.stringify(req.authUser)} - ChallengeID: ${req.params.challengeId}` ); - const result = await service.deleteChallenge(req.authUser, req.params.challengeId); + const result = await service.deleteChallenge(req, req.authUser, req.params.challengeId); res.send(result); } @@ -122,7 +123,7 @@ async function deleteChallenge(req, res) { * @param {Object} res the response */ async function advancePhase(req, res) { - res.send(await service.advancePhase(req.authUser, req.params.challengeId, req.body)); + res.send(await service.advancePhase(req, req.authUser, req.params.challengeId, req.body)); } module.exports = { diff --git a/yarn.lock b/yarn.lock index a52ead2b..ae8800e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -978,6 +978,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== +compare-versions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a" + integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg== + component-emitter@^1.2.0, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" From 8aa77b2a81e81d01594e974a07599fcc7f05e98e Mon Sep 17 00:00:00 2001 From: liuliquan Date: Wed, 18 Oct 2023 22:44:15 +0800 Subject: [PATCH 10/17] feat: remove route transformer --- app-routes.js | 45 ----------------------------------- src/common/transformations.js | 24 ------------------- src/routes.js | 2 -- 3 files changed, 71 deletions(-) delete mode 100644 src/common/transformations.js diff --git a/app-routes.js b/app-routes.js index 0b3bc880..4a943233 100644 --- a/app-routes.js +++ b/app-routes.js @@ -10,7 +10,6 @@ const helper = require("./src/common/helper"); const errors = require("./src/common/errors"); const logger = require("./src/common/logger"); const routes = require("./src/routes"); -const transformations = require("./src/common/transformations"); const authenticator = require("tc-core-library-js").middleware.jwtAuthenticator; /** @@ -18,14 +17,6 @@ const authenticator = require("tc-core-library-js").middleware.jwtAuthenticator; * @param app the express app */ module.exports = (app) => { - app.use((req, res, next) => { - req.appVersion = req.headers["app-version"] || "1.0.0"; - if (!transformations[req.appVersion]) { - req.appVersion = "1.0.0"; // default to 1.0.0 if provided version doesn't match any transformation - } - next(); - }); - // Load all routes _.each(routes, (verbs, path) => { _.each(verbs, (def, verb) => { @@ -45,42 +36,6 @@ module.exports = (app) => { next(); }); - if (def.versioned) { - actions.push((req, res, next) => { - // TODO: Overriding res.send is a temporary solution to inject version-based transformations. - // TODO: A more conventional approach in Express would be to use res.locals to pass data through middleware, - // TODO: and then send the response in a centralized middleware after all transformations are applied. - // TODO: This would require a refactor of the current controllers' response handling. - // TODO: Consider revisiting this implementation in the future for a more maintainable architecture. - - const originalSend = res.send; - const originalStatus = res.status; - let currentStatusCode = 200; // Default status code for Express - - // Override res.status to capture the status code - res.status = function (code) { - currentStatusCode = code; - return originalStatus.apply(this, arguments); - }; - - res.send = (data) => { - // If the status code indicates a successful response, apply the transformation - if (currentStatusCode >= 200 && currentStatusCode < 300) { - const transformer = transformations[req.appVersion] || transformations["1.0.0"]; - data = transformer(data); - } - - // Reset the send function to its original behavior - res.send = originalSend; - - // Call the original send function with the transformed (or original) data - originalSend.call(res, data); - }; - - next(); - }); - } - actions.push((req, res, next) => { if (_.get(req, "query.token")) { _.set(req, "headers.authorization", `Bearer ${_.trim(req.query.token)}`); diff --git a/src/common/transformations.js b/src/common/transformations.js deleted file mode 100644 index 81850d48..00000000 --- a/src/common/transformations.js +++ /dev/null @@ -1,24 +0,0 @@ -// Transformations for version 1.0.0 -function transformV1(data) { - if (Array.isArray(data)) { - return data.map((item) => { - const clonedItem = { ...item }; - delete clonedItem.payments; - return clonedItem; - }); - } else { - const clonedData = { ...data }; - delete clonedData.payments; - return clonedData; - } -} - -// Transformations for version 2.0.0 -function transformV2(data) { - return data; -} - -module.exports = { - "1.0.0": transformV1, - "2.0.0": transformV2, -}; diff --git a/src/routes.js b/src/routes.js index fc425246..74e571c8 100644 --- a/src/routes.js +++ b/src/routes.js @@ -20,7 +20,6 @@ module.exports = { constants.UserRoles.User, ], scopes: [READ, ALL], - versioned: true, }, post: { controller: "ChallengeController", @@ -52,7 +51,6 @@ module.exports = { controller: "ChallengeController", method: "getChallenge", scopes: [READ, ALL], - versioned: true, }, // @deprecated put: { From 232dcf8f18ef1af8b0defa7b81cdccbb4ad2de9a Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 23 Oct 2023 15:35:54 +0600 Subject: [PATCH 11/17] chore: add logs Signed-off-by: Rakib Ansary --- package.json | 4 ++-- src/services/ChallengeService.js | 2 ++ yarn.lock | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 6b9fa03c..1fa15005 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.5", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.5", + "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.6", + "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.6", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index a40ae524..a3782f2b 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -1030,6 +1030,7 @@ async function createChallenge(currentUser, challenge, userToken) { if (challenge.phases && challenge.phases.length > 0) { challenge.endDate = helper.calculateChallengeEndDate(challenge); + console.log("End Date", challenge.endDate); } if (challenge.events == null) challenge.events = []; @@ -1040,6 +1041,7 @@ async function createChallenge(currentUser, challenge, userToken) { if (challenge.tags == null) challenge.tags = []; if (challenge.startDate != null) challenge.startDate = challenge.startDate; if (challenge.endDate != null) challenge.endDate = challenge.endDate; + console.log("END Date", challenge.endDate); if (challenge.discussions == null) challenge.discussions = []; if (challenge.skills == null) challenge.skills = []; diff --git a/yarn.lock b/yarn.lock index 6aab724f..bfe3a5b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,31 +250,31 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.5": - version "0.22.1-PLAT-3491.5" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.5.tgz#a457afdc28eb5378b45cf24b75007abb783945bf" - integrity sha512-kFajeGVQ1Q8yC6p5Rv6APVJ5zUPUBzKU48yVzOS6WrMoe+l6EKjjhC+QDQdI2NgLJKyBRrEELIf79sAgsMkygw== +"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.6": + version "0.22.1-PLAT-3491.6" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.6.tgz#e0afe9528f0066e736bba6a1773a9c270e7e491d" + integrity sha512-GOG+6IyVVmYWplx4L1yQjDx06I27+8lnRAegH5VffdgnOcEJd8XMmGahmMNJ82UsUz0T8OMT9Mi5iCXKidxipw== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.5" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.6" topcoder-proto-registry "0.1.0-PLAT-3491.5" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.5": - version "0.22.1-PLAT-3491.5" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.5.tgz#30120c07bdd4cdc3fbac62e1c98d56a0cb3558e0" - integrity sha512-mjo6mr0jrpmY6Rn0O+r2T45LYxfkLHo2lIr9UtXUj1yqrsG5hW3BAB0+Mk2nkzldcpQY1vO9KcPE13vPPPzcxA== +"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.6": + version "0.22.1-PLAT-3491.6" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.6.tgz#f0fa748255641fc0de0da357853ac22330c019c6" + integrity sha512-r7ZoJgS9pgyc8LXSdMn5rGo4t5G/d1OVTPNOsAEYxx7v1ov3gs847SJx16VWW78N4Tsa/xnOVuvFZD7UHEh2eg== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.5" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.5" + "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.6" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.6" topcoder-proto-registry "0.1.0-PLAT-3491.5" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.5": - version "0.22.1-PLAT-3491.5" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.5.tgz#9f188c94499cd7c78e0dd64db182623c71bc7d29" - integrity sha512-IVvK3traVHLhG9jxRqUcPLrheuv5jUS+VMkwh0IN1KK3rHYkf82oL7OqX8cCb5hKQc9Ujr546q969NcYjgOOxw== +"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.6": + version "0.22.1-PLAT-3491.6" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.6.tgz#5245a8eb61f9b05f88a196a074a93b488f4c74b3" + integrity sha512-1ZZoX3en9aBFLD8Q/6H075x2WO9oscpBUZWulMjiQd6Ify44IDCOQ7fHIRQTf52GmdEZjeULzUCs20qYywLU6w== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" From a7de55b940b2074811abb65eb9a271a29eb91234 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 23 Oct 2023 18:36:39 +0600 Subject: [PATCH 12/17] fix(headers): change "challenge-api-version" to "app-version" for version-based response handling --- src/common/transformer.js | 2 +- src/services/ChallengeService.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/transformer.js b/src/common/transformer.js index 14b6963f..86861f76 100644 --- a/src/common/transformer.js +++ b/src/common/transformer.js @@ -41,7 +41,7 @@ function transformServices() { // args[0] is request, get version header const request = args[0]; - const apiVersion = request.headers["challenge-api-version"] || "1.0.0"; + const apiVersion = request.headers["app-version"] || "1.0.0"; const fieldsToDelete = []; _.each(serviceConfig.fieldsVersion, (version, field) => { diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index a3782f2b..e0c5f2eb 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -1030,7 +1030,6 @@ async function createChallenge(currentUser, challenge, userToken) { if (challenge.phases && challenge.phases.length > 0) { challenge.endDate = helper.calculateChallengeEndDate(challenge); - console.log("End Date", challenge.endDate); } if (challenge.events == null) challenge.events = []; @@ -1041,7 +1040,6 @@ async function createChallenge(currentUser, challenge, userToken) { if (challenge.tags == null) challenge.tags = []; if (challenge.startDate != null) challenge.startDate = challenge.startDate; if (challenge.endDate != null) challenge.endDate = challenge.endDate; - console.log("END Date", challenge.endDate); if (challenge.discussions == null) challenge.discussions = []; if (challenge.skills == null) challenge.skills = []; @@ -1906,6 +1904,7 @@ async function updateChallenge(currentUser, challengeId, data) { } const updatedChallenge = await challengeDomain.lookup(getLookupCriteria("id", challengeId)); + await indexChallengeAndPostToKafka(updatedChallenge, track, type); if (updatedChallenge.legacy.selfService) { From efd2b2cc523b28196bb7d877f370a1683bcef7f2 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 30 Oct 2023 07:09:54 +0600 Subject: [PATCH 13/17] fix: take markup into account when locking/unlocking budget Signed-off-by: Rakib Ansary --- package.json | 4 +-- src/services/ChallengeService.js | 6 +++++ yarn.lock | 44 ++++++++++++++++---------------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 1fa15005..9a10f548 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.6", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.6", + "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.7", + "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.7", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index e0c5f2eb..be27d5cc 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -976,6 +976,11 @@ async function createChallenge(currentUser, challenge, userToken) { if (_.get(type, "isTask")) { _.set(challenge, "task.isTask", true); + // this is only applicable for WorkType: Gig, i.e., Tasks created from Salesforce + if (challenge.billing != null && challenge.billing.clientBillingRate != null) { + _.set(challenge, "billing.clientBillingRate", challenge.billing.clientBillingRate); + } + if (_.isUndefined(_.get(challenge, "task.isAssigned"))) { _.set(challenge, "task.isAssigned", false); } @@ -1117,6 +1122,7 @@ createChallenge.schema = { .keys({ billingAccountId: Joi.string(), markup: Joi.number().min(0).max(100), + clientBillRatio: Joi.number().min(0).max(1), }) .unknown(true), task: Joi.object().keys({ diff --git a/yarn.lock b/yarn.lock index bfe3a5b6..8bc59cd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,35 +250,35 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.6": - version "0.22.1-PLAT-3491.6" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.6.tgz#e0afe9528f0066e736bba6a1773a9c270e7e491d" - integrity sha512-GOG+6IyVVmYWplx4L1yQjDx06I27+8lnRAegH5VffdgnOcEJd8XMmGahmMNJ82UsUz0T8OMT9Mi5iCXKidxipw== +"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.7": + version "0.22.1-PLAT-3491.7" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.7.tgz#fc91505b6d880d0b5081c03ed6133f13bf2ba91d" + integrity sha512-4JWwEzPz1kfC33xcDz/mfA9AnWra6urmkgbpWDJNaHxnk8QIpdTU2m96ID4bRdl2U35NN83/qluJ5ubNzU+FVw== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.6" - topcoder-proto-registry "0.1.0-PLAT-3491.5" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.7" + topcoder-proto-registry "0.1.0-PLAT-3491.6" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.6": - version "0.22.1-PLAT-3491.6" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.6.tgz#f0fa748255641fc0de0da357853ac22330c019c6" - integrity sha512-r7ZoJgS9pgyc8LXSdMn5rGo4t5G/d1OVTPNOsAEYxx7v1ov3gs847SJx16VWW78N4Tsa/xnOVuvFZD7UHEh2eg== +"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.7": + version "0.22.1-PLAT-3491.7" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.7.tgz#ebf233d19964b6e6681948731ce2765a0d12bbe7" + integrity sha512-68pmBNPO2scr1U7ovZT332zse2m6GRYcvx05hrMeIspFtb8wzFODBg1EubDe+DdA5IDcSviIcEymkIeRxDEFIg== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.6" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.6" - topcoder-proto-registry "0.1.0-PLAT-3491.5" + "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.7" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.7" + topcoder-proto-registry "0.1.0-PLAT-3491.6" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.6": - version "0.22.1-PLAT-3491.6" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.6.tgz#5245a8eb61f9b05f88a196a074a93b488f4c74b3" - integrity sha512-1ZZoX3en9aBFLD8Q/6H075x2WO9oscpBUZWulMjiQd6Ify44IDCOQ7fHIRQTf52GmdEZjeULzUCs20qYywLU6w== +"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.7": + version "0.22.1-PLAT-3491.7" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.7.tgz#5c191a25839ac999d82a5e9ce0e3fbe2166c0eef" + integrity sha512-7Ih30HE/2PklAGSaxv06UnzG3oXi1331EY8hRHIYUW+Briec9DGyRs4F7Y9aqbo3jFLdjbZj75s0A0ytPRW1DA== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-proto-registry "0.1.0-PLAT-3491.5" + topcoder-proto-registry "0.1.0-PLAT-3491.6" tslib "^2.4.1" "@types/body-parser@*": @@ -4007,10 +4007,10 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -topcoder-proto-registry@0.1.0-PLAT-3491.5: - version "0.1.0-PLAT-3491.5" - resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0-PLAT-3491.5.tgz#578b13ed74535570a7cdf85ad9b019e9ef07c616" - integrity sha512-lNIEywdx8shuVQypkC4IfBmBG34boOA57u19HRsZb0MNhesHwjhdQcHfRFVW841gNkueQmXg0xsiqqGTzCtmtw== +topcoder-proto-registry@0.1.0-PLAT-3491.6: + version "0.1.0-PLAT-3491.6" + resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0-PLAT-3491.6.tgz#d021428fc804185b72f5735e7bd90643e63dc5b5" + integrity sha512-3R64M25t1saRfHFFsBQvEBr+wH7MMyRhd0LgHu4+Ba0A7atL5WNFuEBnM74c6mSe6a+Q30rl+EqeehIumVb8jw== topo@3.x.x: version "3.0.3" From c905c8e3364131b2378d2d931434e1878a627659 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 30 Oct 2023 07:27:08 +0600 Subject: [PATCH 14/17] chore: typo Signed-off-by: Rakib Ansary --- src/services/ChallengeService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index be27d5cc..dc9311d6 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -978,7 +978,7 @@ async function createChallenge(currentUser, challenge, userToken) { _.set(challenge, "task.isTask", true); // this is only applicable for WorkType: Gig, i.e., Tasks created from Salesforce if (challenge.billing != null && challenge.billing.clientBillingRate != null) { - _.set(challenge, "billing.clientBillingRate", challenge.billing.clientBillingRate); + _.set(challenge, "billing.clientBilingRate", challenge.billing.clientBillingRate); } if (_.isUndefined(_.get(challenge, "task.isAssigned"))) { @@ -1122,7 +1122,7 @@ createChallenge.schema = { .keys({ billingAccountId: Joi.string(), markup: Joi.number().min(0).max(100), - clientBillRatio: Joi.number().min(0).max(1), + clientBillingRate: Joi.number().min(0).max(100), }) .unknown(true), task: Joi.object().keys({ From 2dd47f67ec8624e9162fcf26fce2463181193825 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 30 Oct 2023 15:04:46 +0600 Subject: [PATCH 15/17] fix: typo Signed-off-by: Rakib Ansary --- package.json | 4 +-- src/services/ChallengeService.js | 2 +- yarn.lock | 44 ++++++++++++++++---------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 9a10f548..5b18cbcf 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.7", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.7", + "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.8", + "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.8", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index dc9311d6..ae8d47e7 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -978,7 +978,7 @@ async function createChallenge(currentUser, challenge, userToken) { _.set(challenge, "task.isTask", true); // this is only applicable for WorkType: Gig, i.e., Tasks created from Salesforce if (challenge.billing != null && challenge.billing.clientBillingRate != null) { - _.set(challenge, "billing.clientBilingRate", challenge.billing.clientBillingRate); + _.set(challenge, "billing.clientBillingRate", challenge.billing.clientBillingRate); } if (_.isUndefined(_.get(challenge, "task.isAssigned"))) { diff --git a/yarn.lock b/yarn.lock index 8bc59cd3..6b42d623 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,35 +250,35 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.7": - version "0.22.1-PLAT-3491.7" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.7.tgz#fc91505b6d880d0b5081c03ed6133f13bf2ba91d" - integrity sha512-4JWwEzPz1kfC33xcDz/mfA9AnWra6urmkgbpWDJNaHxnk8QIpdTU2m96ID4bRdl2U35NN83/qluJ5ubNzU+FVw== +"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.8": + version "0.22.1-PLAT-3491.8" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.8.tgz#a4cba29557861819d1ee0878af93979046ff4b56" + integrity sha512-3Rgw7bngKYfcJxSeThbsvRILgN+aG3F2dnC4YUUM8wrMmYnbsbb0K+/3+Ugcqtrgnrsb/7Y4wr/U0Lqkz1W1gA== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.7" - topcoder-proto-registry "0.1.0-PLAT-3491.6" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.8" + topcoder-proto-registry "0.1.0-PLAT-3491.7" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.7": - version "0.22.1-PLAT-3491.7" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.7.tgz#ebf233d19964b6e6681948731ce2765a0d12bbe7" - integrity sha512-68pmBNPO2scr1U7ovZT332zse2m6GRYcvx05hrMeIspFtb8wzFODBg1EubDe+DdA5IDcSviIcEymkIeRxDEFIg== +"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.8": + version "0.22.1-PLAT-3491.8" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.8.tgz#93e9bf459ac58ed699caed73959b9f30dae8f1d2" + integrity sha512-bfDLaCpgjl4ioC0/UdVGsxdl3N2Y4EkCnYQXwhfGG8wzOrdWUinvSM1oPuFWY8AAWLxnF4HgsxYyWlYJ26AM/Q== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.7" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.7" - topcoder-proto-registry "0.1.0-PLAT-3491.6" + "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.8" + "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.8" + topcoder-proto-registry "0.1.0-PLAT-3491.7" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.7": - version "0.22.1-PLAT-3491.7" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.7.tgz#5c191a25839ac999d82a5e9ce0e3fbe2166c0eef" - integrity sha512-7Ih30HE/2PklAGSaxv06UnzG3oXi1331EY8hRHIYUW+Briec9DGyRs4F7Y9aqbo3jFLdjbZj75s0A0ytPRW1DA== +"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.8": + version "0.22.1-PLAT-3491.8" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.8.tgz#d7705b141065fecfb02ccc0cea2c01e8fa03cc47" + integrity sha512-wPHugu/qGFGEVQcyU5MV/7lTiPT1FW26p+P7kvWZYGrZADp7phbnCdQFxxFnC7JdSoSXYhagqPGH1sm2YVGcwg== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-proto-registry "0.1.0-PLAT-3491.6" + topcoder-proto-registry "0.1.0-PLAT-3491.7" tslib "^2.4.1" "@types/body-parser@*": @@ -4007,10 +4007,10 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -topcoder-proto-registry@0.1.0-PLAT-3491.6: - version "0.1.0-PLAT-3491.6" - resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0-PLAT-3491.6.tgz#d021428fc804185b72f5735e7bd90643e63dc5b5" - integrity sha512-3R64M25t1saRfHFFsBQvEBr+wH7MMyRhd0LgHu4+Ba0A7atL5WNFuEBnM74c6mSe6a+Q30rl+EqeehIumVb8jw== +topcoder-proto-registry@0.1.0-PLAT-3491.7: + version "0.1.0-PLAT-3491.7" + resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0-PLAT-3491.7.tgz#6f2743ff54348f64f1455eb7eb3022656ae94e87" + integrity sha512-BbxAoGEbdDrCIBeI+bIHe+ov3bWSI8wfjyW+SPHbXFi4YyCbb+24vypYK787x+pqAN74l8/G5n/xSf5ZPwB8AQ== topo@3.x.x: version "3.0.3" From 0ee167283ba08411b873dfe02c09a9c4660cbd9f Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Sun, 12 Nov 2023 06:54:28 +0600 Subject: [PATCH 16/17] fix: preserve precision Signed-off-by: Rakib Ansary --- src/common/project-helper.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/project-helper.js b/src/common/project-helper.js index e344267d..c7c3392c 100644 --- a/src/common/project-helper.js +++ b/src/common/project-helper.js @@ -69,8 +69,7 @@ class ProjectHelper { : null; if (markup && markup > 0) { - // Change int returned from api to decimal - markup = markup / 100; + markup = (markup * 100) / 10000; } return { billingAccountId: _.get(res, "data.tcBillingAccountId", null), From 390820e6461a9816bfa3b4a77008dc2d3478da4e Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Mon, 13 Nov 2023 19:57:06 +0600 Subject: [PATCH 17/17] chore: use release version Signed-off-by: Rakib Ansary --- package.json | 4 ++-- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 5b18cbcf..2226eb2f 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "dependencies": { "@grpc/grpc-js": "^1.8.12", "@opensearch-project/opensearch": "^2.2.0", - "@topcoder-framework/domain-challenge": "^0.22.1-PLAT-3491.8", - "@topcoder-framework/lib-common": "^0.22.1-PLAT-3491.8", + "@topcoder-framework/domain-challenge": "^0.24.0", + "@topcoder-framework/lib-common": "^0.24.0", "aws-sdk": "^2.1145.0", "axios": "^0.19.0", "axios-retry": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 6b42d623..e8d35dd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -250,35 +250,35 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@topcoder-framework/client-relational@^0.22.1-PLAT-3491.8": - version "0.22.1-PLAT-3491.8" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.22.1-PLAT-3491.8.tgz#a4cba29557861819d1ee0878af93979046ff4b56" - integrity sha512-3Rgw7bngKYfcJxSeThbsvRILgN+aG3F2dnC4YUUM8wrMmYnbsbb0K+/3+Ugcqtrgnrsb/7Y4wr/U0Lqkz1W1gA== +"@topcoder-framework/client-relational@^0.24.0": + version "0.24.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/client-relational/-/client-relational-0.24.0.tgz#07ee26b1a35f3a5c4c7d7f2ec7300efbc63cf311" + integrity sha512-H+sHV9pKDW6urMZLr//NLmC2XDX6obrEy1dynpmF2W1AgkMFDgWy9euevAjPNWqnZvScW08N3c8yPwQ43/akaw== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.8" - topcoder-proto-registry "0.1.0-PLAT-3491.7" + "@topcoder-framework/lib-common" "^0.24.0" + topcoder-proto-registry "0.1.0" tslib "^2.4.1" -"@topcoder-framework/domain-challenge@^0.22.1-PLAT-3491.8": - version "0.22.1-PLAT-3491.8" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.22.1-PLAT-3491.8.tgz#93e9bf459ac58ed699caed73959b9f30dae8f1d2" - integrity sha512-bfDLaCpgjl4ioC0/UdVGsxdl3N2Y4EkCnYQXwhfGG8wzOrdWUinvSM1oPuFWY8AAWLxnF4HgsxYyWlYJ26AM/Q== +"@topcoder-framework/domain-challenge@^0.24.0": + version "0.24.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/domain-challenge/-/domain-challenge-0.24.0.tgz#023e57b95cc5213650eebffb860939b61d9b8068" + integrity sha512-RDD7D8Mk8hFkONuGEAYk2E7SMhBWGWtH3CJHsRoANn+7HzkeiGe48WCZRCdNI+5ygFmm3oKltMOf9lB/PD8RMw== dependencies: "@grpc/grpc-js" "^1.8.0" - "@topcoder-framework/client-relational" "^0.22.1-PLAT-3491.8" - "@topcoder-framework/lib-common" "^0.22.1-PLAT-3491.8" - topcoder-proto-registry "0.1.0-PLAT-3491.7" + "@topcoder-framework/client-relational" "^0.24.0" + "@topcoder-framework/lib-common" "^0.24.0" + topcoder-proto-registry "0.1.0" tslib "^2.4.1" -"@topcoder-framework/lib-common@^0.22.1-PLAT-3491.8": - version "0.22.1-PLAT-3491.8" - resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.22.1-PLAT-3491.8.tgz#d7705b141065fecfb02ccc0cea2c01e8fa03cc47" - integrity sha512-wPHugu/qGFGEVQcyU5MV/7lTiPT1FW26p+P7kvWZYGrZADp7phbnCdQFxxFnC7JdSoSXYhagqPGH1sm2YVGcwg== +"@topcoder-framework/lib-common@^0.24.0": + version "0.24.0" + resolved "https://topcoder-409275337247.d.codeartifact.us-east-1.amazonaws.com/npm/topcoder-framework/@topcoder-framework/lib-common/-/lib-common-0.24.0.tgz#a6baeeb3e1d3ad15cd0c010aaa7a62769a908a90" + integrity sha512-lKTqHYyVRdSs8JvXT9MYpxe4bY/ysIksCvj7OJUtntExkRjv7EPBysofjb7H4uNsofa2G5iOGycJtp+Qhaqb8Q== dependencies: "@grpc/grpc-js" "^1.8.0" rimraf "^3.0.2" - topcoder-proto-registry "0.1.0-PLAT-3491.7" + topcoder-proto-registry "0.1.0" tslib "^2.4.1" "@types/body-parser@*": @@ -4007,10 +4007,10 @@ topcoder-bus-api-wrapper@topcoder-platform/tc-bus-api-wrapper.git: superagent "^3.8.3" tc-core-library-js appirio-tech/tc-core-library-js.git#v2.6.4 -topcoder-proto-registry@0.1.0-PLAT-3491.7: - version "0.1.0-PLAT-3491.7" - resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0-PLAT-3491.7.tgz#6f2743ff54348f64f1455eb7eb3022656ae94e87" - integrity sha512-BbxAoGEbdDrCIBeI+bIHe+ov3bWSI8wfjyW+SPHbXFi4YyCbb+24vypYK787x+pqAN74l8/G5n/xSf5ZPwB8AQ== +topcoder-proto-registry@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/topcoder-proto-registry/-/topcoder-proto-registry-0.1.0.tgz#7bdcb7df7c8bbf9d54beba1c69a6210d0f4ca097" + integrity sha512-2RYGdDfCaX02pNcJu7ofb26O0SPe4MA6yfvpzXx6DjiuGtZu5QSZHkeaxqAlzRc9/F5zfWmGJwin4TOppo2xrA== topo@3.x.x: version "3.0.3"