Skip to content

Commit

Permalink
Merge branch 'develop' into feature/move-to-fastify
Browse files Browse the repository at this point in the history
  • Loading branch information
Ihar committed May 7, 2024
2 parents 7ff59cb + a247421 commit aeac7d2
Show file tree
Hide file tree
Showing 25 changed files with 49 additions and 55 deletions.
6 changes: 3 additions & 3 deletions ai-service/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions analytics-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
6 changes: 3 additions & 3 deletions api-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fastify/formbody": "^7.4.0",
"@fastify/multipart": "^8.2.0",
"@fastify/static": "^7.0.0",
Expand Down Expand Up @@ -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"
}
8 changes: 6 additions & 2 deletions api-gateway/src/helpers/interceptors/cache.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion api-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api-tests",
"version": "2.24.0",
"version": "2.24.1",
"description": "API Tests",
"main": "index.js",
"type": "module",
Expand Down
6 changes: 3 additions & 3 deletions auth-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -87,5 +87,5 @@
"test:stability": "mocha tests/stability.test.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
2 changes: 1 addition & 1 deletion docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 📖 Introduction to Verra Redd+
# 📖 Introduction to Verra VM0007 Redd+

## Policy Description:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ Starting with the [Wikipedia definition](https://en.wikipedia.org/wiki/Workflow\
| externalTopicBlock | This block allows to configure the link to Hedera topics established by other policy instances for monitoring of ‘document published’ messages and ingestion of the targeted VC documents. | [externalTopicBlock](externaltopicblock.md) |
| messagesReportBlock | This block allows to create report based on the inter-referenced messages. | [messagesReportBlock](messagesreportblock.md) |
| notificationBlock | This block is used to generate notifications | [notificationBlock](notificationblock.md) |
| externalDataBlock | This block extractDataBlock provides means to extract a data set which corresponds to any of these embedded schemas (at any depth level) | [externalDataBlock](external-data-workflow-block.md) |
| extractDataBlock | This block extractDataBlock provides means to extract a data set which corresponds to any of these embedded schemas (at any depth level) | [extractDataBlock](externaldatablock.md) |
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,3 @@ To get complete information about tools, please refer to [Tools](https://github.
### 3. Filtering Policies

On the Policy page, it is now possible to filter the policies list by policy name and tags. All available tags are presented in the dropdown list, which you can create using "Create Tag" for each policy, which makes it easier using the filter.

<figure><img src="https://lh5.googleusercontent.com/niLoA-E6sdH74IXdUX514BCi3jhVaVyAWSL8Wv2R6Q4Q7bByIjJ0pz_Excj03G8IinI0andv7_ofcOTfQsa7qA0iLvut7aBJKRc-OCYN-wDuXpDW-qStQDCeArB4L-kLn6ML4u2fvlLsh3uFnezbOdw" alt=""><figcaption></figcaption></figure>

Here is an example of the iRec 5 policy being filtered by the policy name and the tag

<figure><img src="https://lh3.googleusercontent.com/JES1SjPxRpRV67BdDjLjyHSkMc1lruWnT7gHsgRH-o1vudbC1zIU6ePqwFZn-LAwBfiDInEgmLinYLvCG7Zk3zO-VILjiJc6q1annSJXma7Exzfoffi_oXSYrBF_oCwzFTjwGCvGvNKLAYpved-_Kj8" alt=""><figcaption></figcaption></figure>

Below is an example of the iRec 7 policy being filtered by the policy name

<figure><img src="https://lh6.googleusercontent.com/YqP8nZcyRLqZd1b2VihDJjR28ggY2l7peWtkxXiecjsrL-zL9V0jnsg0_zrlaI81zqxgizVDoFJy9vZIAud7sZmrLI1djegv-MsT6GSrbdlKZaTZ7OqdJvwrg6WVSanovRq0xBhmVVZjy3fx8NdrEns" alt=""><figcaption></figcaption></figure>
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@
"test": "ng test",
"watch": "ng build --watch --configuration development --output-path ../www-data"
},
"version": "2.24.0"
"version": "2.24.1"
}
6 changes: 3 additions & 3 deletions guardian-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,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",
"@hashgraph/sdk": "2.34.1",
"@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
"@meeco/cryppo": "^2.0.2",
Expand Down Expand Up @@ -99,5 +99,5 @@
"test:stability": "mocha tests/stability.test.mjs"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
2 changes: 1 addition & 1 deletion interfaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
6 changes: 3 additions & 3 deletions logger-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,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",
"@mikro-orm/core": "^6.1.11",
"@mikro-orm/mongodb": "^6.1.11",
"@nestjs/common": "^9.4.1",
Expand Down Expand Up @@ -54,5 +54,5 @@
"watch": "nodemon src/index.ts"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
4 changes: 2 additions & 2 deletions mrv-sender/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"image-size": "1.0.2"
},
"dependencies": {
"@guardian/common": "^2.24.0",
"@guardian/common": "^2.24.1",
"@transmute/credentials-context": "0.7.0-unstable.80",
"@transmute/did-context": "0.7.0-unstable.80",
"@transmute/ed25519-signature-2018": "0.7.0-unstable.80",
Expand Down Expand Up @@ -44,5 +44,5 @@
"start": "node dist/index.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
6 changes: 3 additions & 3 deletions notification-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,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",
"@mikro-orm/core": "^6.1.11",
"@mikro-orm/mongodb": "^6.1.11",
"@nestjs/common": "^9.4.1",
Expand Down Expand Up @@ -53,5 +53,5 @@
"watch": "nodemon src/index.ts"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"ai-service",
"notification-service"
],
"version": "2.24.0",
"version": "2.24.1",
"devDependencies": {
"detect-secrets": "^1.0.6"
},
Expand Down
6 changes: 3 additions & 3 deletions policy-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,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",
"@hashgraph/sdk": "2.34.1",
"@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
"@meeco/cryppo": "2.0.2",
Expand Down Expand Up @@ -97,5 +97,5 @@
"test:stability": "mocha tests/stability.test.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export class PolicyComponentsUtils {
public static getDocumentCacheFields(policyId: string) {
let cache = PolicyComponentsUtils.DocumentCacheFieldsMap.get(policyId);
if (!cache) {
cache = new Set<string>();
cache = new Set<string>(['id', 'credentialSubject.id', 'credentialSubject.0.id']);
PolicyComponentsUtils.DocumentCacheFieldsMap.set(policyId, cache);
}
return cache;
Expand Down
2 changes: 1 addition & 1 deletion swagger-analytics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ info:
the heart of the Guardian solution is a sophisticated Policy Workflow Engine
(PWE) that enables applications to offer a requirements-based tokenization
implementation.
version: 2.24.0
version: 2.24.1
contact:
name: API developer
url: https://envisionblockchain.com
Expand Down
2 changes: 1 addition & 1 deletion swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10319,7 +10319,7 @@ info:
the heart of the Guardian solution is a sophisticated Policy Workflow Engine
(PWE) that enables applications to offer a requirements-based tokenization
implementation.
version: 2.24.0
version: 2.24.1
contact:
name: API developer
url: https://envisionblockchain.com
Expand Down
2 changes: 1 addition & 1 deletion topic-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
"start": "node dist/index.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
2 changes: 1 addition & 1 deletion tree-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"start": "node dist/index.js"
},
"type": "module",
"version": "2.24.0"
"version": "2.24.1"
}
6 changes: 3 additions & 3 deletions worker-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"author": "Envision Blockchain Solutions <[email protected]>",
"dependencies": {
"@filebase/client": "^0.0.5",
"@guardian/common": "^2.24.0",
"@guardian/interfaces": "^2.24.0",
"@guardian/common": "^2.24.1",
"@guardian/interfaces": "^2.24.1",
"@hashgraph/sdk": "2.34.1",
"@nestjs/common": "^9.4.1",
"@nestjs/core": "^9.4.1",
Expand Down Expand Up @@ -66,5 +66,5 @@
},
"type": "module",
"types": "dist/index.d.ts",
"version": "2.24.0"
"version": "2.24.1"
}

0 comments on commit aeac7d2

Please sign in to comment.