[websockets] fix routing (frontend is a catch-all)

src/Gargantext/API/Routes/Named.hs

@@ -44,8 +44,9 @@ data NamedAPI mode = NamedAPI
   { swaggerAPI  :: mode :- SwaggerSchemaUI "swagger-ui" "swagger.json"
   , backendAPI  :: mode :- NamedRoutes BackEndAPI
   , graphqlAPI  :: mode :- NamedRoutes GraphQLAPI
-  , frontendAPI :: mode :- FrontEndAPI
   , wsAPI       :: mode :- NamedRoutes Dispatcher.WSAPI
+  -- NOTE: FrontEndAPI is Raw and is a catch-all so needs to be at the end!
+  , frontendAPI :: mode :- FrontEndAPI
   } deriving Generic
 
 

src/Gargantext/API/Server/Named.hs

@@ -61,12 +61,12 @@ server env =
                       (Proxy :: Proxy AuthContext)
                       (transformJSONGQL errScheme)
                       GraphQL.api
-     , frontendAPI = frontEndServer
      , wsAPI       = hoistServer
                        (Proxy :: Proxy (NamedRoutes Dispatcher.WSAPI))
                        -- (Proxy :: Proxy AuthContext)
                        (transformJSON errScheme)
                        Dispatcher.wsServer
+     , frontendAPI = frontEndServer
      }
   where
     transformJSON :: forall a. GargErrorScheme -> GargM Env BackendInternalError a -> Handler a

src/Gargantext/Core/AsyncUpdates/Dispatcher.hs

@@ -108,8 +108,7 @@ newtype WSAPI mode = WSAPI {
     wsAPIServer :: mode :- "ws" :> Summary "WebSocket endpoint" :> WS.WebSocketPending
   } deriving Generic
 
--- wsServer :: IsGargServer env err m => Settings -> SSet.Set Subscription -> WSAPI (AsServerT m)
--- wsServer authSettings subscriptions = WSAPI { wsAPI = streamData }
+
 wsServer :: ( IsGargServer env err m, HasDispatcher env, HasSettings env ) => WSAPI (AsServerT m)
 wsServer = WSAPI { wsAPIServer = streamData }
   where
@@ -129,7 +128,7 @@ wsServer = WSAPI { wsAPIServer = streamData }
       -- Sec-WebSocket-Key so we want to make that even more unique.
       uuid <- liftBase $ UUID.nextRandom
       let key = key' <> "-" <> show uuid
-      liftBase $ putText $ show $ WS.requestHeaders reqHead
+      -- liftBase $ putText $ show $ WS.requestHeaders reqHead
       c <- liftBase $ WS.acceptRequest pc
       let ws = WSKeyConnection (key, c)
       _ <- liftBase $ Async.concurrently (wsLoop authSettings subscriptions ws) (pingLoop ws)