[server] some refactoring

bin/gargantext-server/Main.hs

@@ -11,7 +11,6 @@ Script to start gargantext with different modes (Dev, Prod, Mock).
 
 -}
 
-{-# LANGUAGE QuasiQuotes          #-}
 {-# LANGUAGE StandaloneDeriving   #-}
 {-# LANGUAGE Strict               #-}
 {-# LANGUAGE TypeOperators        #-}
@@ -22,16 +21,17 @@ Script to start gargantext with different modes (Dev, Prod, Mock).
 module Main where
 
 
+import Data.Maybe (fromMaybe)
 import Data.Text (unpack)
 import Data.Version (showVersion)
+import GHC.IO.Encoding
 import Gargantext.API (startGargantext) -- , startGargantextMock)
 import Gargantext.API.Admin.EnvTypes
 import Gargantext.Prelude
 import Gargantext.System.Logging
-import GHC.IO.Encoding
 import Options.Generic
+import Paths_gargantext qualified as PG -- cabal magic build module
 import System.Exit (exitSuccess)
-import qualified Paths_gargantext as PG -- cabal magic build module
 
 
 instance ParseRecord Mode
@@ -69,9 +69,7 @@ main = withLogger () $ \ioLogger -> do
   else
     return ()
   ---------------------------------------------------------------
-  let myPort' = case myPort of
-        Just p  -> p
-        Nothing -> 8008
+  let myPort' = fromMaybe 8008 myPort
 
       myIniFile' = case myIniFile of
           Nothing -> panicTrace "[ERROR] gargantext.ini needed"

src/Gargantext/API.hs

@@ -27,41 +27,37 @@ Pouillard (who mainly made it).
 -}
 
 {-# LANGUAGE BangPatterns         #-}
-{-# LANGUAGE NumericUnderscores   #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeFamilies         #-}
 {-# LANGUAGE TypeOperators        #-}
 module Gargantext.API
       where
 
-import Control.Concurrent
-import Control.Lens hiding (Level)
 import Data.List (lookup)
 import Data.Text (pack)
 import Data.Text.Encoding qualified as TE
 import Data.Text.IO (putStrLn)
-import Data.Validity
 import Gargantext.API.Admin.Auth.Types (AuthContext)
 import Gargantext.API.Admin.EnvTypes (Env, Mode(..))
 import Gargantext.API.Admin.Settings (newEnv)
-import Gargantext.API.Admin.Settings.CORS
+import Gargantext.API.Admin.Settings.CORS ( corsAllowedOrigins, CORSOrigin(_CORSOrigin), CORSSettings )
 import Gargantext.API.Admin.Types (FireWall(..), PortNumber, cookieSettings, jwtSettings, settings, corsSettings)
-import Gargantext.API.EKG
+import Gargantext.API.EKG ( ekgServer, newEkgStore, EkgAPI )
 import Gargantext.API.Middleware (logStdoutDevSanitised)
-import Gargantext.API.Routes
+import Gargantext.API.Routes ( API, GargAPI )
 import Gargantext.API.Server (server)
 import Gargantext.Database.Prelude qualified as DB
 import Gargantext.Prelude hiding (putStrLn)
-import Gargantext.System.Logging
-import Network.HTTP.Types hiding (Query)
-import Network.Wai
-import Network.Wai.Handler.Warp hiding (defaultSettings)
+import Gargantext.System.Logging ( withLoggerHoisted )
+import Network.HTTP.Types ( methodDelete, methodGet, methodHead, methodOptions, methodPost, methodPut )
+import Network.Wai ( Middleware, Request(requestHeaders) )
+import Network.Wai.Handler.Warp (run)
 import Network.Wai.Middleware.Cors
-import Network.Wai.Middleware.RequestLogger
+import Network.Wai.Middleware.RequestLogger ( logStdout )
 import Paths_gargantext (getDataDir)
 import Servant hiding (Header)
 import System.Cron.Schedule qualified as Cron
-import System.FilePath
+import System.FilePath ( (</>) )
 
 -- | startGargantext takes as parameters port number and Ini file.
 startGargantext :: Mode -> PortNumber -> FilePath -> IO ()
@@ -79,7 +75,7 @@ startGargantext mode port file = withLoggerHoisted mode $ \logger -> do
             (\(_ :: SomeException) -> pure $ Right False)
           case r of
             Right True -> pure ()
-            _ -> panicTrace $
+            _left -> panicTrace $
               "You must run 'gargantext-init " <> pack file <>
               "' before running gargantext-server (only the first time)."
 
@@ -131,7 +127,7 @@ fireWall req fw = do
 
     if  origin == Just (encodeUtf8 "http://localhost:8008")
        && host == Just (encodeUtf8 "localhost:3000")
-       || (not $ unFireWall fw)
+       || not (unFireWall fw)
 
        then pure True
        else pure False
@@ -149,7 +145,7 @@ makeGargMiddleware crsSettings mode = do
             }
     case mode of
       Prod -> pure $ logStdout . corsMiddleware
-      _    -> do
+      _otherwise    -> do
         loggerMiddleware <- logStdoutDevSanitised
         pure $ loggerMiddleware . corsMiddleware
   where