From 2cc492e675d02af1618003e98abfb97c3324beab Mon Sep 17 00:00:00 2001
From: Simon Coen <32054457+Siolto@users.noreply.github.com>
Date: Thu, 24 Nov 2022 21:43:10 +0100
Subject: [PATCH] fix: wait for the injection of wdi5 till the redirection
 finished (#379)

- wait for the injection of wdi5 till the redirection finished
- access the config differently depending on the scenario (latInject, multiRemote)
---
 src/lib/wdi5-bridge.ts |  8 ++++----
 src/service.ts         | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/lib/wdi5-bridge.ts b/src/lib/wdi5-bridge.ts
index 75fc4469..85ac0069 100644
--- a/src/lib/wdi5-bridge.ts
+++ b/src/lib/wdi5-bridge.ts
@@ -131,16 +131,16 @@ export async function injectUI5(config: wdi5Config, browserInstance) {
     return result
 }
 
-export async function checkForUI5Page() {
+export async function checkForUI5Page(browserInstance) {
     // wait till the loading finished and the state is "completed"
-    await browser.waitUntil(async () => {
-        const state = await browser.executeAsync((done) => {
+    await browserInstance.waitUntil(async () => {
+        const state = await browserInstance.executeAsync((done) => {
             done(document.readyState)
         })
         return state === "complete"
     })
     // sap in global window namespace denotes (most likely :) ) that ui5 is present
-    return await browser.executeAsync((done) => {
+    return await browserInstance.executeAsync((done) => {
         done(!!window.sap)
     })
 }
diff --git a/src/service.ts b/src/service.ts
index 90c0a148..0657a916 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -30,7 +30,7 @@ export default class Service implements Services.ServiceInstance {
                     await authenticate(this._capabilities[name].capabilities["wdi5:authentication"], name)
                 }
                 if (!this._config.wdi5.skipInjectUI5OnStart) {
-                    await injectUI5(this._config as wdi5Config, browser[name])
+                    await this.injectUI5(browser[name])
                 } else {
                     Logger.warn("skipped wdi5 injection!")
                 }
@@ -40,7 +40,7 @@ export default class Service implements Services.ServiceInstance {
                 await authenticate(this._capabilities["wdi5:authentication"])
             }
             if (!this._config.wdi5.skipInjectUI5OnStart) {
-                await injectUI5(this._config as wdi5Config, browser)
+                await this.injectUI5(browser)
             } else {
                 Logger.warn("skipped wdi5 injection!")
             }
@@ -53,8 +53,10 @@ export default class Service implements Services.ServiceInstance {
      * to the injectUI5 function of the actual wdi5-bridge
      */
     async injectUI5(browserInstance = browser) {
-        if (await checkForUI5Page()) {
-            await injectUI5(browserInstance.config as wdi5Config, browserInstance)
+        if (await checkForUI5Page(browserInstance)) {
+            // depending on the scenario (lateInject, multiRemote) we have to access the config differently
+            const config = this._config ? this._config : browserInstance.config
+            await injectUI5(config as wdi5Config, browserInstance)
         } else {
             throw new Error("wdi5: no UI5 page/app present to work on :(")
         }