Add optional questionnaire websocket

ds-wizard · Apr 18, 2024 · 9e15a73 · 9e15a73
1 parent 318968c
commit 9e15a73
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/engine-shared/elm/Shared/AbstractAppState.elm b/engine-shared/elm/Shared/AbstractAppState.elm
@@ -7,6 +7,7 @@ import Shared.Data.BootstrapConfig exposing (BootstrapConfig)
 type alias AbstractAppState a =
     { a
         | apiUrl : String
+        , webSocketUrl : Maybe String
         , session : Session
         , config : BootstrapConfig
     }
diff --git a/engine-shared/elm/Shared/Api.elm b/engine-shared/elm/Shared/Api.elm
@@ -220,7 +220,7 @@ httpPut url body appState toMsg =
 
 wsUrl : String -> AbstractAppState b -> String
 wsUrl url appState =
-    String.replace "http" "ws" <| authorizedUrl url appState
+    String.replace "http" "ws" <| authorizedWebSocketUrl url appState
 
 
 authorizationHeaders : AbstractAppState b -> List Http.Header
@@ -232,17 +232,25 @@ authorizationHeaders appState =
         []
 
 
-authorizedUrl : String -> AbstractAppState b -> String
-authorizedUrl url appState =
+authorizedWebSocketUrl : String -> AbstractAppState b -> String
+authorizedWebSocketUrl url appState =
     let
         token =
             if not <| String.isEmpty appState.session.token.token then
                 "?" ++ "Authorization=Bearer%20" ++ appState.session.token.token
 
             else
                 ""
+
+        apiUrl =
+            case appState.webSocketUrl of
+                Just webSocketUrl ->
+                    webSocketUrl
+
+                Nothing ->
+                    String.replace "http" "ws" appState.apiUrl
     in
-    appState.apiUrl ++ url ++ token
+    apiUrl ++ url ++ token
 
 
 expectJson : ToMsg a msg -> Decoder a -> Http.Expect msg

diff --git a/engine-wizard/elm/Wizard/Common/AppState.elm b/engine-wizard/elm/Wizard/Common/AppState.elm
@@ -44,6 +44,7 @@ type alias AppState =
     , key : Key
     , apiUrl : String
     , clientUrl : String
+    , webSocketUrl : Maybe String
     , config : BootstrapConfig
     , provisioning : Provisioning
     , valid : Bool
@@ -111,6 +112,7 @@ init flagsValue key =
       , key = key
       , apiUrl = flags.apiUrl
       , clientUrl = flags.clientUrl
+      , webSocketUrl = flags.webSocketUrl
       , config = flags.config
       , provisioning = provisioning
       , valid = flags.success

diff --git a/engine-wizard/elm/Wizard/Common/Flags.elm b/engine-wizard/elm/Wizard/Common/Flags.elm
@@ -19,6 +19,7 @@ type alias Flags =
     , seed : Int
     , apiUrl : String
     , clientUrl : String
+    , webSocketUrl : Maybe String
     , config : BootstrapConfig
     , provisioning : Provisioning
     , localProvisioning : Provisioning
@@ -39,6 +40,7 @@ decoder =
         |> D.required "seed" D.int
         |> D.required "apiUrl" D.string
         |> D.required "clientUrl" D.string
+        |> D.optional "webSocketUrl" (D.maybe D.string) Nothing
         |> D.required "config" BootstrapConfig.decoder
         |> D.optional "provisioning" Provisioning.decoder Provisioning.default
         |> D.optional "localProvisioning" Provisioning.decoder Provisioning.default
@@ -57,6 +59,7 @@ default =
     , seed = 0
     , apiUrl = ""
     , clientUrl = ""
+    , webSocketUrl = Nothing
     , config = BootstrapConfig.default
     , provisioning = Provisioning.default
     , localProvisioning = Provisioning.default

diff --git a/engine-wizard/index.js b/engine-wizard/index.js
@@ -79,6 +79,10 @@ function localProvisioning() {
     return null
 }
 
+function getWebSocketUrl() {
+    return window.app && window.app['websocketUrl']
+}
+
 function bootstrapErrorHTML(errorCode) {
     const title = errorCode ? (errorCode === 423 ? 'Plan expired' : 'Bootstrap Error') : 'Bootstrap Error'
     const message = errorCode ? (errorCode === 423 ? 'The application does not have any active plan.' : 'Server responded with an error code ' + errorCode + '.') : 'Configuration cannot be loaded due to server unavailable.'
@@ -107,6 +111,7 @@ function loadApp(config, locale, provisioning) {
         selectedLocale: JSON.parse(localStorage.locale || null),
         apiUrl: getApiUrl(config),
         clientUrl: clientUrl(),
+        webSocketUrl : getWebSocketUrl(),
         config: config,
         provisioning: provisioning,
         localProvisioning: localProvisioning(),