@polkadot/extension-base 0.44.2-2 → 0.44.2

package/background/handlers/Extension.d.ts

@@ -18,8 +18,8 @@ export default class Extension {
     private accountsValidate;
     private accountsSubscribe;
     private authorizeApprove;
+    private authorizeUpdate;
     private getAuthList;
-    private authorizeReject;
     private authorizeSubscribe;
     private metadataApprove;
     private metadataGet;
@@ -40,7 +40,7 @@ export default class Extension {
     private derive;
     private derivationValidate;
     private derivationCreate;
-    private toggleAuthorization;
     private removeAuthorization;
+    private deleteAuthRequest;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/background/handlers/Extension.js

@@ -143,6 +143,16 @@ export default class Extension {
   accountsForget({
     address
   }) {
+    const authorizedAccountsDiff = []; // cycle through authUrls and prepare the array of diff
+
+    Object.entries(this.#state.authUrls).forEach(([url, urlInfo]) => {
+      if (!urlInfo.authorizedAccounts.includes(address)) {
+        return;
+      }
+
+      authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter(previousAddress => previousAddress !== address)]);
+    });
+    this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
     keyring.forgetAccount(address);
     return true;
   }
@@ -197,8 +207,7 @@ export default class Extension {
     } catch (e) {
       return false;
     }
