Skip to content

Commit

Permalink
Develop (#1463)
Browse files Browse the repository at this point in the history
* fix api test

Signed-off-by: simvalery <[email protected]>

* remove console.logs

Signed-off-by: simvalery <[email protected]>

* add namespace to .env file

Signed-off-by: simvalery <[email protected]>

* implement hashicorp wallet

Signed-off-by: simvalery <[email protected]>

* fix docker-compose.yml

Signed-off-by: simvalery <[email protected]>

* fix lint

Signed-off-by: simvalery <[email protected]>

* fix api tests

Signed-off-by: simvalery <[email protected]>

* test api tests

Signed-off-by: simvalery <[email protected]>

* test

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* test

Signed-off-by: simvalery <[email protected]>

* test

Signed-off-by: simvalery <[email protected]>

* fix config

Signed-off-by: simvalery <[email protected]>

* fix api test

Signed-off-by: simvalery <[email protected]>

* remove console.logs

Signed-off-by: simvalery <[email protected]>

* add namespace to .env file

Signed-off-by: simvalery <[email protected]>

* fix assigned

* add database-vault provider

Signed-off-by: simvalery <[email protected]>

* GitBook: [#181] Corrected multiSignBlock

* fix notifier

* fix worker retry

* fix lint

Signed-off-by: simvalery <[email protected]>

* fix lint

Signed-off-by: simvalery <[email protected]>

* add application global keys to storage

Signed-off-by: simvalery <[email protected]>

* keys migrations

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* add demo policy

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix test

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix blank screen

Signed-off-by: artembuslaev <[email protected]>

* fix common ordering in aggregation of dryrun

Signed-off-by: artembuslaev <[email protected]>

* fix preset in schema form

Signed-off-by: artembuslaev <[email protected]>

* additional properties in blocks

Signed-off-by: artembuslaev <[email protected]>

* added remote work policy

Signed-off-by: artembuslaev <[email protected]>

* fix

Signed-off-by: artembuslaev <[email protected]>

* fix multi sig

* add pop event in aggregate

* fix

* move transactions to workers

Signed-off-by: simvalery <[email protected]>

* move transactions to workers

Signed-off-by: simvalery <[email protected]>

* fix tests

Signed-off-by: simvalery <[email protected]>

* added multiple items to trust chain

Signed-off-by: artembuslaev <[email protected]>

* fix

Signed-off-by: artembuslaev <[email protected]>

* fix transaction logger events

Signed-off-by: simvalery <[email protected]>

* refactor token events

Signed-off-by: simvalery <[email protected]>

* fix email validator

Signed-off-by: simvalery <[email protected]>

* fix tests

Signed-off-by: simvalery <[email protected]>

* up version

Signed-off-by: simvalery <[email protected]>

* Create readme.md

* change display multiple documents in trust chain item

Signed-off-by: artembuslaev <[email protected]>

* fix balance

Signed-off-by: simvalery <[email protected]>

* Dovu demo artifacts (#1347)

* DOVU demo artefacts for guardian documentation

Signed-off-by: Matt Smithies <[email protected]>

* Update readme.md

Signed-off-by: Matt Smithies <[email protected]>

Signed-off-by: Matt Smithies <[email protected]>
Co-authored-by: Matt Smithies <[email protected]>

* Added Hashicorp configuration in ReadMe

* Added iREC Differences

* Create readme.md

* Create readme.md

* Add files via upload

* fix button visible

* fix max priority

Signed-off-by: simvalery <[email protected]>

* fix priority

* GitBook: [#183] No subject

* Updated Remote Workflow ReadMe

* Delete Demo Artifacts/Remote Work directory

* Update readme.md

* Added Version Differences in Verra

* Update readme.md

* Update readme.md

* GitBook: [#184] No subject

* GitBook: [#185] Remote Workflow Policy Blocks

* GitBook: [#186] Updated Discovering Intro

* Update README.md

* up version

Signed-off-by: simvalery <[email protected]>

* up version

Signed-off-by: simvalery <[email protected]>

* GitBook: [#187] Updated IREC and Verra Timestamps

* fix transaction-logger
fix block config
add operator key validator

* limit schemas

* split messages to chunks

Signed-off-by: artembuslaev <[email protected]>

* added policy artifacts

Signed-off-by: artembuslaev <[email protected]>

* added mapping to remote work policy

Signed-off-by: artembuslaev <[email protected]>

* fix message size

* add block

* fix page size

* update

* fix token mapping

* fix token mapping

* changes in swagger

Signed-off-by: artembuslaev <[email protected]>

* fix message chunking

Signed-off-by: artembuslaev <[email protected]>

* fix

* fix

Signed-off-by: artembuslaev <[email protected]>

* fix

* update sdk

* fix

* fix lint

* test config

* test config

* Delete Remote Work GHG Policy.policy

* Add files via upload

* Delete Demo Artifacts/Remote Work directory

* Update readme.md

* up version

Signed-off-by: simvalery <[email protected]>

* Update readme.md

* fix

Signed-off-by: simvalery <[email protected]>

* Update readme.md

* GitBook: [#190] Updated IREC images

* set hidden type for private key field

Signed-off-by: artembuslaev <[email protected]>

* fix multiple in drag-n-drop component

Signed-off-by: artembuslaev <[email protected]>

* change accounts description

Signed-off-by: artembuslaev <[email protected]>

* change remote work policy

Signed-off-by: artembuslaev <[email protected]>

* did document syntax

Signed-off-by: simvalery <[email protected]>

* Update readme.md

* beautify vc-dialog

Signed-off-by: simvalery <[email protected]>

* fix style

* Update readme.md

* Update readme.md

* Update readme.md

* GitBook: [#191] Verra Demo Updated

* GitBook: [#192] Corrected Account ID description

* GitBook: [#193] corrected Verra Demo

* update import schemas, update error messages

* update verra policy

* Create readme.md

* GitBook: [#195] Artifacts Demo

* Update readme.md

* fix

Signed-off-by: artembuslaev <[email protected]>

* implement international mapping in remote work policy and change to scope 3

Signed-off-by: artembuslaev <[email protected]>

* add indexes

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* GitBook: [#196] Updated Verra Timestamp

* Create readme.md

* apply desktop usage to monitors in remote work policy

Signed-off-by: artembuslaev <[email protected]>

* fixed typo in account user type

Signed-off-by: artembuslaev <[email protected]>

* fix deps

Signed-off-by: simvalery <[email protected]>

* added skip event in token confirmation block

Signed-off-by: artembuslaev <[email protected]>

* added error event, restore event

Signed-off-by: artembuslaev <[email protected]>

* added custom hedera account value to mint block

Signed-off-by: artembuslaev <[email protected]>

* add validation to restore data

Signed-off-by: artembuslaev <[email protected]>

* remove skip event, added associate and other operations validation

Signed-off-by: artembuslaev <[email protected]>

* fixed policy converter

Signed-off-by: artembuslaev <[email protected]>

* add validation

* fix error message

* fixed token action, confirmations blocks, implemented account info in dry run

Signed-off-by: artembuslaev <[email protected]>

* fixed editing of system schema, added restore data for schemas

Signed-off-by: artembuslaev <[email protected]>

* update remote work policy

Signed-off-by: artembuslaev <[email protected]>

* add demo policy

* added verification for credential subject in custom logic block

Signed-off-by: artembuslaev <[email protected]>

* fix duplicated common sorting option

Signed-off-by: artembuslaev <[email protected]>

* updated timers settings in remote work policy

Signed-off-by: artembuslaev <[email protected]>

* fixed header for mobile phones

Signed-off-by: artembuslaev <[email protected]>

* parallel mint

Signed-off-by: simvalery <[email protected]>

* updated mobile displaying

Signed-off-by: artembuslaev <[email protected]>

* fix worker error messages

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix lint

Signed-off-by: simvalery <[email protected]>

* fix lint

Signed-off-by: simvalery <[email protected]>

* index aggregate-documents.ts

Signed-off-by: simvalery <[email protected]>

* fixed policy 'save as' action with artifacts

Signed-off-by: artembuslaev <[email protected]>

* made user info label clickable

Signed-off-by: artembuslaev <[email protected]>

* GitBook: [#197] Updated New Events

* updated countries in remote work policy

Signed-off-by: artembuslaev <[email protected]>

* GitBook: [#198] added Status parameter to the hello world

* #1424

* add new block

* fixed copy block action

Signed-off-by: artembuslaev <[email protected]>

* update split documents

* update split documents

* update demo

* update name

* restore data from hedera

Signed-off-by: simvalery <[email protected]>

* fix grid fields

* fix lint

Signed-off-by: simvalery <[email protected]>

* fix lint

Signed-off-by: simvalery <[email protected]>

* bump version

Signed-off-by: simvalery <[email protected]>

* fix

* fix

* force unseal hashicorp vault

Signed-off-by: simvalery <[email protected]>

* fix unseal

Signed-off-by: simvalery <[email protected]>

* fix mistype

Signed-off-by: simvalery <[email protected]>

* GitBook: [#199] Restore Data functionality added

* database default vault provider

Signed-off-by: simvalery <[email protected]>

* #1326

* Create README.md

* Create README.md

* added tymlez guardian-policies

Signed-off-by: artembuslaev <[email protected]>

* fix import tokens without key

* Delete README.md

* Updating git ignore to remove IDE and OSX nonsense files

Signed-off-by: Matt Smithies <[email protected]>

* Adding Carbon Space MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Geotree MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Grain Data Solution MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Soil Carbon Coalition MRV

Signed-off-by: Matt Smithies <[email protected]>

* Update README.md

Signed-off-by: Matt Smithies <[email protected]>

* Update readme.md

Signed-off-by: Matt Smithies <[email protected]>

* Updated Tymlez in ReadMe

* Delete Demo Artifacts/Dovu/policies/Grain Data Solution MRV  directory

* fixed condition required fields

Signed-off-by: artembuslaev <[email protected]>

* restore

Signed-off-by: simvalery <[email protected]>

* fix image build

Signed-off-by: simvalery <[email protected]>

* fix mint ft tokens

Signed-off-by: simvalery <[email protected]>

* fix user id in dry run

* fix update step block

Signed-off-by: simvalery <[email protected]>
Signed-off-by: Stepan Kiryakov <[email protected]>
Signed-off-by: artembuslaev <[email protected]>
Signed-off-by: Matt Smithies <[email protected]>
Co-authored-by: Stepan Kiryakov <[email protected]>
Co-authored-by: prernaa.agarwal <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: prernaadev01 <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: anvabr <[email protected]>
Co-authored-by: Matt Smithies <[email protected]>
Co-authored-by: gitbook-bot <[email protected]>
Co-authored-by: dubgeis <[email protected]>
Co-authored-by: Stepan Kirjakov <[email protected]>
  • Loading branch information
11 people authored Oct 31, 2022
1 parent f1e2ef2 commit 7c17dec
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export function BasicBlock<T>(options: Partial<PolicyBlockDecoratorOptions>) {
if (typeof super.refreshAction === 'function') {
return await super.refreshAction(event);
}
this.updateBlock(event.data, event.user, '');
this.updateBlock(event.data, event.user, this.tag);
}

/**
Expand Down Expand Up @@ -400,8 +400,15 @@ export function BasicBlock<T>(options: Partial<PolicyBlockDecoratorOptions>) {
if (this.permissions.includes('OWNER') || this.permissions.includes('ANY_ROLE')) {
users[this.policyOwner] = new PolicyUser(this.policyOwner);
}
if (user) {
if (this.permissions.includes(user.role)) {
users[user.did] = user;
} else if (this.permissions.includes('ANY_ROLE')) {
users[user.did] = user;
}
}
}
} else {
} else if (user) {
users[user.did] = user;
}
for (const item of Object.values(users)) {
Expand Down
2 changes: 1 addition & 1 deletion guardian-service/src/policy-engine/helpers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export class PolicyUtils {
} else {
try {
await workers.addTask({
type: WorkerTaskType.TRANSFER_NFT,
type: WorkerTaskType.MINT_FT,
data: {
hederaAccountId: root.hederaAccountId,
hederaAccountKey: root.hederaAccountKey,
Expand Down
5 changes: 5 additions & 0 deletions guardian-service/src/policy-engine/policy-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ export class PolicyUser implements IPolicyUser {
this.did = user.did;
this.virtual = true;
this.username = user.username;
if (this.group) {
this.id = `${this.group}:${this.did}`;
} else {
this.id = this.did;
}
}
return this;
}
Expand Down

0 comments on commit 7c17dec

Please sign in to comment.