Move passwords from tmc

kubernetes/base/headless-lms/email-deliver.yml

@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: email-deliver
+  labels:
+    app: email-deliver
+    deploymentType: with-init-container
+    needs-db: "true"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: email-deliver
+  template:
+    metadata:
+      annotations:
+        linkerd.io/inject: enabled
+      labels:
+        app: email-deliver
+    spec:
+      containers:
+        - name: email-deliver
+          image: headless-lms
+          command: ["bin/run", "email-deliver"]
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 20m
+            limits:
+              memory: 300Mi
+              cpu: 200m
+          envFrom:
+            - secretRef:
+                name: headless-lms-secrets
+      initContainers:
+        - name: headless-lms-wait-for-db
+          image: headless-lms
+          command:
+            - bash
+            - "-c"
+            - |
+              echo Waiting for postgres to be available
+              timeout 120 ./wait-for-db.sh
+              ./wait-for-db-migrations.sh
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 20m
+            limits:
+              memory: 300Mi
+              cpu: 200m
+          envFrom:
+            - secretRef:
+                name: headless-lms-secrets

kubernetes/base/kustomization.yaml

@@ -19,3 +19,4 @@ resources:
   - headless-lms/sync-tmc-users.yml
   - headless-lms/chatbot-syncer.yml
   - headless-lms/mailchimp-syncer.yml
+  - headless-lms/email-deliver.yml

kubernetes/dev/headless-lms/env.yml

@@ -24,4 +24,10 @@ data:
   ICU4X_POSTCARD_PATH: "L2ljdTR4LnBvc3RjYXJkLjI="
   # for local development only, intentionally public
   TMC_SERVER_SECRET_FOR_COMMUNICATING_TO_SECRET_PROJECT: Zm9yIGxvY2FsIGRldmVsb3BtZW50IG9ubHksIGludGVudGlvbmFsbHkgcHVibGlj
+  # for local development only, intentionally public
+  SMTP_FROM: "bm9yZXBseUBleGFtcGxlLmRldg=="
+  SMTP_HOST: "c210cC5kZXYuZXhhbXBsZS5vcmc="
+  SMTP_PORT: "NTg3"
+  SMTP_USER: "ZGV2LXVzZXI="
+  SMTP_PASS: "ZGV2LXBhc3M="
   USE_MOCK_AZURE_CONFIGURATION: "dHJ1ZQ=="

kubernetes/test/headless-lms/env.yml

@@ -24,4 +24,10 @@ data:
   ICU4X_POSTCARD_PATH: "L2ljdTR4LnBvc3RjYXJkLjI="
   # for local development only, intentionally public
   TMC_SERVER_SECRET_FOR_COMMUNICATING_TO_SECRET_PROJECT: Zm9yIGxvY2FsIGRldmVsb3BtZW50IG9ubHksIGludGVudGlvbmFsbHkgcHVibGlj
+  # for local development only, intentionally public
+  SMTP_FROM: "bm9yZXBseUBleGFtcGxlLmRldg=="
+  SMTP_HOST: "c210cC5kZXYuZXhhbXBsZS5vcmc="
+  SMTP_PORT: "NTg3"
+  SMTP_USER: "ZGV2LXVzZXI="
+  SMTP_PASS: "ZGV2LXBhc3M="
   USE_MOCK_AZURE_CONFIGURATION: "dHJ1ZQ=="

services/headless-lms/Cargo.toml

@@ -55,3 +55,5 @@ sqlx = { version = "0.8.6", features = [
   "chrono",
   "json",
 ] }
+
+secrecy = { version = "0.10.3", features = ["serde"] }

services/headless-lms/Dockerfile

@@ -1,6 +1,11 @@
 # Built from DockerfileBase.dockerfile
 FROM eu.gcr.io/moocfi-public/project-331-headless-lms-dev-base:latest as chef
-RUN chown -R user /app
+
+# Make /app writable for the non-root user
+USER root
+RUN mkdir -p /app && chown user:user /app
+
+WORKDIR /app
 USER user
 
 FROM chef AS planner

services/headless-lms/migrations/20250709091252_add_user_passwords.down.sql

@@ -0,0 +1 @@
+DROP TABLE user_passwords;

services/headless-lms/migrations/20250709091252_add_user_passwords.up.sql

@@ -0,0 +1,17 @@
+CREATE TABLE user_passwords (
+  user_id UUID PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
+  password_hash TEXT NOT NULL,
+  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  deleted_at TIMESTAMP WITH TIME ZONE
+);
+CREATE TRIGGER set_timestamp BEFORE
+UPDATE ON user_passwords FOR EACH ROW EXECUTE PROCEDURE trigger_set_timestamp();
+
+COMMENT ON TABLE user_passwords IS 'This table is used to keep a record of the users password';
+COMMENT ON COLUMN user_passwords.user_id IS 'References the unique identifier of the user.';
+COMMENT ON COLUMN user_passwords.password_hash IS 'Hashed password of the user';
+;
+COMMENT ON COLUMN user_passwords.created_at IS 'Timestamp of when the record was created.';
+COMMENT ON COLUMN user_passwords.updated_at IS 'Timestamp when the record was last updated. The field is updated automatically by the set_timestamp trigger.';
+COMMENT ON COLUMN user_passwords.deleted_at IS 'Timestamp when the record was deleted. If null, the record is not deleted.';

services/headless-lms/migrations/20250721091109_add-password-reset-tokens.down.sql

