From 37a8bda47023adcd9caa4c172dd3a04c4dd401f2 Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Mon, 24 Jul 2023 22:13:49 +0100 Subject: [PATCH 1/7] simplified active tokens interface --- src/client/__tests__/client.spec.ts | 2 +- src/client/index.ts | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/client/__tests__/client.spec.ts b/src/client/__tests__/client.spec.ts index 61686161..4fb29b9a 100644 --- a/src/client/__tests__/client.spec.ts +++ b/src/client/__tests__/client.spec.ts @@ -340,7 +340,7 @@ describe('client spec', () => { test('tokenNegotiatorClient method eventSender event hook functions', async () => { const tokenNegotiatorClient = getOffChainConfigClient() tokenNegotiatorClient.eventSender('emitAllTokensToClient', []) - tokenNegotiatorClient.eventSender('emitSelectedTokensToClient', { selectedTokens: null }) + tokenNegotiatorClient.eventSender('emitSelectedTokensToClient', null) tokenNegotiatorClient.eventSender('emitProofToClient', { data: 'test', issuer: 'devcon', error: null }) tokenNegotiatorClient.eventSender('emitNetworkChange', '0x1') }) diff --git a/src/client/index.ts b/src/client/index.ts index 38cdd149..778f44d0 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -466,9 +466,7 @@ export class Client { } if (this.config.autoEnableTokens && Object.keys(this.tokenStore.getSelectedTokens()).length) - this.eventSender('tokens-selected', { - selectedTokens: this.tokenStore.getSelectedTokens(), - }) + this.eventSender('tokens-selected', this.tokenStore.getSelectedTokens()) if (openPopup || (this.config.uiOptions.autoPopup === true && autoOpenPopup)) this.ui.openOverlay() } @@ -685,9 +683,7 @@ export class Client { } if (this.config.autoEnableTokens) { - this.eventSender('tokens-selected', { - selectedTokens: this.tokenStore.getSelectedTokens(), - }) + this.eventSender('tokens-selected', this.tokenStore.getSelectedTokens()) } return tokens @@ -780,7 +776,7 @@ export class Client { updateSelectedTokens(selectedTokens) { this.tokenStore.setSelectedTokens(selectedTokens) - this.eventSender('tokens-selected', { selectedTokens }) + this.eventSender('tokens-selected', selectedTokens) } async prepareToAuthenticateToken(authRequest: AuthenticateInterface) { From 9d218d09c10765f591b67ca61a0e54f4e4b5eaa9 Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Mon, 24 Jul 2023 22:16:28 +0100 Subject: [PATCH 2/7] removed duplicate event tokens, now to use tokens-selected for passive and active modes --- src/client/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/client/index.ts b/src/client/index.ts index 778f44d0..f06f5ba2 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -658,7 +658,7 @@ export class Client { tokens[issuer] = { tokens: tokens[issuer] } } - this.eventSender('tokens', tokens) + this.eventSender('tokens-selected', tokens) this.eventSender('tokens-loaded', { loadedCollections: Object.keys(tokens).length }) // Feature not supported when an end users third party cookies are disabled @@ -1094,7 +1094,6 @@ export class Client { this.eventSender('tokens-selected', { selectedTokens: this.tokenStore.getSelectedTokens(), }) - this.eventSender('tokens', this.tokenStore.getSelectedTokens()) return res.data.tokens } } catch (e) { From dfcfa001a4e52857199cd6706824301fa1c463a7 Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Mon, 24 Jul 2023 22:36:51 +0100 Subject: [PATCH 3/7] updated tkn version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2d7eba6e..054fc5c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tokenscript/token-negotiator", - "version": "2.8.0-nick-test", + "version": "3.0.0", "description": "Token-negotiator a token attestation bridge between web 2.0 and 3.0.", "module": "dist/index.js", "types": "dist/index.d.ts", From 6ce3f900d02e7b82974d8eaacaebfef4ea4c1d8a Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Mon, 24 Jul 2023 23:09:30 +0100 Subject: [PATCH 4/7] updated tkn version --- src/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.ts b/src/version.ts index 525532b9..01326106 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1,2 +1,2 @@ // modified by build process. -export const VERSION = '2.8.0-nick-test' +export const VERSION = '3.0.0' From cc6338a925584dace5a3293794b975a91bfa17a5 Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Wed, 26 Jul 2023 08:07:59 +0100 Subject: [PATCH 5/7] pr changes --- index.html | 69 +++++++++++++++++++++++---------------------- src/client/index.ts | 10 +++++-- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/index.html b/index.html index 49f5d40d..a4e3760a 100644 --- a/index.html +++ b/index.html @@ -22,24 +22,24 @@ window.negotiator = new negotiator.Client({ type: "active", issuers: [ - { - collectionID: "devcon", - onChain: false, - title: "Devcon", - tokenIdName: "id", - image: - "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg", - tokenOrigin: "http://localhost:3002/", - attestationOrigin: "https://test.attestation.id/", - base64senderPublicKeys: { - 6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=", - 55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=", - }, - base64attestorPubKey: - "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", - ticketIssuersUrlWebsitePrivateKey: - "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c", - }, + // { + // collectionID: "devcon", + // onChain: false, + // title: "Devcon", + // tokenIdName: "id", + // image: + // "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg", + // tokenOrigin: "http://localhost:3002/", + // attestationOrigin: "https://test.attestation.id/", + // base64senderPublicKeys: { + // 6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=", + // 55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=", + // }, + // base64attestorPubKey: + // "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", + // ticketIssuersUrlWebsitePrivateKey: + // "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c", + // }, // { // collectionID: "devcon", // onChain: false, @@ -137,22 +137,23 @@ chain: "eth", blockchain: "evm", }, - // { - // onChain: true, - // collectionID: "fantom-collection-test", - // contract: '0x94e22c14118353651636f9af43cd0a5a08b93da3', - // chain: 'fantom', - // blockchain: "evm", - // }, - // { - // hideToggle : true, - // noTokenMsg: "

If you have a token please:

1. Open your magic link inside this browser.
2. Refresh this page.

", - // onChain: true, - // collectionID: "bsc-collection-test", - // contract: '0xF5db804101d8600c26598A1Ba465166c33CdAA4b', - // chain: 'bsc', - // blockchain: "evm", - // }, + { + onChain: true, + collectionID: "fantom-collection-test", + contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3", + chain: "fantom", + blockchain: "evm", + }, + { + hideToggle: true, + noTokenMsg: + "

If you have a token please:

1. Open your magic link inside this browser.
2. Refresh this page.

", + onChain: true, + collectionID: "bsc-collection-test", + contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b", + chain: "bsc", + blockchain: "evm", + }, // { // onChain: true, // collectionID: "tt", diff --git a/src/client/index.ts b/src/client/index.ts index f06f5ba2..572a5c69 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -466,7 +466,9 @@ export class Client { } if (this.config.autoEnableTokens && Object.keys(this.tokenStore.getSelectedTokens()).length) - this.eventSender('tokens-selected', this.tokenStore.getSelectedTokens()) + this.eventSender('tokens-selected', { + selectedTokens: this.tokenStore.getSelectedTokens(), + }) if (openPopup || (this.config.uiOptions.autoPopup === true && autoOpenPopup)) this.ui.openOverlay() } @@ -683,7 +685,9 @@ export class Client { } if (this.config.autoEnableTokens) { - this.eventSender('tokens-selected', this.tokenStore.getSelectedTokens()) + this.eventSender('tokens-selected', { + selectedTokens: this.tokenStore.getSelectedTokens(), + }) } return tokens @@ -776,7 +780,7 @@ export class Client { updateSelectedTokens(selectedTokens) { this.tokenStore.setSelectedTokens(selectedTokens) - this.eventSender('tokens-selected', selectedTokens) + this.eventSender('tokens-selected', { selectedTokens }) } async prepareToAuthenticateToken(authRequest: AuthenticateInterface) { From 01411be84569f8caed0c6a205b2ecd46d9e03d19 Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Wed, 26 Jul 2023 08:09:39 +0100 Subject: [PATCH 6/7] pr changes --- src/client/__tests__/client.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/__tests__/client.spec.ts b/src/client/__tests__/client.spec.ts index 4fb29b9a..61686161 100644 --- a/src/client/__tests__/client.spec.ts +++ b/src/client/__tests__/client.spec.ts @@ -340,7 +340,7 @@ describe('client spec', () => { test('tokenNegotiatorClient method eventSender event hook functions', async () => { const tokenNegotiatorClient = getOffChainConfigClient() tokenNegotiatorClient.eventSender('emitAllTokensToClient', []) - tokenNegotiatorClient.eventSender('emitSelectedTokensToClient', null) + tokenNegotiatorClient.eventSender('emitSelectedTokensToClient', { selectedTokens: null }) tokenNegotiatorClient.eventSender('emitProofToClient', { data: 'test', issuer: 'devcon', error: null }) tokenNegotiatorClient.eventSender('emitNetworkChange', '0x1') }) From 8cec2e66c38a1ede26fa3cf6b22e80e9ec3a7dde Mon Sep 17 00:00:00 2001 From: Nick Taras Date: Wed, 26 Jul 2023 09:40:08 +0100 Subject: [PATCH 7/7] updated sonar exclusions to ignore index.html --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index a51c8095..00bec3d6 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -12,5 +12,5 @@ sonar.javascript.lcov.reportPaths=./reports/coverage/lcov.info # Encoding of the source code. Default is default system encoding # sonar.sourceEncoding=UTF-8 -sonar.exclusions=**/*.js, **/*.jsx, **/*.ts, **/*.tsx, ^.*\/__tests__\/.*$ +sonar.exclusions=**/*.js, index.html, **/*.jsx, **/*.ts, **/*.tsx, ^.*\/__tests__\/.*$ # sonar.exclusions=**/*.txt,**/*.md \ No newline at end of file