feat: move

Author: srghma

dev-commands/all-commands.nix

@@ -20,5 +20,5 @@ config = rec {
 in
 
 builtins.concatLists [
-  (import ./import/default.nix { inherit pkgs config; })
+  (import ./dev/default.nix { inherit pkgs config; })
 ]

dev-commands/import/default.nix renamed to dev-commands/dev/default.nix

@@ -4,30 +4,30 @@ with config;
 with (import ./lib.nix { inherit pkgs; });
 
 mkScripts {
-  import__cat = ''
+  dev__cat = ''
     arion \
       --file docker/import.nix \
       --pkgs nix/pkgs.nix \
       cat
   '';
 
-  import__down = ''
+  dev__down = ''
     COMPOSE_PROJECT_NAME="nextjsdemo_import" \
       arion \
       --file docker/import.nix \
       --pkgs nix/pkgs.nix \
       down
   '';
 
-  import__up_detach = ''
+  dev__up_detach = ''
     COMPOSE_PROJECT_NAME="nextjsdemo_import" \
       arion \
       --file docker/import.nix \
       --pkgs nix/pkgs.nix \
       up --detach
   '';
 
-  import__db_tests = mkCommand migratorEnv ''
+  dev__db_tests = mkCommand migratorEnv ''
     waitforit -host=$POSTGRES_HOST -port=$POSTGRES_PORT -timeout=30
 
     PGPASSWORD=$DATABASE_OWNER_PASSWORD \
@@ -38,12 +38,12 @@ mkScripts {
       pg_prove -h $POSTGRES_HOST -p $POSTGRES_PORT -d $DATABASE_NAME -U $DATABASE_OWNER --recurse --ext .sql ./db_tests/tests/
   '';
 
-  import__db__dump_schema = mkCommand migratorEnv ''
+  dev__db__dump_schema = mkCommand migratorEnv ''
     DATABASE_URL=postgres://$DATABASE_OWNER:$DATABASE_OWNER_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$DATABASE_NAME \
       dump-schema
   '';
 
-  import__db__migrate = mkCommand migratorEnv ''
+  dev__db__migrate = mkCommand migratorEnv ''
     waitforit -host=$POSTGRES_HOST -port=$POSTGRES_PORT -timeout=30
 
     wait-for-postgres --dbname=postgres://$DATABASE_OWNER:$DATABASE_OWNER_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$DATABASE_NAME
@@ -62,7 +62,7 @@ mkScripts {
       migrate
   '';
 
-  import__server = mkCommand serverEnv ''
+  dev__server = mkCommand serverEnv ''
     waitforit -host=$POSTGRES_HOST -port=$POSTGRES_PORT -timeout=30
 
     wait-for-postgres --dbname=postgres://$DATABASE_OWNER:$DATABASE_OWNER_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$DATABASE_NAME
@@ -92,11 +92,11 @@ mkScripts {
       '
   '';
 
-  import__purescript-graphql-client-generator = ''
+  dev__purescript-graphql-client-generator = ''
     purescript-graphql-client-generator --input-json ./schemas/schema.json --output app/Api --api Api
   '';
 
-  import__db__drop = ''
+  dev__db__drop = ''
     docker-volume-rm-if-exists nextjsdemo_import_postgres_data
   '';
 }

dev-commands/import/lib.nix renamed to dev-commands/dev/lib.nix

@@ -0,0 +1,98 @@
+-- | !!!!
+-- | THIS IMPLEMENTATION IS BASED ON
+-- | https://github.com/graphile/bootstrap-react-apollo/tree/master/server/middleware
+
+module ApiServer.Main where
+
+import Data.Maybe
+import Effect.Uncurried
+import Pathy
+import Protolude
+
+import ApiServer.Config as ApiServer.Config
+import ApiServer.DatabasePools as ApiServer.DatabasePools
+import ApiServer.Passport as ApiServer.Passport
+import ApiServer.Postgraphile as ApiServer.Postgraphile
+import ApiServer.SessionMiddleware as ApiServer.SessionMiddleware
+import Data.NonEmpty (NonEmpty(..))
+import Data.String.NonEmpty (NonEmptyString)
+import Data.String.NonEmpty as NonEmptyString
+import Effect (Effect)
+import Effect.Console (log)
+import Env as Env
+import Node.Express.App (useExternal)
+import Node.Express.App as Express
+import Node.Express.Response as Express
+import Options.Applicative as Options.Applicative
+import Postgraphile as Postgraphile
+import Node.HTTP as Node.HTTP
+-- | import ApiServer.FrontendServerHttpProxy as ApiServer.FrontendServerHttpProxy
+
+app :: Express.App
+app = Express.get "/" $ Express.send "Hello, World!"
+
+main :: Effect Unit
+main = do
+  config <- ApiServer.Config.config
+
+  pools <- ApiServer.DatabasePools.createPools
+    { databaseName:                  config.databaseName
+    , databaseHost:                  config.databaseHost
+    , databasePort:                  config.databasePort
+    , databaseOwnerUser:             config.databaseOwnerUser
+    , databaseOwnerPassword:         config.databaseOwnerPassword
+    , databaseAuthenticatorUser:     config.databaseAuthenticatorUser
+    , databaseAuthenticatorPassword: config.databaseAuthenticatorPassword
+    }
+
+  sessionMiddleware <- ApiServer.SessionMiddleware.sessionMiddleware
+    { target:        config.target
+    , rootPgPool:    pools.rootPgPool
+    , sessionSecret: config.sessionSecret
+    }
+
+  passportMiddlewareAndRoutes <- ApiServer.Passport.passportMiddlewareAndRoutes
+    { oauthGithubClientID:     config.oauthGithubClientID
+    , oauthGithubClientSecret: config.oauthGithubClientSecret
+    , rootUrl:                 config.rootUrl
+    }
+
+  let middlewares = [sessionMiddleware] <> passportMiddlewareAndRoutes.middlewares
+
+  let postgraphileMiddleware = ApiServer.Postgraphile.mkMiddleware
+        { authPgPool:            pools.authPgPool
+        , rootPgPool:            pools.rootPgPool
+        , websocketMiddlewares:  middlewares
+        , target:                config.target
+        , databaseName:          config.databaseName
+        , databaseHost:          config.databaseHost
+        , databasePort:          config.databasePort
+        , databaseOwnerUser:     config.databaseOwnerUser
+        , databaseOwnerPassword: config.databaseOwnerPassword
+        , databaseVisitorUser:   config.databaseVisitorUser
+        }
+
+  expressApp <- Express.mkApplication
+
+  flip Express.apply expressApp do
+     for_ (middlewares <> [postgraphileMiddleware]) Express.useExternal
+
+  httpServer <- Express._httpServer expressApp
+
+  runEffectFn2 Postgraphile.enhanceHttpServerWithSubscriptions httpServer postgraphileMiddleware
+
+  -- | case config.target of
+  -- |      ApiServer.Config.Development developmentConfig -> do
+  -- |        let url = "http://localhost:" <> show developmentConfig.clientPort
+  -- |        log $ "Proxying client on " <> url
+  -- |        ApiServer.FrontendServerHttpProxy.installFrontendServerProxy httpServer expressApp url
+  -- |      _ -> pure unit
+
+  Node.HTTP.listen
+    httpServer
+    { backlog: Nothing
+    , hostname: config.hostname
+    , port: config.port
+    }
+    do
+      log $ "Listening on " <> config.hostname <> ":" <> show config.port <> ", public url " <> config.rootUrl

api-server/.src/index.js renamed to packages/api-server/.src/index.js

@@ -0,0 +1,16 @@
+module Test.AllTests where
+
+import Prelude
+import Test.Spec (describe)
+import Lib.FeatureTest (FeatureTestSpecInternal, it, itOnly)
+import FeatureTests.Login.SuccessSpec as FeatureTests.Login.SuccessSpec
+import FeatureTests.Login.ErrorNotConfirmedSpec as FeatureTests.Login.ErrorNotConfirmedSpec
+import FeatureTests.Register.SuccessSpec as FeatureTests.Register.SuccessSpec
+
+allTests :: FeatureTestSpecInternal Unit
+allTests = do
+  describe "login" do
+    itOnly "success" FeatureTests.Login.SuccessSpec.spec
+    it "error not confirmed" FeatureTests.Login.ErrorNotConfirmedSpec.spec
+  describe "register" do
+    it "success" FeatureTests.Register.SuccessSpec.spec

api-server/.src/lib/allowCrossDomain.js renamed to packages/api-server/.src/lib/allowCrossDomain.js

@@ -0,0 +1,100 @@
+module ApiServer.Config where
+
+import Data.Maybe
+import Pathy
+import Protolude
+
+import ApiServer.DatabasePools as ApiServer.DatabasePools
+import ApiServer.Passport as ApiServer.Passport
+import Control.Monad.Error.Class (throwError)
+import Data.NonEmpty (NonEmpty(..))
+import Data.String.NonEmpty (NonEmptyString)
+import Data.String.NonEmpty as NonEmptyString
+import Effect (Effect)
+import Effect.Console (log)
+import Env as Env
+import Node.Express.App as Express
+import Node.Express.Response as Express
+import Options.Applicative as Options.Applicative
+import ApiServer.CliConfig as ApiServer.CliConfig
+import ApiServer.EnvConfig as ApiServer.EnvConfig
+
+type DevelopmentConfig =
+  { exportGqlSchemaPath  :: AnyFile
+  , exportJsonSchemaPath :: AnyFile
+  , clientPort :: Int
+  }
+
+data ConfigTarget
+  = Production
+  | Development DevelopmentConfig
+
+-- from args
+type Config =
+  { target       :: ConfigTarget
+
+  -- listen to, before the proxy
+  , port         :: Int    -- e.g. "3000"
+  , hostname         :: String -- e.g. "127.0.0.1", N.B. host is hostname + port
+
+  -- for callbackURL, after the proxy
+  , rootUrl :: String -- e.g. "http://mysite"
+
+  , databaseName :: String
+  , databaseHost :: String
+  , databasePort :: Maybe Int
+  , databaseOwnerUser             :: String
+  , databaseOwnerPassword         :: NonEmptyString
+  , databaseAuthenticatorUser     :: String
+  , databaseAuthenticatorPassword :: NonEmptyString
+  , databaseVisitorUser     :: String
+
+  , oauthGithubClientID     :: String
+  , oauthGithubClientSecret :: NonEmptyString
+
+  , sessionSecret             :: NonEmptyString
+  }
+
+config :: Effect Config
+config = do
+  cliConfig <- Options.Applicative.execParser ApiServer.CliConfig.opts
+  envConfig <- ApiServer.EnvConfig.envConfig
+
+  target <-
+    if cliConfig.isProdunction
+      then pure Production
+      else do
+        let
+            (developmentConfigTarget :: Maybe DevelopmentConfig) =
+              { exportGqlSchemaPath: _
+              , exportJsonSchemaPath: _
+              , clientPort: _
+              }
+              <$> cliConfig.exportGqlSchemaPath
+              <*> cliConfig.exportJsonSchemaPath
+              <*> cliConfig.clientPort
+
+        maybe (throwError $ error "invalid developmentConfigTarget") (pure <<< Development) developmentConfigTarget
+
+  pure
+    { target
+
+    , port: cliConfig.port
+    , hostname: cliConfig.hostname
+
+    , rootUrl: cliConfig.rootUrl
+
+    , databaseName:                  cliConfig.databaseName
+    , databaseHost:                  cliConfig.databaseHost
+    , databasePort:                  cliConfig.databasePort
+    , databaseOwnerUser:             cliConfig.databaseOwnerUser
+    , databaseOwnerPassword:         envConfig.databaseOwnerPassword
+    , databaseAuthenticatorUser:     cliConfig.databaseAuthenticatorUser
+    , databaseAuthenticatorPassword: envConfig.databaseAuthenticatorPassword
+    , databaseVisitorUser:           cliConfig.databaseVisitorUser
+
+    , oauthGithubClientID:     cliConfig.oauthGithubClientID
+    , oauthGithubClientSecret: envConfig.oauthGithubClientSecret
+
+    , sessionSecret: envConfig.sessionSecret
+    }