[ws] some small refactoring

src/Gargantext/API/GraphQL.hs

@@ -25,7 +25,7 @@ import Data.Morpheus ( App, deriveApp )
 import Data.Morpheus.Server ( httpPlayground )
 import Data.Morpheus.Subscriptions ( Event (..), httpPubApp )
 import Data.Morpheus.Types ( GQLRequest, GQLResponse, GQLType, RootResolver(..), Undefined, defaultRootResolver)
-import Data.Proxy
+-- import Data.Proxy
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser)
 import Gargantext.API.Admin.Orchestrator.Types (JobLog)
 import Gargantext.API.Admin.Types (HasSettings)
@@ -167,8 +167,8 @@ data GraphQLAPIEndpoints mode = GraphQLAPIEndpoints
   }
   deriving Generic
 
-gqapi :: Proxy (ToServantApi GraphQLAPI)
-gqapi = Proxy
+-- gqapi :: Proxy (ToServantApi GraphQLAPI)
+-- gqapi = Proxy
 
 -- | Implementation of our API.
 api

src/Gargantext/API/Routes/Named.hs

@@ -43,7 +43,7 @@ newtype API mode = API
 data NamedAPI mode = NamedAPI
   { swaggerAPI  :: mode :- SwaggerSchemaUI "swagger-ui" "swagger.json"
   , backendAPI  :: mode :- NamedRoutes BackEndAPI
-  , graphqlAPI  :: mode :- NamedRoutes GraphQLAPI -- FIXME(adn) convert to named!
+  , graphqlAPI  :: mode :- NamedRoutes GraphQLAPI
   , frontendAPI :: mode :- FrontEndAPI
   , wsAPI       :: mode :- NamedRoutes Dispatcher.WSAPI
   } deriving Generic

src/Gargantext/API/Server/Named.hs

@@ -62,9 +62,9 @@ server env =
                       (transformJSONGQL errScheme)
                       GraphQL.api
      , frontendAPI = frontEndServer
-     , wsAPI       = hoistServerWithContext
+     , wsAPI       = hoistServer
                        (Proxy :: Proxy (NamedRoutes Dispatcher.WSAPI))
-                       (Proxy :: Proxy AuthContext)
+                       -- (Proxy :: Proxy AuthContext)
                        (transformJSON errScheme)
                        Dispatcher.wsServer
      }

src/Gargantext/Core/AsyncUpdates/Dispatcher.hs

@@ -113,7 +113,8 @@ newtype WSAPI mode = WSAPI {
 wsServer :: ( IsGargServer env err m, HasDispatcher env, HasSettings env ) => WSAPI (AsServerT m)
 wsServer = WSAPI { wsAPIServer = streamData }
   where
-    streamData :: ( IsGargServer env err m, HasDispatcher env, HasSettings env ) => WS.PendingConnection -> m ()
+    streamData :: ( IsGargServer env err m, HasDispatcher env, HasSettings env )
+               => WS.PendingConnection -> m ()
     streamData pc = do
       authSettings <- view settings
       d <- view hasDispatcher