rollback userUrl addition in status method. reflect changes to dapp-api specs in extension

pawelstepien-da · pawelstepien-da · commit 2178086dd3bf · 2025-12-04T10:00:31.000+01:00
Signed-off-by: Pawel Stepien &lt;pawel.stepien@digitalasset.com&gt;
diff --git a/api-specs/openrpc-dapp-api.json b/api-specs/openrpc-dapp-api.json
@@ -578,12 +578,7 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": [
-                    "kernel",
-                    "isConnected",
-                    "isNetworkConnected",
-                    "userUrl"
-                ]
+                "required": ["kernel", "isConnected", "isNetworkConnected"]
             }
         }
     }
diff --git a/api-specs/openrpc-dapp-remote-api.json b/api-specs/openrpc-dapp-remote-api.json
@@ -607,12 +607,7 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": [
-                    "kernel",
-                    "isConnected",
-                    "isNetworkConnected",
-                    "userUrl"
-                ]
+                "required": ["kernel", "isConnected", "isNetworkConnected"]
             }
         }
     }
diff --git a/core/wallet-dapp-remote-rpc-client/src/index.ts b/core/wallet-dapp-remote-rpc-client/src/index.ts
@@ -198,7 +198,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
-    userUrl: UserUrl
+    userUrl?: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/core/wallet-dapp-remote-rpc-client/src/openrpc.json b/core/wallet-dapp-remote-rpc-client/src/openrpc.json
@@ -607,12 +607,7 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": [
-                    "kernel",
-                    "isConnected",
-                    "isNetworkConnected",
-                    "userUrl"
-                ]
+                "required": ["kernel", "isConnected", "isNetworkConnected"]
             }
         }
     }
diff --git a/core/wallet-dapp-rpc-client/src/index.ts b/core/wallet-dapp-rpc-client/src/index.ts
@@ -199,7 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
-    userUrl: UserUrl
+    userUrl?: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/core/wallet-dapp-rpc-client/src/openrpc.json b/core/wallet-dapp-rpc-client/src/openrpc.json
@@ -578,12 +578,7 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": [
-                    "kernel",
-                    "isConnected",
-                    "isNetworkConnected",
-                    "userUrl"
-                ]
+                "required": ["kernel", "isConnected", "isNetworkConnected"]
             }
         }
     }
diff --git a/sdk/dapp-sdk/src/dapp-api/rpc-gen/typings.ts b/sdk/dapp-sdk/src/dapp-api/rpc-gen/typings.ts
@@ -199,7 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
-    userUrl: UserUrl
+    userUrl?: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/sdk/dapp-sdk/src/provider.ts b/sdk/dapp-sdk/src/provider.ts
@@ -163,7 +163,7 @@ export const dappController = (provider: SpliceProvider) =>
                 })
 
             if (!response.status.isConnected)
-                openKernelUserUI('remote', response.status.userUrl)
+                openKernelUserUI('remote', response.status.userUrl ?? '')
 
             const promise = new Promise<dappAPI.ConnectResult>(
                 (resolve, reject) => {
@@ -207,8 +207,7 @@ export const dappController = (provider: SpliceProvider) =>
                     params,
                 })
 
-            if (!response.isConnected)
-                openKernelUserUI('remote', response.userUrl)
+            if (response.userUrl) openKernelUserUI('remote', response.userUrl)
 
             const promise = new Promise<dappAPI.PrepareExecuteResult>(
                 (resolve, reject) => {
diff --git a/wallet-gateway/extension/src/dapp-api/controller.ts b/wallet-gateway/extension/src/dapp-api/controller.ts
@@ -30,8 +30,17 @@ export const dappController = (store?: Store) =>
                     isConnected: false,
                     isNetworkConnected: false,
                     networkReason: 'Unauthenticated',
-                    networkId: 'default-network-id',
                     userUrl: Browser.runtime.getURL('pages/user.html'),
+                    network: {
+                        networkId: 'default-network-id',
+                        ledgerApi: {
+                            baseUrl: 'http://default-ledger-api',
+                        },
+                    },
+                    session: {
+                        accessToken: 'default-access-token',
+                        userId: 'default-user-id',
+                    },
                 },
                 sessionToken: 'default-session-token',
             }),
diff --git a/wallet-gateway/extension/src/dapp-api/rpc-gen/typings.ts b/wallet-gateway/extension/src/dapp-api/rpc-gen/typings.ts
@@ -199,7 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
-    userUrl: UserUrl
+    userUrl?: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/wallet-gateway/remote/src/dapp-api/controller.ts b/wallet-gateway/remote/src/dapp-api/controller.ts
@@ -214,7 +214,6 @@ export const dappController = (
                     isConnected: false,
                     isNetworkConnected: false,
                     networkReason: 'Unauthenticated',
-                    userUrl: `${userUrl}/login/`,
                 }
             }
 
@@ -231,7 +230,6 @@ export const dappController = (
                 isConnected: true,
                 isNetworkConnected: status.isConnected,
                 networkReason: status.reason ? status.reason : 'OK',
-                userUrl: `${userUrl}/login/`,
                 network: {
                     networkId: network.id,
                     ledgerApi: {
diff --git a/wallet-gateway/remote/src/dapp-api/rpc-gen/typings.ts b/wallet-gateway/remote/src/dapp-api/rpc-gen/typings.ts
@@ -198,7 +198,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
-    userUrl: UserUrl
+    userUrl?: UserUrl
     network?: Network
     session?: Session
     [k: string]: any

Original file line number	Diff line number	Diff line change
`@@ -578,12 +578,7 @@`
`578`	`578`	`"required": ["accessToken", "userId"]`
`579`	`579`	`}`
`580`	`580`	`},`
`581`		`- "required": [`
`582`		`- "kernel",`
`583`		`- "isConnected",`
`584`		`- "isNetworkConnected",`
`585`		`- "userUrl"`
`586`		`- ]`
	`581`	`+ "required": ["kernel", "isConnected", "isNetworkConnected"]`
`587`	`582`	`}`
`588`	`583`	`}`
`589`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -607,12 +607,7 @@`
`607`	`607`	`"required": ["accessToken", "userId"]`
`608`	`608`	`}`
`609`	`609`	`},`
`610`		`- "required": [`
`611`		`- "kernel",`
`612`		`- "isConnected",`
`613`		`- "isNetworkConnected",`
`614`		`- "userUrl"`
`615`		`- ]`
	`610`	`+ "required": ["kernel", "isConnected", "isNetworkConnected"]`
`616`	`611`	`}`
`617`	`612`	`}`
`618`	`613`	`}`