Merging Develop into Main for the 2.24.1 hotfix (#3636)

* disable policy dropdown for editing schemas Signed-off-by: simvalery <[email protected]> * fix image upload bug Signed-off-by: simvalery <[email protected]> * fix image upload bug Signed-off-by: simvalery <[email protected]> * load images into database in dryRun mode Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * remove console.log Signed-off-by: simvalery <[email protected]> * GITBOOK-134: Added PWRM0002 Demo guide * GITBOOK-135: 3311 ticket changes updated * Create Readme.md of PWRM0002 * Update timestamps of Tool 13, 14 16 * Create readme.md of Hackathon * Add files via upload * fix file upload issue fix clear dry run files Signed-off-by: simvalery <[email protected]> * apply only image upload Signed-off-by: simvalery <[email protected]> * feat: contarization redis cache service * fix draft schemas in wisard Signed-off-by: simvalery <[email protected]> * fix amount Signed-off-by: artembuslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * use global common and interfaces modules Signed-off-by: simvalery <[email protected]> * Add files via upload * bump version Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * increase timeout for import tool * feat: add esm for api-tests * feat: move to esm common service * feat: move to esm worker-service * feat: move to esm policy and guardian services * feat: move dev.js to esm * feat: move to esm modules in gulp files api auth worker guardian policy logger notification * feat: esm in ecosystem config * refactor code * feat: add js extention for imports in ai analytics services * feat: add extention in application events service * feat: add extentions for auth service * feat: add extention guardian * fix: ai auth analytics application events services * feat: add extentions for api gateway service * fix: api-gateway * :wqfeat: add extention in common service * fix: common service * feat: esm for logger service * fix: configs for target es2022 * feat: esm to policy service * feat: esm to notification service * feat: esm for interfaces * feat: esm for tree viever mrv sender topic viever * refactor code * fix: error with id by create update base entityes * feat: increase vertions of mongodb and microorm for esm * fix: policy and guardian services on dry run * fix: lint error unused import in guardian service * fix: unit tests pre build * fix: bson vertion for current mongo * fix: get user undefined for get blocks and post groups * fix: dirname in mrv sender * fix: remove inject decorator in all places * feat: increase bson guardian and policy * fix: imports inside services * fix: merge conflicts * Revert "fix: merge conflicts" This reverts commit afc2f2f. * fix: merge conflicts * fix: extentions and ts config for microservises * Update README.md * fix: pass context across super and declare prop * fix: revert inject decorators across declare * [skip ci] Add swagger.yaml * fix: merge develop ai service * added change tools while importing policy Signed-off-by: artembuslaev <[email protected]> * added token update endpoint Signed-off-by: artembuslaev <[email protected]> * [skip ci] Add swagger.yaml * fix Signed-off-by: artembuslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * fix Signed-off-by: artembuslaev <[email protected]> * update publishing policies script [skip ci] Signed-off-by: artembuslaev <[email protected]> * fix auth for update token api Signed-off-by: artembuslaev <[email protected]> * [skip ci] Add swagger.yaml * refactoring Signed-off-by: artembuslaev <[email protected]> * [skip ci] Add swagger.yaml * update cdm policies [skip ci] Signed-off-by: artembuslaev <[email protected]> * added some tests for contracts and flow for irec4 * update status code for tests * fix bottom margin for tools changing [skip ci] Signed-off-by: artembuslaev <[email protected]> * Dockerfiles revised Signed-off-by: Alexander Pyatakov <[email protected]> * node image replaced with the slim version Signed-off-by: Alexander Pyatakov <[email protected]> * node version moved to arg Signed-off-by: Alexander Pyatakov <[email protected]> * Dockerfiles has been revamped to reduce the size of the final images Signed-off-by: Alexander Pyatakov <[email protected]> * Added/Modified .dockerignore files Signed-off-by: Alexander Pyatakov <[email protected]> * Optimize caching with "COPY --link" Signed-off-by: Alexander Pyatakov <[email protected]> * Run applications as a non-root user and use init:true for containers Signed-off-by: Alexander Pyatakov <[email protected]> * Yarn cache directory defined as an argument Signed-off-by: Alexander Pyatakov <[email protected]> * Yarn cache fix Signed-off-by: Alexander Pyatakov <[email protected]> * Permissions changes Signed-off-by: Alexander Pyatakov <[email protected]> * Base node image is changed to alpine Signed-off-by: Alexander Pyatakov <[email protected]> * GITBOOK-136: Added Filebase docs * added bad_request const for status code * added publishing contract file script Signed-off-by: artembuslaev <[email protected]> * fix: migrate to redict cache store * Revert "Merge branch 'develop' into feat/move-to-es-modules-develop" This reverts commit 6da2788, reversing changes made to 0c8b832. * Revert "fix: merge with develop" This reverts commit 0c8b832, reversing changes made to 0fec16a. * Revert "Revert "fix: merge with develop"" This reverts commit 5610fa5. * Revert "Revert "Merge branch 'develop' into feat/move-to-es-modules-develop"" This reverts commit c48aa0f. * added nfts limit in contracts Signed-off-by: Artem Buslaev <[email protected]> * upd contracts [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * fix script [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-137: Updated Changing Tools in UI section * Update readme.md of ML readme * remove output [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * fix Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-139: Added section on how to deploy contracts using your own account * Update readme.md * GITBOOK-140: Added Atma Scope 3 policy demo * GITBOOK-142: Added Dovu MMCM * update iii.f [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * feat: performance interceptor * cache-endpoints Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * update policies [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * fix: extentions gulp files in description dockerfiles * update policies [skip ci] Signed-off-by: Artem Buslaev <[email protected]> * feat: wrap endpoinds in cache * GITBOOK-143: added ExternalDataBlock details * feat: use cache with apply decorators * fix: file name import * fix: get user only if auth token exist * feat: add perf hooks in performance interceptor * fix: add express flag for projects/properties route * setup user profile Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * sign with fireblocks Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * user fireblocks config Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix serials column Signed-off-by: Artem Buslaev <[email protected]> * remove res where it possible and add res.locals.data * GITBOOK-144: Added Changing of Tools during Policy import APIs added * fix fireblocks sign bug Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * add ui validators, add exception Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * temp fix validators Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * GITBOOK-145: Added youtube demo video for PWRM0002 * GITBOOK-146: Updated Guardian Introduction * fix: remove cache from policies/:policyId/groups * fix Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * Policy Preview/Import performance optimisations Signed-off-by: Alexander Pyatakov <[email protected]> * fixed fields parsing for compare Signed-off-by: Alexander Pyatakov <[email protected]> * parseConditions function improvements Signed-off-by: Alexander Pyatakov <[email protected]> * fix generate xlsx Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-147: Made some minor corrections * test Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * added policy data migration Signed-off-by: Artem Buslaev <[email protected]> * [skip ci] Add swagger.yaml * fix Signed-off-by: Artem Buslaev <[email protected]> * fix Signed-off-by: Artem Buslaev <[email protected]> * fix lint Signed-off-by: Artem Buslaev <[email protected]> * remove types/mime resolution Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * Add files via upload * fix signing Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix linting Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix autocomplete Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * remove singleton from fireblocks-helper.ts Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * fix Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * docs: add instruction for launch cache container in readme file * bump version Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml * GITBOOK-148: Added Live Project Data Migration UI * GITBOOK-149: Fireblocks Docs added * added migrating retire pools and dynamic tokens Signed-off-by: Artem Buslaev <[email protected]> * [skip ci] Add swagger.yaml * fix Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-150: ACM0001 guide added * fix lint Signed-off-by: Artem Buslaev <[email protected]> * Update readme.md of ACM0001 * fix Signed-off-by: Artem Buslaev <[email protected]> * GITBOOK-151: Added migration policy data APIs * hotfix: remove cache for contract routes * GITBOOK-152: Added redict in Prerequisites * GITBOOK-153: Added Prerequisites * GITBOOK-154: Added Token template to migration * GITBOOK-155: Added fireblocks note * hotfix/remove-cache-from-tags-schemas * GITBOOK-156: Updated roadmap * GITBOOK-157: Updated roadmap * fix: remove cache from navigation * GITBOOK-158: Made some changes in SD * fix cache document id Signed-off-by: Stepan Kiryakov <[email protected]> * fix cache document id Signed-off-by: Stepan Kiryakov <[email protected]> * fix cache document id Signed-off-by: Stepan Kiryakov <[email protected]> * GITBOOK-159: made some minor corrections * GITBOOK-160: updated extractdatablock * fix: error status if token is not correct * bump version Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]> * [skip ci] Add swagger.yaml --------- Signed-off-by: simvalery <[email protected]> Signed-off-by: artembuslaev <[email protected]> Signed-off-by: Alexander Pyatakov <[email protected]> Signed-off-by: Artem Buslaev <[email protected]> Signed-off-by: Stepan Kiryakov <[email protected]> Co-authored-by: Artem Buslaev <[email protected]> Co-authored-by: envision-ci-agent <[email protected]> Co-authored-by: prernaa.agarwal <[email protected]> Co-authored-by: Celiant <[email protected]> Co-authored-by: Ihar <[email protected]> Co-authored-by: Andrey (Envision Blockchain) <[email protected]> Co-authored-by: Alexander Pyatakov <[email protected]> Co-authored-by: Stepan Kiryakov <[email protected]>
hashgraph · May 6, 2024 · 616a957 · 616a957
1 parent a65b898
commit 616a957
Show file tree

Hide file tree

Showing 27 changed files with 236 additions and 143 deletions.
diff --git a/ai-service/package.json b/ai-service/package.json
@@ -1,11 +1,11 @@
 {
   "name": "ai-service",
-  "version": "2.24.0",
+    "version": "2.24.1",
   "main": "dist/app.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@guardian/common": "^2.24.0",
-    "@guardian/interfaces": "^2.24.0",
+      "@guardian/common": "^2.24.1",
+      "@guardian/interfaces": "^2.24.1",
     "@mikro-orm/core": "^6.1.11",
     "@mikro-orm/mongodb": "^6.1.11",
     "@nestjs/common": "^9.4.1",

diff --git a/analytics-service/package.json b/analytics-service/package.json
@@ -13,8 +13,8 @@
     },
     "author": "Envision Blockchain Solutions <[email protected]>",
     "dependencies": {
-        "@guardian/common": "^2.24.0",
-        "@guardian/interfaces": "^2.24.0",
+        "@guardian/common": "^2.24.1",
+        "@guardian/interfaces": "^2.24.1",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@nestjs/jwt": "^10.0.3",
@@ -82,5 +82,5 @@
         "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
     },
     "type": "module",
-    "version": "2.24.0"
+    "version": "2.24.1"
 }
diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -6,8 +6,8 @@
   },
   "author": "Envision Blockchain Solutions <[email protected]>",
   "dependencies": {
-    "@guardian/common": "^2.24.0",
-    "@guardian/interfaces": "^2.24.0",
+    "@guardian/common": "^2.24.1",
+    "@guardian/interfaces": "^2.24.1",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/jwt": "^10.0.3",
@@ -78,5 +78,5 @@
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
   "type": "module",
-  "version": "2.24.0"
+  "version": "2.24.1"
 }
diff --git a/api-gateway/src/api/service/policy.ts b/api-gateway/src/api/service/policy.ts
@@ -653,7 +653,7 @@ export class PolicyApi {
     @ApiSecurity('bearerAuth')
     @Get('/:policyId/navigation')
     @HttpCode(HttpStatus.OK)
-    @UseCache()
+    // @UseCache()
     async getPolicyNavigation(@Req() req): Promise<any> {
         await checkPermission(UserRole.STANDARD_REGISTRY, UserRole.USER)(req.user);
         const engineService = new PolicyEngine();

diff --git a/api-gateway/src/api/service/tags.ts b/api-gateway/src/api/service/tags.ts
@@ -5,7 +5,6 @@ import { SchemaUtils } from '../../helpers/schema-utils.js';
 import { Controller, Delete, Get, HttpCode, HttpException, HttpStatus, Post, Put, Req, Response } from '@nestjs/common';
 import { checkPermission } from '../../auth/authorization-helper.js';
 import { ApiTags } from '@nestjs/swagger';
-import { UseCache } from '../../helpers/decorators/cache.js';
 
 @Controller('tags')
 @ApiTags('tags')
@@ -144,7 +143,7 @@ export class TagsApi {
      */
     @Get('/schemas')
     @HttpCode(HttpStatus.OK)
-    @UseCache({ isExpress: true })
+    // @UseCache({ isExpress: true })
     async getSchemas(@Req() req, @Response() res): Promise<any> {
         await checkPermission(UserRole.STANDARD_REGISTRY)(req.user);
         try {

diff --git a/api-gateway/src/helpers/interceptors/cache.ts b/api-gateway/src/helpers/interceptors/cache.ts
@@ -1,4 +1,4 @@
-import { Injectable, NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
+import { Injectable, NestInterceptor, ExecutionContext, CallHandler, HttpException, HttpStatus } from '@nestjs/common';
 
 import crypto from 'crypto';
 
@@ -29,7 +29,11 @@ export class CacheInterceptor implements NestInterceptor {
 
     if(token) {
       const users: Users = new Users();
-      user = await users.getUserByToken(token);
+      try {
+        user = await users.getUserByToken(token);
+      } catch (error) {
+        throw new HttpException(error.message, HttpStatus.UNAUTHORIZED)
+      }
     }
 
     const hashUser: string = crypto.createHash('md5').update(JSON.stringify(user)).digest('hex');

diff --git a/api-tests/package.json b/api-tests/package.json
@@ -1,6 +1,6 @@
 {
     "name": "api-tests",
-    "version": "2.24.0",
+    "version": "2.24.1",
     "description": "API Tests",
     "main": "index.js",
     "type": "module",

diff --git a/auth-service/package.json b/auth-service/package.json
@@ -10,8 +10,8 @@
       "image-size": "1.0.2"
   },
   "dependencies": {
-    "@guardian/common": "^2.24.0",
-    "@guardian/interfaces": "^2.24.0",
+      "@guardian/common": "^2.24.1",
+      "@guardian/interfaces": "^2.24.1",
     "@meeco/cryppo": "^2.0.2",
     "@mikro-orm/core": "^6.1.11",
     "@mikro-orm/mongodb": "^6.1.11",
@@ -75,5 +75,5 @@
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
   "type": "module",
-  "version": "2.24.0"
+    "version": "2.24.1"
 }
diff --git a/common/package.json b/common/package.json
@@ -5,7 +5,7 @@
     "@azure/identity": "^3.2.2",
     "@azure/keyvault-secrets": "^4.7.0",
     "@google-cloud/secret-manager": "^4.2.2",
-    "@guardian/interfaces": "^2.24.0",
+    "@guardian/interfaces": "^2.24.1",
     "@hashgraph/sdk": "2.34.1",
     "@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
     "@meeco/cryppo": "^2.0.2",
@@ -87,5 +87,5 @@
     "test:stability": "mocha tests/stability.test.js"
   },
   "type": "module",
-  "version": "2.24.0"
+  "version": "2.24.1"
 }
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
@@ -152,7 +152,7 @@
         * [historyAddon](guardian/standard-registry/policies/policy-creation/introduction/historyaddon.md)
         * [selectiveAttributes Block](guardian/standard-registry/policies/policy-creation/introduction/selectiveattributes-block.md)
         * [tagsManagerBlock](guardian/standard-registry/policies/policy-creation/introduction/tagsmanagerblock.md)
-        * [externalDataBlock](guardian/standard-registry/policies/policy-creation/introduction/externaldatablock.md)
+        * [extractDataBlock](guardian/standard-registry/policies/policy-creation/introduction/externaldatablock.md)
         * [externalTopicBlock](guardian/standard-registry/policies/policy-creation/introduction/externaltopicblock.md)
         * [messagesReportBlock](guardian/standard-registry/policies/policy-creation/introduction/messagesreportblock.md)
         * [notificationBlock](guardian/standard-registry/policies/policy-creation/introduction/notificationblock.md)
@@ -529,7 +529,7 @@
 * [👾 Automation Testing](guardian/automation-testing/README.md)
   * [💻 Performing API Automation Testing](guardian/automation-testing/how-to-perform-api-automation-testing.md)
   * [💻 Performing UI Automation Testing](guardian/automation-testing/performing-ui-automation-testing.md)
-* [📔 Guidance for Open Source Policy](guardian/guidance-for-open-source-policy.md)
+* [📔 Guidance for Open Source Policy Submissions](guardian/guidance-for-open-source-policy.md)
 * [📝 Demo Guide](guardian/demo-guide/README.md)
   * [🔋 Renewable Energy Credits](guardian/demo-guide/renewable-energy-credits/README.md)
     * [📖 Introduction to International Renewable Energy Credit Standard (iREC)](guardian/demo-guide/renewable-energy-credits/introduction-to-international-renewable-energy-credit-standard-irec.md)