feat: update

Author: srghma

dev-commands/dev/default.nix

@@ -94,16 +94,16 @@ config.mkScripts {
     databaseAnonymousPassword="${(import "${pkgs.rootProjectDir}/config/ignored/passwords.nix").DATABASE_ANONYMOUS_PASSWORD}" \
     oauthGithubClientSecret="${(import "${pkgs.rootProjectDir}/config/ignored/github-oauth.nix").CLIENT_SECRET}" \
       spago --config spago-api-server.dhall run --main ApiServer.Main --node-args '\
-        --export-gql-schema-path "${pkgs.rootProjectDir}/schemas/schema.graphql" \
-        --export-json-schema-path "${pkgs.rootProjectDir}/schemas/schema.json" \
+        --exportGqlSchemaPath "${pkgs.rootProjectDir}/schemas/schema.graphql" \
+        --exportJsonSchemaPath "${pkgs.rootProjectDir}/schemas/schema.json" \
         --port 3000 \
-        --client-port 3001 \
+        --clientPort 3001 \
         --hostname localhost \
         --rootUrl "http://localhost:3000" \
-        --database-name "${(import "${pkgs.rootProjectDir}/config/public/database.nix").DATABASE_NAME}" \
-        --database-hostname "$POSTGRES_HOST" \
-        --database-port "$POSTGRES_PORT" \
-        --oauth-github-client-id "${(import "${pkgs.rootProjectDir}/config/ignored/github-oauth.nix").CLIENT_ID}" \
+        --databaseName "${(import "${pkgs.rootProjectDir}/config/public/database.nix").DATABASE_NAME}" \
+        --databaseHost "$POSTGRES_HOST" \
+        --databasePort "$POSTGRES_PORT" \
+        --oauthGithubClientID "${(import "${pkgs.rootProjectDir}/config/ignored/github-oauth.nix").CLIENT_ID}" \
       '
   '';
 
@@ -133,4 +133,14 @@ config.mkScripts {
     chromeUserDataDirPath="$chromeUserDataDirPath" \
       exec spago --config spago-feature-tests.dhall run --main FeatureTests.Main
   '';
+
+  dev__worker__run = config.mkCommand {} ''
+    databaseOwnerPassword="${(import "${pkgs.rootProjectDir}/config/ignored/passwords.nix").DATABASE_OWNER_PASSWORD}" \
+      spago --config spago-worker.dhall run --main Worker.Main --node-args '\
+        --transportType "nodemailer-test" \
+        --databaseName "${(import "${pkgs.rootProjectDir}/config/public/database.nix").DATABASE_NAME}" \
+        --databaseHost "${lib.config.POSTGRES_HOST}" \
+        --databasePort "${builtins.toString lib.config.POSTGRES_PORT}" \
+      '
+  '';
 }

migrations/0000000002-users/04_app_hidden.tables.user_emails.up.sql

@@ -6,8 +6,14 @@ create table app_hidden.user_emails (
   is_verified boolean not null default false,
 
   verification_token text check (app_hidden.biconditional_statement(is_verified = true, verification_token IS NULL)),
-  verification_email_sent_at timestamptz check (app_hidden.biconditional_statement(is_verified = true, verification_email_sent_at IS NULL)),
-  password_reset_email_sent_at timestamptz,
+
+  -- if not yet verified - null (job didnt yet sent email) or not-null (job didnt yet process email sending request)
+  -- if verified - only null
+  verification_email_sent_at timestamptz check (app_hidden.implication(is_verified = true, verification_email_sent_at IS NULL)),
+
+  -- if not verified - only null (only verified users can change password)
+  -- if verified - null or not-null
+  password_reset_email_sent_at timestamptz check (app_hidden.implication(is_verified = false, password_reset_email_sent_at IS NULL)),
 
   created_at timestamptz not null default now(),
   updated_at timestamptz not null default now(),

migrations/0000000002-users/12_app_private.functions.really_create_user.up.sql

@@ -47,11 +47,7 @@ begin
           then null
           else encode(gen_random_bytes(4), 'hex')
         end,
-        case
-          when email_is_verified = true
-          then null
-          else now()
-        end
+        null
       )
     returning id into v_user_email_id;
 

package.json

@@ -91,6 +91,8 @@
     "jsonwebtoken": "^8.5.1",
     "jwt-then": "^1.0.1",
     "material-components-web": "~8.0.0",
+    "mjml": "^4.7.1",
+    "nodemailer": "^6.4.16",
     "passport": "^0.4.1",
     "passport-facebook-token": "^4.0.0",
     "passport-github": "^1.1.0",

packages/api-server/ApiServer/Config/FromCli.purs

@@ -26,21 +26,21 @@ type CliConfig =
 
 configParser :: Parser CliConfig
 configParser = ado
-  exportGqlSchemaPath  <- Maybe.optional $ option PathyOptparse.anyFilePosixParser $ long "export-gql-schema-path" <> metavar "ANYFILE"
-  exportJsonSchemaPath <- Maybe.optional $ option PathyOptparse.anyFilePosixParser $ long "export-json-schema-path" <> metavar "ANYFILE"
+  exportGqlSchemaPath  <- Maybe.optional $ option PathyOptparse.anyFilePosixParser $ long "exportGqlSchemaPath" <> metavar "ANYFILE"
+  exportJsonSchemaPath <- Maybe.optional $ option PathyOptparse.anyFilePosixParser $ long "exportJsonSchemaPath" <> metavar "ANYFILE"
 
   port       <- option int $ long "port" <> showDefault <> value 3000 <> metavar "INT"
-  clientPort <- Maybe.optional $ option int $ long "client-port" <> metavar "INT"
+  clientPort <- Maybe.optional $ option int $ long "clientPort" <> metavar "INT"
   hostname   <- option str $ long "hostname" <> showDefault <> value "localhost" <> metavar "HOST"
   rootUrl    <- option str $ long "rootUrl" <> showDefault <> value "http://localhost:3000" <> metavar "URL"
 
-  databaseName              <- option str $ long "database-name" <> metavar "NAME"
-  databaseHost              <- option str $ long "database-hostname" <> metavar "NAME"
-  databasePort              <- Maybe.optional $ option int $ long "database-port" <> metavar "NAME"
+  databaseName              <- option str $ long "databaseName" <> metavar "NAME"
+  databaseHost              <- option str $ long "databaseHost" <> metavar "NAME"
+  databasePort              <- Maybe.optional $ option int $ long "databasePort" <> metavar "NAME"
 
-  oauthGithubClientID <- option str $ long "oauth-github-client-id" <> metavar "CLIENTID"
+  oauthGithubClientID <- option str $ long "oauthGithubClientID" <> metavar "CLIENTID"
 
-  isProduction <- switch $ long "production"
+  isProduction <- switch $ long "isProduction"
 
   in
     { exportGqlSchemaPath

packages/feature-tests/FeatureTests/FeatureTestSpec.purs

@@ -33,7 +33,15 @@ withTransactionOrThrow dbConnection action = do
 
 withThuncateSchemas :: ∀ a. PostgreSQL.Connection -> Aff a → Aff a
 withThuncateSchemas dbConnection action = do
-  PostgreSQLTruncateSchemas.truncateSchemas dbConnection ["app_public", "app_private", "app_hidden"]
+  PostgreSQLTruncateSchemas.truncateSchemas dbConnection
+    -- ordinary tables
+    [ "app_public"
+    , "app_private"
+    , "app_hidden"
+    -- truncate OR it will retry jobs on errors
+    -- TODO: configure max_attempts from worker itself
+    , "graphile_worker"
+    ]
   action
 
 -- SpecT monadOfExample exampleConfig monadOfSpec a

packages/feature-tests/FeatureTests/Tests/Register/SuccessSpec.purs

@@ -109,3 +109,5 @@ spec = do
   ) >>= \text -> text `shouldContainString` Pattern "You are on secret page"
 
   -- TODO: email is received
+
+  pressEnterToContinue

packages/worker/Worker/Jobs/SendVerificationEmailForUserEmail.purs

@@ -25,6 +25,8 @@ import Mjml as Mjml
 import MjmlHalogenElements as MjmlHalogenElements
 import NodeMailer as NodeMailer
 import PostgreSQLExtra as PostgreSQLExtra
+import Data.Codec.Argonaut as CA
+import Data.Codec.Argonaut.Record as CAR
 
 html
   :: forall w i
@@ -69,6 +71,13 @@ newtype Input = Input
 derive instance newtypeInput :: Newtype Input _
 derive instance genericInput :: Generic Input _
 
+inputCodec ∷ CA.JsonCodec { id :: String }
+inputCodec =
+  CA.object "Input" $
+    CAR.record
+      { id: CA.string
+      }
+
 newtype UserDataFromDb
   = UserDataFromDb
     { name :: Maybe String
@@ -109,24 +118,24 @@ job
   , connection
   , transporter
   } = do
-  (input :: Input) <- genericDecodeJson json
-    # either (throwError <<< error <<< Argonaut.printJsonDecodeError) pure
+  input <- CA.decode inputCodec json
+    # either (throwError <<< error <<< CA.printJsonDecodeError) pure
 
   (userData :: UserDataFromDb) <-
     PostgreSQLExtra.queryHeadOrThrow connection
       ( Query """
       SELECT
-        t_user_email.name AS name,
+        t_user.name AS name,
         t_user_email.email AS email,
         t_user_email.is_verified AS is_verified,
-        t_user_email_secret.verification_token AS verification_token
-      FROM app_public.user_emails AS t_user_email
-        JOIN app_private.user_email_secrets AS t_user_email_secret
-        ON t_user_email.id = t_user_email_secret.user_email_id
+        t_user_email.verification_token AS verification_token
+      FROM app_hidden.user_emails AS t_user_email
+        JOIN app_public.users AS t_user
+        ON t_user.id = t_user_email.user_id
       WHERE t_user_email.id = $1
       """
       )
-      (Row1 (unwrap input).id)
+      (Row1 input.id)
 
   emailBody <- liftEffect $
     Mjml.mjml2html
@@ -155,4 +164,4 @@ job
     WHERE t_user_email_secret.user_email_id = $1
     """
     )
-    (Row1 (unwrap input).id)
+    (Row1 input.id)

schemas/schema.sql

@@ -327,11 +327,7 @@ begin
           then null
           else encode(gen_random_bytes(4), 'hex')
         end,
-        case
-          when email_is_verified = true
-          then null
-          else now()
-        end
+        null
       )
     returning id into v_user_email_id;
 
@@ -804,7 +800,8 @@ CREATE TABLE app_hidden.user_emails (
     created_at timestamp with time zone DEFAULT now() NOT NULL,
     updated_at timestamp with time zone DEFAULT now() NOT NULL,
     CONSTRAINT user_emails_check CHECK (app_hidden.biconditional_statement((is_verified = true), (verification_token IS NULL))),
-    CONSTRAINT user_emails_check1 CHECK (app_hidden.biconditional_statement((is_verified = true), (verification_email_sent_at IS NULL))),
+    CONSTRAINT user_emails_check1 CHECK (app_hidden.implication((is_verified = true), (verification_email_sent_at IS NULL))),
+    CONSTRAINT user_emails_check2 CHECK (app_hidden.implication((is_verified = false), (password_reset_email_sent_at IS NULL))),
     CONSTRAINT user_emails_email_check CHECK ((email OPERATOR(public.~) '[^@]+@[^@]+\.[^@]+'::public.citext))
 );
 

spago-worker.dhall

@@ -4,5 +4,8 @@
 , sources =
   [ "./packages/src/**/*.purs"
   , "./packages/worker/**/*.purs"
+  , "./packages/client/NextjsApp/AppM.purs"
+  , "./packages/client/NextjsApp/Route.purs"
+  , "./packages/client/NextjsApp/Link/Types.purs"
   ]
 }