Hotfix/2.13.1 (#2231)

* use json request limit Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * disable built-in body-parser Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix grid common sorting Signed-off-by: artembuslaev <[email protected]> * disable sorting for not text columns Signed-off-by: artembuslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * bump version Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * GITBOOK-357: added descriptions Signed-off-by: simvalery <[email protected]> * GITBOOK-359: added Schema and Policy definition * fixed publishing same schema version Signed-off-by: artembuslaev <[email protected]> --------- Signed-off-by: simvalery <[email protected]> Signed-off-by: artembuslaev <[email protected]> Co-authored-by: artembuslaev <[email protected]> Co-authored-by: prernaa.agarwal <[email protected]>
hashgraph · Jun 5, 2023 · 2aeaa5f · 2aeaa5f
1 parent 86106a9
commit 2aeaa5f
Show file tree

Hide file tree

Showing 101 changed files with 347 additions and 217 deletions.
diff --git a/api-docs/package.json b/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-docs",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "Swagger Documentation",
   "main": "dist/index.js",
   "scripts": {

diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -8,8 +8,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.13.0",
-    "@guardian/interfaces": "^2.13.0",
+    "@guardian/common": "^2.13.1",
+    "@guardian/interfaces": "^2.13.1",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/microservices": "^9.4.1",
@@ -63,5 +63,5 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
-  "version": "2.13.0"
+  "version": "2.13.1"
 }
diff --git a/api-gateway/src/api/service/schema.ts b/api-gateway/src/api/service/schema.ts
@@ -365,6 +365,7 @@ export class SchemaApi {
             const allVersion = await guardians.getSchemasByUUID(schema.uuid);
             if (allVersion.findIndex(s => s.version === version) !== -1) {
                 taskManager.addError(taskId, { code: 500, message: 'Version already exists.' });
+                return;
             }
             taskManager.addStatus(taskId, 'Load schema data', StatusType.COMPLETED);
             await guardians.publishSchemaAsync(schemaId, version, user.did, taskId);

diff --git a/api-gateway/src/app.module.ts b/api-gateway/src/app.module.ts
@@ -28,6 +28,7 @@ import hpp from 'hpp';
 import { ThemesApi } from '@api/service/themes';
 import { TrustChainsOldApi } from '@api/service/trustchains';
 
+const JSON_REQUEST_LIMIT = process.env.JSON_REQUEST_LIMIT || '1mb';
 const RAW_REQUEST_LIMIT = process.env.RAW_REQUEST_LIMIT || '1gb';
 
 @Module({
@@ -92,6 +93,9 @@ export class AppModule {
         consumer.apply(authorizationHelper).forRoutes(TrustChainsApi);
         consumer.apply(authorizationHelper).forRoutes(WizardApi);
 
+        consumer.apply(express.json({
+            limit: JSON_REQUEST_LIMIT
+        })).forRoutes('*');
         consumer.apply(express.raw({
             inflate: true,
             limit: RAW_REQUEST_LIMIT,

diff --git a/api-gateway/src/app.ts b/api-gateway/src/app.ts
@@ -26,7 +26,8 @@ const PORT = process.env.PORT || 3002;
 
 Promise.all([
     NestFactory.create(AppModule, {
-        rawBody: true
+        rawBody: true,
+        bodyParser: false
     }),
     MessageBrokerChannel.connect('API_GATEWAY'),
 ]).then(async ([app, cn]) => {

diff --git a/api-tests/package.json b/api-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api-tests",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "API Tests",
   "main": "index.js",
   "scripts": {

diff --git a/auth-service/package.json b/auth-service/package.json
@@ -6,8 +6,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.13.0",
-    "@guardian/interfaces": "^2.13.0",
+    "@guardian/common": "^2.13.1",
+    "@guardian/interfaces": "^2.13.1",
     "@mikro-orm/core": "~5.7.7",
     "@mikro-orm/mongodb": "~5.7.7",
     "@nestjs/common": "^9.4.1",
@@ -53,5 +53,5 @@
     "start": "node dist/index.js",
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
-  "version": "2.13.0"
+  "version": "2.13.1"
 }
diff --git a/common/package.json b/common/package.json
@@ -4,7 +4,7 @@
     "@aws-sdk/client-secrets-manager": "^3.319.0",
     "@azure/identity": "^3.2.2",
     "@azure/keyvault-secrets": "^4.7.0",
-    "@guardian/interfaces": "^2.13.0",
+    "@guardian/interfaces": "^2.13.1",
     "@hashgraph/sdk": "^2.24.2",
     "@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
     "@meeco/cryppo": "^2.0.2",
@@ -64,5 +64,5 @@
     "test:local": "mocha tests/**/*.test.js --exit",
     "test:stability": "mocha tests/stability.test.js"
   },
-  "version": "2.13.0"
+  "version": "2.13.1"
 }
diff --git a/configs/.env..guardian.system b/configs/.env..guardian.system
@@ -13,19 +13,19 @@ HEDERA_NET="testnet"
 PREUSED_HEDERA_NET="testnet"
 
 # TESTNET
-OPERATOR_ID="..."
-OPERATOR_KEY="..."
+OPERATOR_ID="0.0.10295"
+OPERATOR_KEY="302e020100300506032b65700422042022c85d6c64bda64aa458cf715314c5469b3b84c58690470f5289cbada3af8dfb"
 INITIALIZATION_TOPIC_ID="0.0.2030"
 
 # # LOCALNODE
 # LOCALNODE_ADDRESS="..."
 # LOCALNODE_PROTOCOL="http"
 # OPERATOR_ID="0.0.2"
-# OPERATOR_KEY="302e020100300506032b65700422042091132178e72057a1d7528025956fe39b0b847f200ab59b2fdd367017f3087137" 
+# OPERATOR_KEY="302e020100300506032b65700422042091132178e72057a1d7528025956fe39b0b847f200ab59b2fdd367017f3087137"
 
 # # PREVIEWNET
-# OPERATOR_ID="..." 
-# OPERATOR_KEY="..." 
+# OPERATOR_ID="..."
+# OPERATOR_KEY="..."
 # INITIALIZATION_TOPIC_ID="0.0.155110"
 
 SEND_KEYS_TO_VAULT="TRUE"
@@ -63,11 +63,11 @@ REFRESH_INTERVAL="60"
 IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
-IPFS_STORAGE_API_KEY="..."
+IPFS_STORAGE_API_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDZhY0FFMmM3QjA5ODdCMjU1ZGZFMjMxZTA0YzI5NDZBZWI0YzE5NkQiLCJpc3MiOiJ3ZWIzLXN0b3JhZ2UiLCJpYXQiOjE2NjAwNzIyNzg4MDgsIm5hbWUiOiJ0ZXN0In0.vzt0-vBlbKiUSeyBZ6i3qTBKVMR3RL7CnkEXVNqvSH4"
 IPFS_NODE_ADDRESS="http://ipfs-node:5002"
 
 #BATCH_NFT_MINT_SIZE=10
-# FE/DEMO  
+# FE/DEMO
 # --------------
 INITIAL_BALANCE="100"
 INITIAL_STANDARD_REGISTRY_BALANCE="100"
@@ -87,4 +87,3 @@ BBS_SIGNATURES_MODE="WASM"
 # MQ_MESSAGE_CHUNK=5000000
 # RAW_REQUEST_LIMIT="1gb"
 # JSON_REQUEST_LIMIT="1mb"
-