From 2d6027b8d432e15c820e9572627de1a45dc7da2b Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Wed, 8 Apr 2026 21:26:10 +0000 Subject: [PATCH 1/2] fix: wrong base url for staging env --- server/pom.xml | 2 +- .../server/service/MailgunEmailService.java | 13 ++++++++++--- terraform-stg/main.tf | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/pom.xml b/server/pom.xml index bf7a736..395f06e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -53,7 +53,7 @@ 3.5.5 0.8.14 3.6.0 - 4.0.3 + 4.0.5 0.12.6 diff --git a/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java b/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java index 92b8b35..bb822a2 100644 --- a/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java @@ -29,7 +29,7 @@ @Service public class MailgunEmailService { - private static final Logger logger = LoggerFactory.getLogger(MailgunEmailService.class); + private static final Logger logger = LoggerFactory.getLogger(MailgunEmailService.class.getName()); private final RestTemplate restTemplate; private final String targetEnv; private String domain; @@ -73,6 +73,8 @@ public void sendNewUser(UserEntity user) { String subject = "TaskNote App confirmation email"; String link = getBaseUrl() + "/email-confirmation?identification=%s"; + logger.info("New user link: {}", link); + MailgunTemplateSignUp signUpTemplate = new MailgunTemplateSignUp(); signUpTemplate.setConfirmationLink(String.format(link, user.getEmailUuid().toString())); @@ -91,6 +93,8 @@ public void sendResetPassword(UserEntity user) { String subject = "TaskNote App password reset"; String link = getBaseUrl() + "/finish-reset-password?token=%s"; + logger.info("Password reset link: {}", link); + MailgunTemplateResetPwd resetTemplate = new MailgunTemplateResetPwd(); resetTemplate.setResetLink(String.format(link, user.getResetToken())); @@ -184,7 +188,10 @@ private String getBaseUrl() { if ("development".equals(targetEnv) || Objects.isNull(targetEnv)) { return "http://localhost:5000"; } - String stage = targetEnv.equals("stage") ? "stage." : ""; - return String.format("https://%s%s", stage, domain); + String baseUrl = domain; + if (targetEnv.equals("staging")) { + domain = "tasknote-stg" + domain.substring(8); + } + return String.format("https://%s", domain); } } diff --git a/terraform-stg/main.tf b/terraform-stg/main.tf index 1f143df..9e1b4b4 100644 --- a/terraform-stg/main.tf +++ b/terraform-stg/main.tf @@ -257,7 +257,7 @@ resource "kubernetes_deployment_v1" "tasknote_stg_backend" { } env { name = "TARGET_ENV" - value = "production" + value = "staging" } env { name = "MAILGUN_APIKEY" From d265f0c2a60fb254788f58d02953f6a4110c75b1 Mon Sep 17 00:00:00 2001 From: Ricardo Campos Date: Wed, 8 Apr 2026 21:47:54 +0000 Subject: [PATCH 2/2] fix: wrong var changed domain --- .devcontainer/devcontainer.json | 12 ++++++++++-- .../server/service/MailgunEmailService.java | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8d9be30..86f755c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,11 +2,19 @@ "image": "mcr.microsoft.com/devcontainers/java:25-trixie", "features": { "ghcr.io/devcontainers/features/java:1": { + "installMaven": true, "version": "latest", "jdkDistro": "tem", - "installMaven": true, + "gradleVersion": "latest", "mavenVersion": "latest", - "installGradle": "false" + "antVersion": "latest", + "groovyVersion": "latest" + }, + "ghcr.io/devcontainers/features/node:1": { + "installYarnUsingApt": true, + "version": "lts", + "pnpmVersion": "latest", + "nvmVersion": "latest" } } } diff --git a/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java b/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java index bb822a2..4d44d23 100644 --- a/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java +++ b/server/src/main/java/br/com/tasknoteapp/server/service/MailgunEmailService.java @@ -32,7 +32,7 @@ public class MailgunEmailService { private static final Logger logger = LoggerFactory.getLogger(MailgunEmailService.class.getName()); private final RestTemplate restTemplate; private final String targetEnv; - private String domain; + private final String domain; private String senderEmail; /** @@ -190,8 +190,8 @@ private String getBaseUrl() { } String baseUrl = domain; if (targetEnv.equals("staging")) { - domain = "tasknote-stg" + domain.substring(8); + baseUrl = "tasknote-stg" + domain.substring(8); } - return String.format("https://%s", domain); + return String.format("https://%s", baseUrl); } }