fix e2e test

Signed-off-by: Alex Matson <[email protected]>

Author: alexmatson-da

api-specs/openrpc-user-api.json

@@ -58,6 +58,48 @@
             },
             "description": "Removes a new network configuration (similar to EIP-3085)."
         },
+        {
+            "name": "listNetworks",
+            "params": [],
+            "result": {
+                "name": "result",
+                "schema": {
+                    "title": "ListNetworksResult",
+                    "type": "object",
+                    "properties": {
+                        "networks": {
+                            "title": "networks",
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/components/schemas/Network"
+                            }
+                        }
+                    },
+                    "required": ["networks"]
+                }
+            }
+        },
+        {
+            "name": "listIdps",
+            "params": [],
+            "result": {
+                "name": "result",
+                "schema": {
+                    "title": "ListIdpsResult",
+                    "type": "object",
+                    "properties": {
+                        "idps": {
+                            "title": "idps",
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/components/schemas/Idp"
+                            }
+                        }
+                    },
+                    "required": ["idps"]
+                }
+            }
+        },
         {
             "name": "createWallet",
             "params": [
@@ -335,27 +377,6 @@
             },
             "description": "Executes a signed transaction."
         },
-        {
-            "name": "listNetworks",
-            "params": [],
-            "result": {
-                "name": "result",
-                "schema": {
-                    "title": "ListNetworksResult",
-                    "type": "object",
-                    "properties": {
-                        "networks": {
-                            "title": "networks",
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/components/schemas/Network"
-                            }
-                        }
-                    },
-                    "required": ["networks"]
-                }
-            }
-        },
         {
             "name": "addSession",
             "description": "Adds a network session.",
@@ -467,10 +488,40 @@
                 ],
                 "additionalProperties": false
             },