-  } // FIXME This looks very much like what we have in Tabs
-
+  }
 
   accountsSubscribe(id, port) {
     const cb = createSubscription(id, port);
@@ -211,6 +220,7 @@ export default class Extension {
   }
 
   authorizeApprove({
+    authorizedAccounts,
     id
   }) {
     const queued = this.#state.getAuthRequest(id);
@@ -218,26 +228,24 @@ export default class Extension {
     const {
       resolve
     } = queued;
-    resolve(true);
+    resolve({
+      authorizedAccounts,
+      result: true
+    });
     return true;
   }
 
+  authorizeUpdate({
+    authorizedAccounts,
+    url
+  }) {
+    return this.#state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+  }
+
   getAuthList() {
     return {
       list: this.#state.authUrls
     };
-  }
-
-  authorizeReject({
-    id
-  }) {
-    const queued = this.#state.getAuthRequest(id);
-    assert(queued, 'Unable to find request');
-    const {
-      reject
-    } = queued;
-    reject(new Error('Rejected'));
-    return true;
   } // FIXME This looks very much like what we have in accounts
 
 
@@ -553,16 +561,14 @@ export default class Extension {
     return true;
   }
 
-  toggleAuthorization(url) {
-    return {
-      list: this.#state.toggleAuthorization(url)
-    };
-  }
-
   removeAuthorization(url) {
     return {
       list: this.#state.removeAuthorization(url)
     };
+  }
+
+  deleteAuthRequest(requestId) {
+    return this.#state.deleteAuthRequest(requestId);
   } // Weird thought, the eslint override is not needed in Tabs
   // eslint-disable-next-line @typescript-eslint/require-await
 
@@ -575,18 +581,18 @@ export default class Extension {
       case 'pri(authorize.list)':
         return this.getAuthList();
 
-      case 'pri(authorize.reject)':
-        return this.authorizeReject(request);
-
-      case 'pri(authorize.toggle)':
-        return this.toggleAuthorization(request);
-
       case 'pri(authorize.remove)':
         return this.removeAuthorization(request);
 
+      case 'pri(authorize.delete.request)':
+        return this.deleteAuthRequest(request);
+
       case 'pri(authorize.requests)':
         return this.authorizeSubscribe(id, port);
 
+      case 'pri(authorize.update)':
+        return this.authorizeUpdate(request);
+
       case 'pri(accounts.create.external)':
         return this.accountsCreateExternal(request);
 

package/background/handlers/State.d.ts

@@ -7,25 +7,31 @@ interface Resolver<T> {
     reject: (error: Error) => void;
     resolve: (result: T) => void;
 }
-interface AuthRequest extends Resolver<boolean> {
+interface AuthRequest extends Resolver<AuthResponse> {
     id: string;
     idStr: string;
     request: RequestAuthorizeTab;
     url: string;
 }
 export declare type AuthUrls = Record<string, AuthUrlInfo>;
+export declare type AuthorizedAccountsDiff = [url: string, authorizedAccounts: AuthUrlInfo['authorizedAccounts']][];
 export interface AuthUrlInfo {
     count: number;
     id: string;
-    isAllowed: boolean;
+    isAllowed?: boolean;
     origin: string;
     url: string;
+    authorizedAccounts: string[];
 }
 interface MetaRequest extends Resolver<boolean> {
     id: string;
     request: MetadataDef;
     url: string;
 }
+export interface AuthResponse {
+    result: boolean;
+    authorizedAccounts: string[];
+}
 declare type Providers = Record<string, {
     meta: ProviderMeta;
     start: () => ProviderInterface;
@@ -58,17 +64,18 @@ export default class State {
     private popupClose;
     private popupOpen;
     private authComplete;
+    deleteAuthRequest(requestId: string): void;
     private saveCurrentAuthList;
     private metaComplete;
     private signComplete;
-    private stripUrl;
+    stripUrl(url: string): string;
     private updateIcon;
-    toggleAuthorization(url: string): AuthUrls;
     removeAuthorization(url: string): AuthUrls;
     private updateIconAuth;
     private updateIconMeta;
     private updateIconSign;
-    authorizeUrl(url: string, request: RequestAuthorizeTab): Promise<boolean>;
+    updateAuthorizedAccounts(authorizedAccountDiff: AuthorizedAccountsDiff): void;
+    authorizeUrl(url: string, request: RequestAuthorizeTab): Promise<AuthResponse>;
     ensureUrlAuthorized(url: string): boolean;
     injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
     getAuthRequest(id: string): AuthRequest;

package/background/handlers/State.js

@@ -171,8 +171,7 @@ export default class State {
   }
 
   authComplete = (id, resolve, reject) => {
-    const complete = result => {
-      const isAllowed = result === true;
+    const complete = (authorizedAccounts = []) => {
       const {
         idStr,
         request: {
@@ -181,9 +180,9 @@ export default class State {
         url
       } = this.#authRequests[id];
       this.#authUrls[this.stripUrl(url)] = {
+        authorizedAccounts,
         count: 0,
         id: idStr,
-        isAllowed,
         origin,
         url
       };
@@ -194,16 +193,27 @@ export default class State {
 
     return {
       reject: error => {
-        complete(error);
+        complete();
         reject(error);
       },
-      resolve: result => {
-        complete(result);
-        resolve(result);
+      resolve: ({
+        authorizedAccounts,
+        result
+      }) => {
+        complete(authorizedAccounts);
+        resolve({
+          authorizedAccounts,
+          result
+        });
       }
     };
   };
 
+  deleteAuthRequest(requestId) {
+    delete this.#authRequests[requestId];
+    this.updateIconAuth(true);
+  }
+
   saveCurrentAuthList() {
     localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
   }
@@ -263,14 +273,6 @@ export default class State {
     }
   }
 
-  toggleAuthorization(url) {
-    const entry = this.#authUrls[url];
-    assert(entry, `The source ${url} is not known`);
-    this.#authUrls[url].isAllowed = !entry.isAllowed;
-    this.saveCurrentAuthList();
-    return this.#authUrls;
-  }
-
   removeAuthorization(url) {
     const entry = this.#authUrls[url];
     assert(entry, `The source ${url} is not known`);
@@ -294,6 +296,13 @@ export default class State {
     this.updateIcon(shouldClose);
   }
 
+  updateAuthorizedAccounts(authorizedAccountDiff) {
+    authorizedAccountDiff.forEach(([url, authorizedAccountDiff]) => {
+      this.#authUrls[url].authorizedAccounts = authorizedAccountDiff;
+    });
+    this.saveCurrentAuthList();
+  }
+
   async authorizeUrl(url, request) {
     const idStr = this.stripUrl(url); // Do not enqueue duplicate authorization requests.
 
@@ -302,8 +311,11 @@ export default class State {
 
     if (this.#authUrls[idStr]) {
       // this url was seen in the past
-      assert(this.#authUrls[idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
-      return false;
+      assert(this.#authUrls[idStr].authorizedAccounts || this.#authUrls[idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
+      return {
+        authorizedAccounts: [],
+        result: false
+      };
     }
 
     return new Promise((resolve, reject) => {
@@ -322,7 +334,6 @@ export default class State {
   ensureUrlAuthorized(url) {
     const entry = this.#authUrls[this.stripUrl(url)];
     assert(entry, `The source ${url} has not been enabled yet`);
-    assert(entry.isAllowed, `The source ${url} is not allowed to interact with this extension`);
     return true;
   }
 

package/background/handlers/Tabs.d.ts

@@ -4,9 +4,11 @@ import State from './State';
 export default class Tabs {
     #private;
     constructor(state: State);
+    private filterForAuthorizedAccounts;
     private authorize;
-    private accountsList;
-    private accountsSubscribe;
+    private accountsListAuthorized;
+    private accountsSubscribeAuthorized;
+    private accountsUnsubscribe;
     private getSigningPair;
     private bytesSign;
     private extrinsicSign;

package/background/handlers/Tabs.js

@@ -38,31 +38,60 @@ function transformAccounts(accounts, anyType = false) {
 }
 
 export default class Tabs {
+  #accountSubs = {};
   #state;
 
   constructor(state) {
     this.#state = state;
   }
 
+  filterForAuthorizedAccounts(accounts, url) {
+    const auth = this.#state.authUrls[this.#state.stripUrl(url)];
+    return accounts.filter(allAcc => auth.authorizedAccounts // we have a list, use it
+    ? auth.authorizedAccounts.includes(allAcc.address) // if no authorizedAccounts and isAllowed return all - these are old converted urls
+    : auth.isAllowed);
+  }
+
   authorize(url, request) {
     return this.#state.authorizeUrl(url, request);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
-  accountsList(url, {
+  accountsListAuthorized(url, {
     anyType
   }) {
-    return transformAccounts(accountsObservable.subject.getValue(), anyType);
-  } // FIXME This looks very much like what we have in Extension
-
+    const transformedAccounts = transformAccounts(accountsObservable.subject.getValue(), anyType);
+    return this.filterForAuthorizedAccounts(transformedAccounts, url);
+  }
 
-  accountsSubscribe(url, id, port) {
+  accountsSubscribeAuthorized(url, id, port) {
     const cb = createSubscription(id, port);
-    const subscription = accountsObservable.subject.subscribe(accounts => cb(transformAccounts(accounts)));
+    this.#accountSubs[id] = {
+      subscription: accountsObservable.subject.subscribe(accounts => {
+        const transformedAccounts = transformAccounts(accounts);
+        cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
+      }),
+      url
+    };
     port.onDisconnect.addListener(() => {
-      unsubscribe(id);
-      subscription.unsubscribe();
+      this.accountsUnsubscribe(url, {
+        id
+      });
     });
+    return id;
+  }
+
+  accountsUnsubscribe(url, {
+    id
+  }) {
+    const sub = this.#accountSubs[id];
+
+    if (!sub || sub.url !== url) {
+      return false;
+    }
+
+    delete this.#accountSubs[id];
+    unsubscribe(id);
+    sub.subscription.unsubscribe();
     return true;
   }
 
@@ -188,10 +217,13 @@ export default class Tabs {
         return this.authorize(url, request);
 
       case 'pub(accounts.list)':
-        return this.accountsList(url, request);
+        return this.accountsListAuthorized(url, request);
 
       case 'pub(accounts.subscribe)':
-        return this.accountsSubscribe(url, id, port);
+        return this.accountsSubscribeAuthorized(url, id, port);
+
+      case 'pub(accounts.unsubscribe)':
+        return this.accountsUnsubscribe(url, request);
 
       case 'pub(bytes.sign)':
         return this.bytesSign(url, request);

package/background/types.d.ts

@@ -7,7 +7,7 @@ import type { HexString } from '@polkadot/util/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
 import { TypeRegistry } from '@polkadot/types';
 import { ALLOWED_PATH } from '../defaults';
-import { AuthUrls } from './handlers/State';
+import { AuthResponse, AuthUrls } from './handlers/State';
 declare type KeysWithDefinedValues<T> = {
     [K in keyof T]: T[K] extends undefined ? never : K;
 }[keyof T];
@@ -40,6 +40,8 @@ export declare type AccountsContext = {
     accounts: AccountJson[];
     hierarchy: AccountWithChildren[];
     master?: AccountJson;
+    selectedAccounts?: AccountJson['address'][];
+    setSelectedAccounts?: (address: AccountJson['address'][]) => void;
 };
 export interface AuthorizeRequest {
     id: string;
@@ -65,6 +67,7 @@ export interface RequestSignatures {
     'pri(accounts.export)': [RequestAccountExport, ResponseAccountExport];
     'pri(accounts.batchExport)': [RequestAccountBatchExport, ResponseAccountsExport];
     'pri(accounts.forget)': [RequestAccountForget, boolean];
+    'pri(accounts.list)': [RequestAccountList, InjectedAccount[]];
     'pri(accounts.show)': [RequestAccountShow, boolean];
     'pri(accounts.tie)': [RequestAccountTie, boolean];
     'pri(accounts.subscribe)': [RequestAccountSubscribe, boolean, AccountJson[]];
@@ -72,10 +75,10 @@ export interface RequestSignatures {
     'pri(accounts.changePassword)': [RequestAccountChangePassword, boolean];
     'pri(authorize.approve)': [RequestAuthorizeApprove, boolean];
     'pri(authorize.list)': [null, ResponseAuthorizeList];
-    'pri(authorize.reject)': [RequestAuthorizeReject, boolean];
     'pri(authorize.requests)': [RequestAuthorizeSubscribe, boolean, AuthorizeRequest[]];
-    'pri(authorize.toggle)': [string, ResponseAuthorizeList];
     'pri(authorize.remove)': [string, ResponseAuthorizeList];
+    'pri(authorize.delete.request)': [string, void];
+    'pri(authorize.update)': [RequestUpdateAuthorizedAccounts, void];
     'pri(derivation.create)': [RequestDeriveCreate, boolean];
     'pri(derivation.validate)': [RequestDeriveValidate, ResponseDeriveValidate];
     'pri(json.restore)': [RequestJsonRestore, void];
@@ -96,8 +99,9 @@ export interface RequestSignatures {
     'pri(signing.requests)': [RequestSigningSubscribe, boolean, SigningRequest[]];
     'pri(window.open)': [AllowedPath, boolean];
     'pub(accounts.list)': [RequestAccountList, InjectedAccount[]];
-    'pub(accounts.subscribe)': [RequestAccountSubscribe, boolean, InjectedAccount[]];
-    'pub(authorize.tab)': [RequestAuthorizeTab, null];
+    'pub(accounts.subscribe)': [RequestAccountSubscribe, string, InjectedAccount[]];
+    'pub(accounts.unsubscribe)': [RequestAccountUnsubscribe, boolean];
+    'pub(authorize.tab)': [RequestAuthorizeTab, Promise<AuthResponse>];
     'pub(bytes.sign)': [SignerPayloadRaw, ResponseSigning];
     'pub(extrinsic.sign)': [SignerPayloadJSON, ResponseSigning];
     'pub(metadata.list)': [null, InjectedMetadataKnown[]];
@@ -126,9 +130,11 @@ export interface RequestAuthorizeTab {
 }
 export interface RequestAuthorizeApprove {
     id: string;
+    authorizedAccounts: string[];
 }
-export interface RequestAuthorizeReject {
-    id: string;
+export interface RequestUpdateAuthorizedAccounts {
+    url: string;
+    authorizedAccounts: string[];
 }
 export declare type RequestAuthorizeSubscribe = null;
 export interface RequestMetadataApprove {
@@ -208,6 +214,9 @@ export interface RequestAccountList {
     anyType?: boolean;
 }
 export declare type RequestAccountSubscribe = null;
+export interface RequestAccountUnsubscribe {
+    id: string;
+}
 export interface RequestRpcSend {
     method: string;
     params: unknown[];

package/cjs/background/handlers/Extension.js

@@ -184,6 +184,18 @@ class Extension {
     let {
       address
     } = _ref9;
+    const authorizedAccountsDiff = []; // cycle through authUrls and prepare the array of diff
+
+    Object.entries(this.#state.authUrls).forEach(_ref10 => {
+      let [url, urlInfo] = _ref10;
+
+      if (!urlInfo.authorizedAccounts.includes(address)) {
+        return;
+      }
+
+      authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter(previousAddress => previousAddress !== address)]);
+    });
+    this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
 
     _uiKeyring.default.forgetAccount(address);
 
@@ -206,11 +218,11 @@ class Extension {
     return remainingTime;
   }
 
-  accountsShow(_ref10) {
+  accountsShow(_ref11) {
     let {
       address,
       isShowing
-    } = _ref10;
+    } = _ref11;
 
     const pair = _uiKeyring.default.getPair(address);
 
@@ -223,11 +235,11 @@ class Extension {
     return true;
   }
 
-  accountsTie(_ref11) {
+  accountsTie(_ref12) {
     let {
       address,
       genesisHash
-    } = _ref11;
+    } = _ref12;
 
     const pair = _uiKeyring.default.getPair(address);
 
@@ -240,11 +252,11 @@ class Extension {
     return true;
   }
 
-  accountsValidate(_ref12) {
+  accountsValidate(_ref13) {
     let {
       address,
       password
-    } = _ref12;
+    } = _ref13;
 
     try {
       _uiKeyring.default.backupAccount(_uiKeyring.default.getPair(address), password);
@@ -253,8 +265,7 @@ class Extension {
     } catch (e) {
       return false;
     }
-  } // FIXME This looks very much like what we have in Tabs
-
+  }
 
   accountsSubscribe(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
@@ -268,36 +279,35 @@ class Extension {
     return true;
   }
 
-  authorizeApprove(_ref13) {
+  authorizeApprove(_ref14) {
     let {
+      authorizedAccounts,
       id
-    } = _ref13;
+    } = _ref14;
     const queued = this.#state.getAuthRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
       resolve
     } = queued;
-    resolve(true);
+    resolve({
+      authorizedAccounts,
+      result: true
+    });
     return true;
   }
 
+  authorizeUpdate(_ref15) {
+    let {
+      authorizedAccounts,
+      url
+    } = _ref15;
+    return this.#state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+  }
+
   getAuthList() {
     return {
       list: this.#state.authUrls
     };
-  }
-
-  authorizeReject(_ref14) {
-    let {
-      id
-    } = _ref14;
-    const queued = this.#state.getAuthRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
-    const {
-      reject
-    } = queued;
-    reject(new Error('Rejected'));
-    return true;
   } // FIXME This looks very much like what we have in accounts
 
 
@@ -311,10 +321,10 @@ class Extension {
     return true;
   }
 
-  metadataApprove(_ref15) {
+  metadataApprove(_ref16) {
     let {
       id
-    } = _ref15;
+    } = _ref16;
     const queued = this.#state.getMetaRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -334,10 +344,10 @@ class Extension {
     return this.#state.knownMetadata;
   }
 
-  metadataReject(_ref16) {
+  metadataReject(_ref17) {
     let {
       id
-    } = _ref16;
+    } = _ref17;
     const queued = this.#state.getMetaRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -357,11 +367,11 @@ class Extension {
     return true;
   }
 
-  jsonRestore(_ref17) {
+  jsonRestore(_ref18) {
     let {
       file,
       password
-    } = _ref17;
+    } = _ref18;
 
     try {
       _uiKeyring.default.restoreAccount(file, password);
@@ -370,11 +380,11 @@ class Extension {
     }
   }
 
-  batchRestore(_ref18) {
+  batchRestore(_ref19) {
     let {
       file,
       password
-    } = _ref18;
+    } = _ref19;
 
     try {
       _uiKeyring.default.restoreAccounts(file, password);
@@ -406,12 +416,12 @@ class Extension {
     }
   }
 
-  seedCreate(_ref19) {
+  seedCreate(_ref20) {
     let {
       length = SEED_DEFAULT_LENGTH,
       seed: _seed,
       type
-    } = _ref19;
+    } = _ref20;
 
     const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
 
@@ -421,11 +431,11 @@ class Extension {
     };
   }
 
-  seedValidate(_ref20) {
+  seedValidate(_ref21) {
     let {
       suri,
       type
-    } = _ref20;
+    } = _ref21;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
@@ -444,12 +454,12 @@ class Extension {
     };
   }
 
-  signingApprovePassword(_ref21) {
+  signingApprovePassword(_ref22) {
     let {
       id,
       password,
       savePass
-    } = _ref21;
+    } = _ref22;
     const queued = this.#state.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -512,11 +522,11 @@ class Extension {
     return true;
   }
 
-  signingApproveSignature(_ref22) {
+  signingApproveSignature(_ref23) {
     let {
       id,
       signature
-    } = _ref22;
+    } = _ref23;
     const queued = this.#state.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -529,10 +539,10 @@ class Extension {
     return true;
   }
 
-  signingCancel(_ref23) {
+  signingCancel(_ref24) {
     let {
       id
-    } = _ref23;
+    } = _ref24;
     const queued = this.#state.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -542,10 +552,10 @@ class Extension {
     return true;
   }
 
-  signingIsLocked(_ref24) {
+  signingIsLocked(_ref25) {
     let {
       id
-    } = _ref24;
+    } = _ref25;
     const queued = this.#state.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const address = queued.request.payload.address;
@@ -601,12 +611,12 @@ class Extension {
     }
   }
 
-  derivationValidate(_ref25) {
+  derivationValidate(_ref26) {
     let {
       parentAddress,
       parentPassword,
       suri
-    } = _ref25;
+    } = _ref26;
     const childPair = this.derive(parentAddress, suri, parentPassword, {});
     return {
       address: childPair.address,
@@ -614,7 +624,7 @@ class Extension {
     };
   }
 
-  derivationCreate(_ref26) {
+  derivationCreate(_ref27) {
     let {
       genesisHash,
       name,
@@ -622,7 +632,7 @@ class Extension {
       parentPassword,
       password,
       suri
-    } = _ref26;
+    } = _ref27;
     const childPair = this.derive(parentAddress, suri, parentPassword, {
       genesisHash,
       name,
@@ -635,16 +645,14 @@ class Extension {
     return true;
   }
 
-  toggleAuthorization(url) {
-    return {
-      list: this.#state.toggleAuthorization(url)
-    };
-  }
-
   removeAuthorization(url) {
     return {
       list: this.#state.removeAuthorization(url)
     };
+  }
+
+  deleteAuthRequest(requestId) {
+    return this.#state.deleteAuthRequest(requestId);
   } // Weird thought, the eslint override is not needed in Tabs
   // eslint-disable-next-line @typescript-eslint/require-await
 
@@ -657,18 +665,18 @@ class Extension {
       case 'pri(authorize.list)':
         return this.getAuthList();
 
-      case 'pri(authorize.reject)':
-        return this.authorizeReject(request);
-
-      case 'pri(authorize.toggle)':
-        return this.toggleAuthorization(request);
-
       case 'pri(authorize.remove)':
         return this.removeAuthorization(request);
 
+      case 'pri(authorize.delete.request)':
+        return this.deleteAuthRequest(request);
+
       case 'pri(authorize.requests)':
         return this.authorizeSubscribe(id, port);
 
+      case 'pri(authorize.update)':
+        return this.authorizeUpdate(request);
+
       case 'pri(accounts.create.external)':
         return this.accountsCreateExternal(request);
 

package/cjs/background/handlers/State.js

@@ -206,39 +206,56 @@ class State {
   }
 
   authComplete = (id, resolve, reject) => {
-    const complete = result => {
-      const isAllowed = result === true;
+    var _this = this;
+
+    const complete = function () {
+      let authorizedAccounts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       const {
         idStr,
         request: {
           origin
         },
         url
-      } = this.#authRequests[id];
-      this.#authUrls[this.stripUrl(url)] = {
+      } = _this.#authRequests[id];
+      _this.#authUrls[_this.stripUrl(url)] = {
+        authorizedAccounts,
         count: 0,
         id: idStr,
-        isAllowed,
         origin,
         url
       };
-      this.saveCurrentAuthList();
-      delete this.#authRequests[id];
-      this.updateIconAuth(true);
+
+      _this.saveCurrentAuthList();
+
+      delete _this.#authRequests[id];
+
+      _this.updateIconAuth(true);
     };
 
     return {
       reject: error => {
-        complete(error);
+        complete();
         reject(error);
       },
-      resolve: result => {
-        complete(result);
-        resolve(result);
+      resolve: _ref7 => {
+        let {
+          authorizedAccounts,
+          result
+        } = _ref7;
+        complete(authorizedAccounts);
+        resolve({
+          authorizedAccounts,
+          result
+        });
       }
     };
   };
 
+  deleteAuthRequest(requestId) {
+    delete this.#authRequests[requestId];
+    this.updateIconAuth(true);
+  }
+
   saveCurrentAuthList() {
     localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
   }
@@ -298,14 +315,6 @@ class State {
     }
   }
 
-  toggleAuthorization(url) {
-    const entry = this.#authUrls[url];
-    (0, _util.assert)(entry, `The source ${url} is not known`);
-    this.#authUrls[url].isAllowed = !entry.isAllowed;
-    this.saveCurrentAuthList();
-    return this.#authUrls;
-  }
-
   removeAuthorization(url) {
     const entry = this.#authUrls[url];
     (0, _util.assert)(entry, `The source ${url} is not known`);
@@ -329,6 +338,14 @@ class State {
     this.updateIcon(shouldClose);
   }
 
+  updateAuthorizedAccounts(authorizedAccountDiff) {
+    authorizedAccountDiff.forEach(_ref8 => {
+      let [url, authorizedAccountDiff] = _ref8;
+      this.#authUrls[url].authorizedAccounts = authorizedAccountDiff;
+    });
+    this.saveCurrentAuthList();
+  }
+
   async authorizeUrl(url, request) {
     const idStr = this.stripUrl(url); // Do not enqueue duplicate authorization requests.
 
@@ -337,8 +354,11 @@ class State {
 
     if (this.#authUrls[idStr]) {
       // this url was seen in the past
-      (0, _util.assert)(this.#authUrls[idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
-      return false;
+      (0, _util.assert)(this.#authUrls[idStr].authorizedAccounts || this.#authUrls[idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
+      return {
+        authorizedAccounts: [],
+        result: false
+      };
     }
 
     return new Promise((resolve, reject) => {
@@ -357,7 +377,6 @@ class State {
   ensureUrlAuthorized(url) {
     const entry = this.#authUrls[this.stripUrl(url)];
     (0, _util.assert)(entry, `The source ${url} has not been enabled yet`);
-    (0, _util.assert)(entry.isAllowed, `The source ${url} is not allowed to interact with this extension`);
     return true;
   }
 
@@ -423,12 +442,12 @@ class State {
     return Promise.resolve(this.#providers[key].meta);
   }
 
-  rpcSubscribe(_ref7, cb, port) {
+  rpcSubscribe(_ref9, cb, port) {
     let {
       method,
       params,
       type
-    } = _ref7;
+    } = _ref9;
     const provider = this.#injectedProviders.get(port);
     (0, _util.assert)(provider, 'Cannot call pub(rpc.subscribe) before provider is set');
     return provider.subscribe(type, method, params, cb);

package/cjs/background/handlers/Tabs.js

@@ -66,34 +66,62 @@ function transformAccounts(accounts) {
 }
 
 class Tabs {
+  #accountSubs = {};
   #state;
 
   constructor(state) {
     this.#state = state;
   }
 
+  filterForAuthorizedAccounts(accounts, url) {
+    const auth = this.#state.authUrls[this.#state.stripUrl(url)];
+    return accounts.filter(allAcc => auth.authorizedAccounts // we have a list, use it
+    ? auth.authorizedAccounts.includes(allAcc.address) // if no authorizedAccounts and isAllowed return all - these are old converted urls
+    : auth.isAllowed);
+  }
+
   authorize(url, request) {
     return this.#state.authorizeUrl(url, request);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
-  accountsList(url, _ref4) {
+  accountsListAuthorized(url, _ref4) {
     let {
       anyType
     } = _ref4;
-    return transformAccounts(_accounts.accounts.subject.getValue(), anyType);
-  } // FIXME This looks very much like what we have in Extension
-
+    const transformedAccounts = transformAccounts(_accounts.accounts.subject.getValue(), anyType);
+    return this.filterForAuthorizedAccounts(transformedAccounts, url);
+  }
 
-  accountsSubscribe(url, id, port) {
+  accountsSubscribeAuthorized(url, id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-
-    const subscription = _accounts.accounts.subject.subscribe(accounts => cb(transformAccounts(accounts)));
-
+    this.#accountSubs[id] = {
+      subscription: _accounts.accounts.subject.subscribe(accounts => {
+        const transformedAccounts = transformAccounts(accounts);
+        cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
+      }),
+      url
+    };
     port.onDisconnect.addListener(() => {
-      (0, _subscriptions.unsubscribe)(id);
-      subscription.unsubscribe();
+      this.accountsUnsubscribe(url, {
+        id
+      });
     });
+    return id;
+  }
+
+  accountsUnsubscribe(url, _ref5) {
+    let {
+      id
+    } = _ref5;
+    const sub = this.#accountSubs[id];
+
+    if (!sub || sub.url !== url) {
+      return false;
+    }
+
+    delete this.#accountSubs[id];
+    (0, _subscriptions.unsubscribe)(id);
+    sub.subscription.unsubscribe();
     return true;
   }
 
@@ -128,11 +156,11 @@ class Tabs {
 
 
   metadataList(url) {
-    return this.#state.knownMetadata.map(_ref5 => {
+    return this.#state.knownMetadata.map(_ref6 => {
       let {
         genesisHash,
         specVersion
-      } = _ref5;
+      } = _ref6;
       return {
         genesisHash,
         specVersion
@@ -190,10 +218,10 @@ class Tabs {
     chrome.tabs.query({
       url: nonFragment
     }, tabs => {
-      tabs.map(_ref6 => {
+      tabs.map(_ref7 => {
         let {
           id
-        } = _ref6;
+        } = _ref7;
         return id;
       }).filter(id => (0, _util.isNumber)(id)).forEach(id => (0, _helpers.withErrorLog)(() => chrome.tabs.update(id, {
         url
@@ -226,10 +254,13 @@ class Tabs {
         return this.authorize(url, request);
 
       case 'pub(accounts.list)':
-        return this.accountsList(url, request);
+        return this.accountsListAuthorized(url, request);
 
       case 'pub(accounts.subscribe)':
-        return this.accountsSubscribe(url, id, port);
+        return this.accountsSubscribeAuthorized(url, id, port);
+
+      case 'pub(accounts.unsubscribe)':
+        return this.accountsUnsubscribe(url, request);
 
       case 'pub(bytes.sign)':
         return this.bytesSign(url, request);

package/cjs/package.json

@@ -1,3 +1,3 @@
 {
   "type": "commonjs"
-}
+}

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.44.2-2'
+  version: '0.44.2'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/Accounts.js

@@ -21,8 +21,14 @@ class Accounts {
   }
 
   subscribe(cb) {
-    sendRequest('pub(accounts.subscribe)', null, cb).catch(error => console.error(error));
-    return () => {// FIXME we need the ability to unsubscribe
+    let id = null;
+    sendRequest('pub(accounts.subscribe)', null, cb).then(subId => {
+      id = subId;
+    }).catch(console.error);
+    return () => {
+      id && sendRequest('pub(accounts.unsubscribe)', {
+        id
+      }).catch(console.error);
     };
   }
 

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.44.2-2",
+  "version": "0.44.2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -182,21 +182,21 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.3",
-    "@polkadot/api": "^8.7.1",
-    "@polkadot/extension-chains": "^0.44.2-2",
-    "@polkadot/extension-dapp": "^0.44.2-2",
-    "@polkadot/extension-inject": "^0.44.2-2",
-    "@polkadot/keyring": "^9.4.1",
-    "@polkadot/networks": "^9.4.1",
-    "@polkadot/phishing": "^0.13.81",
-    "@polkadot/rpc-provider": "^8.7.1",
-    "@polkadot/types": "^8.7.1",
-    "@polkadot/ui-keyring": "^2.4.2-0",
-    "@polkadot/ui-settings": "^2.4.2-0",
-    "@polkadot/util": "^9.4.1",
-    "@polkadot/util-crypto": "^9.4.1",
+    "@babel/runtime": "^7.18.9",
+    "@polkadot/api": "^8.14.1",
+    "@polkadot/extension-chains": "^0.44.2",
+    "@polkadot/extension-dapp": "^0.44.2",
+    "@polkadot/extension-inject": "^0.44.2",
+    "@polkadot/keyring": "^10.1.1",
+    "@polkadot/networks": "^10.1.1",
+    "@polkadot/phishing": "^0.18.1",
+    "@polkadot/rpc-provider": "^8.14.1",
+    "@polkadot/types": "^8.14.1",
+    "@polkadot/ui-keyring": "^2.9.1",
+    "@polkadot/ui-settings": "^2.9.1",
+    "@polkadot/util": "^10.1.1",
+    "@polkadot/util-crypto": "^10.1.1",
     "eventemitter3": "^4.0.7",
-    "rxjs": "^7.5.5"
+    "rxjs": "^7.5.6"
   }
-}
+}

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '0.44.2-2'
+  version: '0.44.2'
 };

package/page/Accounts.js

@@ -14,8 +14,14 @@ export default class Accounts {
   }
 
   subscribe(cb) {
-    sendRequest('pub(accounts.subscribe)', null, cb).catch(error => console.error(error));
-    return () => {// FIXME we need the ability to unsubscribe
+    let id = null;
+    sendRequest('pub(accounts.subscribe)', null, cb).then(subId => {
+      id = subId;
+    }).catch(console.error);
+    return () => {
+      id && sendRequest('pub(accounts.unsubscribe)', {
+        id
+      }).catch(console.error);
     };
   }