@@ -0,0 +1,22 @@
+DROP TABLE password_reset_tokens;
+
+DELETE FROM email_deliveries
+WHERE email_template_id IN (
+    SELECT id
+    FROM email_templates
+    WHERE course_instance_id IS NULL
+  );
+
+DELETE FROM email_templates
+WHERE course_instance_id IS NULL;
+
+ALTER TABLE email_templates
+ALTER COLUMN course_instance_id
+SET NOT NULL;
+
+ALTER TABLE email_templates DROP COLUMN IF EXISTS language;
+
+DROP INDEX IF EXISTS unique_email_templates_name_language_general;
+
+
+COMMENT ON TABLE email_templates IS 'An email template table, which contains the email subject and content written in the Gutenberg Editor. Supports adding exercise points/completions threshold templates for course instances.';

services/headless-lms/migrations/20250721091109_add-password-reset-tokens.up.sql

@@ -0,0 +1,44 @@
+CREATE TABLE password_reset_tokens (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  token UUID NOT NULL UNIQUE,
+  user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+  expires_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() + INTERVAL '1 hour',
+  used_at TIMESTAMP WITH TIME ZONE,
+  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  deleted_at TIMESTAMP WITH TIME ZONE
+);
+
+
+CREATE TRIGGER set_timestamp BEFORE
+UPDATE ON password_reset_tokens FOR EACH ROW EXECUTE PROCEDURE trigger_set_timestamp();
+
+CREATE UNIQUE INDEX IF NOT EXISTS unique_active_password_reset_tokens_user ON password_reset_tokens(user_id)
+WHERE deleted_at IS NULL
+  AND used_at IS NULL;
+
+
+COMMENT ON TABLE password_reset_tokens IS 'Stores one-time password reset tokens with expiration and usage tracking.';
+COMMENT ON COLUMN password_reset_tokens.id IS 'A unique identifier for the resetting user password';
+COMMENT ON COLUMN password_reset_tokens.token IS 'Token sent to user for resetting their password.';
+COMMENT ON COLUMN password_reset_tokens.user_id IS 'References the user the token belongs to.';
+COMMENT ON COLUMN password_reset_tokens.expires_at IS 'Time after which the token becomes invalid.';
+COMMENT ON COLUMN password_reset_tokens.used_at IS 'Time when the token was used. Null if unused.';
+COMMENT ON COLUMN password_reset_tokens.created_at IS 'Time when the token was created.';
+COMMENT ON COLUMN password_reset_tokens.updated_at IS 'Time when the token was last updated. Automatically set by trigger.';
+COMMENT ON COLUMN password_reset_tokens.deleted_at IS 'Timestamp when the record was deleted. If null, the record is not deleted.';
+
+ALTER TABLE email_templates
+ALTER COLUMN course_instance_id DROP NOT NULL;
+
+ALTER TABLE email_templates
+ADD COLUMN language VARCHAR(255);
+
+CREATE UNIQUE INDEX IF NOT EXISTS unique_email_templates_name_language_general ON email_templates(name, language)
+WHERE course_instance_id IS NULL;
+
+COMMENT ON COLUMN email_templates.course_instance_id IS 'If not null the template is considered course instance specific. If null, the template is considered general.';
+
+COMMENT ON COLUMN email_templates.language IS 'Language code for the template, e.g. fi, en, sv. If null, language is not specified';
+
+COMMENT ON TABLE email_templates IS 'An email template table, which contains the email subject and content written in the Gutenberg Editor. Template is general if course_instance_id is NULL, or specific to a course instance if course_instance_id is set. Supports adding exercise points/completions threshold templates for course instances.';

services/headless-lms/migrations/20250902111139_add_user_email_codes.down.sql

@@ -0,0 +1 @@
+DROP TABLE user_email_codes;

services/headless-lms/migrations/20250902111139_add_user_email_codes.up.sql

@@ -0,0 +1,27 @@
+CREATE TABLE user_email_codes (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  code VARCHAR(16) NOT NULL,
+  user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+  expires_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() + INTERVAL '1 hour',
+  used_at TIMESTAMP WITH TIME ZONE,
+  created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+  deleted_at TIMESTAMP WITH TIME ZONE
+);
+
+CREATE TRIGGER set_timestamp BEFORE
+UPDATE ON user_email_codes FOR EACH ROW EXECUTE PROCEDURE trigger_set_timestamp();
+
+CREATE UNIQUE INDEX IF NOT EXISTS unique_active_user_email_codes_user ON user_email_codes(user_id, code)
+WHERE deleted_at IS NULL
+  AND used_at IS NULL;
+
+COMMENT ON TABLE user_email_codes IS 'Stores single-use codes for actions like user account deletion verification.';
+COMMENT ON COLUMN user_email_codes.id IS 'A unique identifier for this code record';
+COMMENT ON COLUMN user_email_codes.code IS 'The single-use code sent to the user.';
+COMMENT ON COLUMN user_email_codes.user_id IS 'References the user the code belongs to.';
+COMMENT ON COLUMN user_email_codes.expires_at IS 'Time after which the code becomes invalid.';
+COMMENT ON COLUMN user_email_codes.used_at IS 'Time when the code was used. Null if unused.';
+COMMENT ON COLUMN user_email_codes.created_at IS 'Time when the code was created.';
+COMMENT ON COLUMN user_email_codes.updated_at IS 'Time when the code was last updated. Automatically set by trigger.';
+COMMENT ON COLUMN user_email_codes.deleted_at IS 'Timestamp when the record was deleted. If null, the record is not deleted.';