manager's list method returning ids and secret values

src/connectors/in-memory.ts

@@ -1,4 +1,4 @@
-import { ISecret, ISecretsConnector } from '../token';
+import { ISecret, ISecretsConnector, ISecretsList } from '../token';
 
 /**
  * An in memory password connector to store passwords during the session.
@@ -19,9 +19,7 @@ export class InMemoryConnector implements ISecretsConnector {
     this._secrets.delete(id);
   }
 
-  async list(
-    query?: string | undefined
-  ): Promise<{ ids: string[]; values: ISecret[] }> {
+  async list(query?: string | undefined): Promise<ISecretsList> {
     const ids: string[] = [];
     const values: ISecret[] = [];
     this._secrets.forEach((value, key) => {

src/connectors/local-storage.ts

@@ -1,4 +1,4 @@
-import { ISecret, ISecretsConnector } from '../token';
+import { ISecret, ISecretsConnector, ISecretsList } from '../token';
 
 /**
  * Example connector that save the secrets to the local storage.
@@ -36,13 +36,15 @@ passwords are stored as plain text in the local storage of the browser'
     localStorage.setItem(this.storage, JSON.stringify(secrets));
   }
 
-  async list(
-    query?: string | undefined
-  ): Promise<{ ids: string[]; values: ISecret[] }> {
+  async list(query?: string | undefined): Promise<ISecretsList> {
     const secrets = JSON.parse(localStorage.getItem(this.storage) ?? '{}');
-    return {
-      ids: Object.keys(secrets).filter(key => secrets[key].namespace === query),
-      values: []
-    };
+    const initialValue: ISecretsList = { ids: [], values: [] };
+    return Object.keys(secrets)
+      .filter(key => secrets[key].namespace === query)
+      .reduce((acc, cur) => {
+        acc.ids.push(cur);
+        acc.values.push(secrets[cur]);
+        return acc;
+      }, initialValue);
   }
 }

src/manager.ts

@@ -1,4 +1,9 @@
-import { ISecret, ISecretsConnector, ISecretsManager } from './token';
+import {
+  ISecret,
+  ISecretsConnector,
+  ISecretsList,
+  ISecretsManager
+} from './token';
 
 export namespace SecretsManager {
   export interface IOptions {
@@ -22,8 +27,8 @@ export class SecretsManager implements ISecretsManager {
     this._connector.remove(id);
   }
 
-  async list(namespace: string): Promise<string[]> {
-    return (await this._connector.list(namespace)).ids;
+  async list(namespace: string): Promise<ISecretsList> {
+    return await this._connector.list(namespace);
   }
 
   private _onchange = (e: Event): void => {
@@ -82,7 +87,7 @@ export class SecretsManager implements ISecretsManager {
 
   async detachAll(namespace: string): Promise<void> {
     const attachedIds = await this.list(namespace);
-    attachedIds.forEach(id => {
+    attachedIds.ids.forEach(id => {
       this.detach(namespace, id);
     });
   }

src/token.ts

@@ -8,6 +8,10 @@ export interface ISecret {
 }
 
 export interface ISecretsConnector extends IDataConnector<ISecret> {}
+export interface ISecretsList<T = ISecret> {
+  ids: string[];
+  values: T[];
+}
 
 export const ISecretsConnector = new Token<ISecretsConnector>(
   'jupyter-secret-manager:connector',
@@ -18,7 +22,7 @@ export interface ISecretsManager {
   get(id: string): Promise<ISecret | undefined>;
   set(id: string, secret: ISecret): Promise<void>;
   remove(id: string): Promise<void>;
-  list(namespace: string): Promise<string[]>;
+  list(namespace: string): Promise<ISecretsList>;
   attach(
     namespace: string,
     id: string,