From 10fc6f17c6838a58348f32ccfd0cf05f9d3e172c Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 24 Aug 2022 09:45:22 +0000
Subject: [PATCH] fix(email): set the correct url in the activation and forgot
emails
- add default values for Config/Email properties
- set mariadb to the minimal required version for development
fixes #204
---
app/Config/Email.php | 10 +++++-----
docker-compose.yml | 2 +-
modules/Auth/Config/Auth.php | 11 -----------
themes/cp_auth/emails/activation.php | 2 +-
themes/cp_auth/emails/forgot.php | 2 +-
5 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/app/Config/Email.php b/app/Config/Email.php
index 68f787a92b..3cf247b51e 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -8,9 +8,9 @@ use CodeIgniter\Config\BaseConfig;
class Email extends BaseConfig
{
- public string $fromEmail;
+ public string $fromEmail = 'hello@castopod.local';
- public string $fromName;
+ public string $fromName = 'Castopod';
public string $recipients;
@@ -32,17 +32,17 @@ class Email extends BaseConfig
/**
* SMTP Server Address
*/
- public string $SMTPHost;
+ public string $SMTPHost = '';
/**
* SMTP Username
*/
- public string $SMTPUser;
+ public string $SMTPUser = '';
/**
* SMTP Password
*/
- public string $SMTPPass;
+ public string $SMTPPass = '';
/**
* SMTP Port
diff --git a/docker-compose.yml b/docker-compose.yml
index 40109536f4..52a712c7dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
- castopod
mariadb:
- image: mariadb:latest
+ image: mariadb:10.2
container_name: castopod_mariadb
ports:
- 3306:3306
diff --git a/modules/Auth/Config/Auth.php b/modules/Auth/Config/Auth.php
index 1794d8f861..11ffea8aa9 100644
--- a/modules/Auth/Config/Auth.php
+++ b/modules/Auth/Config/Auth.php
@@ -45,17 +45,6 @@ class Auth extends MythAuthConfig
*/
public $allowRegistration = false;
- /**
- * --------------------------------------------------------------------------
- * Require confirmation registration via email
- * --------------------------------------------------------------------------
- * When enabled, every registered user will receive an email message
- * with a special link he have to confirm to activate his account.
- *
- * @var bool
- */
- public $requireActivation = false;
-
/**
* --------------------------------------------------------------------------
* Auth gateway
diff --git a/themes/cp_auth/emails/activation.php b/themes/cp_auth/emails/activation.php
index 82a2032ff7..4dc506c60b 100644
--- a/themes/cp_auth/emails/activation.php
+++ b/themes/cp_auth/emails/activation.php
@@ -2,7 +2,7 @@
<p>To activate your account use this URL.</p>
-<p><a href="<?= base_url('activate-account') .
+<p><a href="<?= url_to('activate-account') .
'?token=' .
$hash ?>">Activate account</a>.</p>
diff --git a/themes/cp_auth/emails/forgot.php b/themes/cp_auth/emails/forgot.php
index f6509c83c1..e6f199aa01 100644
--- a/themes/cp_auth/emails/forgot.php
+++ b/themes/cp_auth/emails/forgot.php
@@ -4,7 +4,7 @@
<p>Your Code: <?= $hash ?></p>
-<p>Visit the <a href="<?= base_url('reset-password') .
+<p>Visit the <a href="<?= url_to('reset-password') .
'?token=' .
$hash ?>">Reset Form</a>.</p>
--
GitLab