+            "Idp": {
+                "title": "Idp",
+                "type": "object",
+                "description": "Structure representing the Identity Providers",
+                "properties": {
+                    "id": {
+                        "title": "id",
+                        "type": "string",
+                        "description": "ID of the identity provider"
+                    },
+                    "type": {
+                        "title": "type",
+                        "type": "string",
+                        "description": "Type of identity provider (OAuth2 or Self-Signed)"
+                    },
+                    "issuer": {
+                        "title": "issuer",
+                        "type": "string",
+                        "description": "Issuer of identity provider"
+                    },
+                    "configUrl": {
+                        "title": "configUrl",
+                        "type": "string",
+                        "description": "URL to fetch the identity provider configuration"
+                    }
+                },
+                "required": ["id", "type", "issuer"],
+                "additionalProperties": false
+            },
             "Auth": {
                 "title": "auth",
                 "type": "object",
                 "description": "Represents the type of auth for a specified network",
+                "additionalProperties": false,
                 "properties": {
                     "method": {
                         "title": "method",

core/wallet-dapp-rpc-client/src/openrpc.json

@@ -452,7 +452,7 @@
                     "networkId": {
                         "title": "networkId",
                         "type": "string",
-                        "description": "A CAIP-2 compliant network ID, e.g. 'canton:da-mainnet'."
+                        "description": "A CAIP-2 compliant chain ID, e.g. 'canton:da-mainnet'."
                     }
                 },
                 "required": ["kernel", "isConnected"]

core/wallet-store-sql/src/bootstrap.ts

@@ -13,6 +13,11 @@ export async function bootstrap(
     logger: Logger
 ): Promise<void> {
     const store = new StoreSql(db, logger)
+
+    // Load all IDPs from config into the store
+    await Promise.all(config.idps.map((idp) => store.addIdp(idp)))
+
+    // Load all networks from config into the store
     await Promise.all(
         config.networks.map((network) => store.addNetwork(network))
     )

core/wallet-user-rpc-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@canton-network/core-wallet-user-rpc-client",
-    "version": "0.0.0",
+    "version": "0.11.0",
     "type": "module",
     "description": "TypeScript client generated by OpenRPC",
     "repository": "github:hyperledger-labs/splice-wallet-kernel",

core/wallet-user-rpc-client/src/index.ts

@@ -46,12 +46,11 @@ export type Audience = string
  */
 export interface Auth {
     method: Method
-    scope?: Scope
-    clientId?: ClientId
+    scope: Scope
+    clientId: ClientId
     clientSecret?: ClientSecret
-    issuer: Issuer
-    audience?: Audience
-    [k: string]: any
+    issuer?: Issuer
+    audience: Audience
 }
 /**
  *
@@ -131,6 +130,37 @@ export type PreparedTransactionHash = string
 export type CommandId = string
 export type Signature = string
 export type SignedBy = string
+export type Networks = Network[]
+/**
+ *
+ * ID of the identity provider
+ *
+ */
+export type Id = string
+/**
+ *
+ * Type of identity provider (OAuth2 or Self-Signed)
+ *
+ */
+export type Type = string
+/**
+ *
+ * URL to fetch the identity provider configuration
+ *
+ */
+export type ConfigUrl = string
+/**
+ *
+ * Structure representing the Identity Providers
+ *
+ */
+export interface Idp {
+    id: Id
+    type: Type
+    issuer: Issuer
+    configUrl?: ConfigUrl
+}
+export type Idps = Idp[]
 /**
  *
  * The party hint and name of the wallet.
@@ -166,7 +196,6 @@ export interface Wallet {
 }
 export type Added = Wallet[]
 export type Removed = Wallet[]
-export type Networks = Network[]
 /**
  *
  * The access token for the session.
@@ -236,6 +265,14 @@ export interface AddSessionParams {
  *
  */
 export type Null = null
+export interface ListNetworksResult {
+    networks: Networks
+    [k: string]: any
+}
+export interface ListIdpsResult {
+    idps: Idps
+    [k: string]: any
+}
 export interface CreateWalletResult {
     wallet: Wallet
     [k: string]: any
@@ -268,10 +305,6 @@ export interface SignResult {
 export interface ExecuteResult {
     [key: string]: any
 }
-export interface ListNetworksResult {
-    networks: Networks
-    [k: string]: any
-}
 /**
  *
  * Structure representing the connected network session
@@ -294,6 +327,8 @@ export interface ListSessionsResult {
 
 export type AddNetwork = (params: AddNetworkParams) => Promise<Null>
 export type RemoveNetwork = (params: RemoveNetworkParams) => Promise<Null>
+export type ListNetworks = () => Promise<ListNetworksResult>
+export type ListIdps = () => Promise<ListIdpsResult>
 export type CreateWallet = (
     params: CreateWalletParams
 ) => Promise<CreateWalletResult>
@@ -307,7 +342,6 @@ export type ListWallets = (
 export type SyncWallets = () => Promise<SyncWalletsResult>
 export type Sign = (params: SignParams) => Promise<SignResult>
 export type Execute = (params: ExecuteParams) => Promise<ExecuteResult>
-export type ListNetworks = () => Promise<ListNetworksResult>
 export type AddSession = (params: AddSessionParams) => Promise<AddSessionResult>
 export type ListSessions = () => Promise<ListSessionsResult>
 
@@ -336,6 +370,24 @@ export class SpliceWalletJSONRPCUserAPI {
         ...params: Parameters<RemoveNetwork>
     ): ReturnType<RemoveNetwork>
 
+    /**
+     *
+     */
+    // tslint:disable-next-line:max-line-length
+    public async request(
+        method: 'listNetworks',
+        ...params: Parameters<ListNetworks>
+    ): ReturnType<ListNetworks>
+
+    /**
+     *
+     */
+    // tslint:disable-next-line:max-line-length
+    public async request(
+        method: 'listIdps',
+        ...params: Parameters<ListIdps>
+    ): ReturnType<ListIdps>
+
     /**
      *
      */
@@ -399,15 +451,6 @@ export class SpliceWalletJSONRPCUserAPI {
         ...params: Parameters<Execute>
     ): ReturnType<Execute>
 
-    /**
-     *
-     */
-    // tslint:disable-next-line:max-line-length
-    public async request(
-        method: 'listNetworks',
-        ...params: Parameters<ListNetworks>
-    ): ReturnType<ListNetworks>
-
     /**
      *
      */