From 2c5ed23b1e15ca8ddb338206821ce5df22339442 Mon Sep 17 00:00:00 2001 From: Mitch Date: Thu, 24 Aug 2023 22:48:36 -0400 Subject: [PATCH] derivationOrigin --- packages/core/src/client.ts | 26 ++++++++++--------- packages/core/src/providers/index.ts | 1 + .../core/src/providers/internet-identity.ts | 2 ++ packages/core/src/providers/nfid.ts | 2 ++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts index d6acb66..ef7891a 100644 --- a/packages/core/src/client.ts +++ b/packages/core/src/client.ts @@ -183,14 +183,14 @@ const authStates: MachineConfig = { } const result = await provider.connect() result.match(() => { - callback({ - type: "CONNECT_DONE", - data: { - activeProvider: provider, - principal: provider.principal!, - }, - }) - }, + callback({ + type: "CONNECT_DONE", + data: { + activeProvider: provider, + principal: provider.principal!, + }, + }) + }, (e) => { console.error(e) callback({ @@ -260,6 +260,7 @@ type Config = { ledgerCanisterId?: string ledgerHost?: string appName?: string + derivationOrigin?: string; } type ClientOptions = { @@ -279,6 +280,7 @@ type ClientOptions = { ledgerHost?: string appName?: string customDomain?: string + derivationOrigin?: string; } } @@ -341,10 +343,10 @@ class Client { } const createClient = ({ - canisters = {}, - providers: p = [], - globalProviderConfig = {}, - }: ClientOptions) => { + canisters = {}, + providers: p = [], + globalProviderConfig = {}, +}: ClientOptions) => { const config = { dev: true, autoConnect: true, diff --git a/packages/core/src/providers/index.ts b/packages/core/src/providers/index.ts index 4ab63c0..9086808 100644 --- a/packages/core/src/providers/index.ts +++ b/packages/core/src/providers/index.ts @@ -23,6 +23,7 @@ type Config = { ledgerHost?: string appName?: string delegationModes?: Array + derivationOrigin?: string } let isICX = !!window.icx diff --git a/packages/core/src/providers/internet-identity.ts b/packages/core/src/providers/internet-identity.ts index eb70af0..dd6166e 100644 --- a/packages/core/src/providers/internet-identity.ts +++ b/packages/core/src/providers/internet-identity.ts @@ -30,6 +30,7 @@ class InternetIdentity implements IConnector { host: string, providerUrl: string, dev: boolean, + derivationOrigin?: string, } #identity?: Identity #principal?: string @@ -124,6 +125,7 @@ class InternetIdentity implements IConnector { identityProvider: this.#config.providerUrl, onSuccess: resolve, onError: reject, + derivationOrigin: this.#config.derivationOrigin, }) }) const identity = this.#client?.getIdentity() diff --git a/packages/core/src/providers/nfid.ts b/packages/core/src/providers/nfid.ts index 66dc9b2..72c1730 100644 --- a/packages/core/src/providers/nfid.ts +++ b/packages/core/src/providers/nfid.ts @@ -30,6 +30,7 @@ class NFID implements IConnector { host: string, providerUrl: string, dev: Boolean, + derivationOrigin?: string, } #identity?: any #principal?: string @@ -129,6 +130,7 @@ class NFID implements IConnector { identityProvider: this.#config.providerUrl + `/authenticate/?applicationName=${this.#config.appName}`, onSuccess: resolve, onError: reject, + derivationOrigin: this.#config.derivationOrigin, }) }) const identity = this.#client.getIdentity()