cannon: Add /websocket endpoint which is the same as /await

changelog.d/5-internal/websocket-endpoint

@@ -0,0 +1 @@
+cannon: Add /websocket endpoint which is the same as /await

charts/cannon/conf/static/zauth.acl

@@ -1,2 +1,3 @@
 a (whitelist (regex "/await")
+             (regex "/websocket")
              (regex "(/v[0-9]+)?/events"))

charts/cannon/values.yaml

@@ -107,6 +107,10 @@ nginx_conf:
       envs:
       - all
       use_websockets: true
+    - path: /websocket
+      envs:
+      - all
+      use_websockets: true
     - path: /events
       envs:
       - all

libs/wire-api/src/Wire/API/Routes/Public/Cannon.hs

@@ -44,6 +44,23 @@ type CannonAPI =
         -- FUTUREWORK: Consider higher-level web socket combinator
         :> WebSocketPending
     )
+    :<|> Named
+           "websocket"
+           ( Summary "Establish websocket connection"
+               :> Description "This is a temporary copy of await, please do not use it"
+               :> "websocket"
+               :> ZUser
+               :> ZConn
+               :> QueryParam'
+                    [ Optional,
+                      Strict,
+                      Description "Client ID"
+                    ]
+                    "client"
+                    ClientId
+               -- FUTUREWORK: Consider higher-level web socket combinator
+               :> WebSocketPending
+           )
     :<|> Named
            "consume-events@v8"
            ( Summary "Consume events over a websocket connection"

services/cannon/src/Cannon/API/Public.hs

@@ -36,6 +36,7 @@ import Wire.API.Routes.Public.Cannon
 publicAPIServer :: ServerT CannonAPI Cannon
 publicAPIServer =
   Named @"await-notifications" streamData
+    :<|> Named @"websocket" streamData
     :<|> Named @"consume-events@v8" (\userId mClientId -> consumeEvents userId mClientId Nothing)
     :<|> Named @"consume-events" consumeEvents