From 46e09a12856727bc696d1ed9c55553d8ba4087b9 Mon Sep 17 00:00:00 2001
From: "$(pass /github/name)" <$(pass /github/email)>
Date: Fri, 6 Sep 2024 09:20:55 +0200
Subject: [PATCH] moved admin mail config location

---
 configs/config.template.json |  6 +++---
 internal/config/config.go    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configs/config.template.json b/configs/config.template.json
index 41b6866..0c04ebb 100644
--- a/configs/config.template.json
+++ b/configs/config.template.json
@@ -9,8 +9,7 @@
     "Host": "mail.server.com",
     "User": "username",
     "Password": "password",
-    "Port": 465,
-    "AdminEmail": "admin@server.com"
+    "Port": 465
   },
   "templates": {
     "MailPath": "templates/email",
@@ -23,7 +22,8 @@
   },
   "recipients": {
     "ContactForm": "contacts@server.com",
-    "UserRegistration": "registration@server.com"
+    "UserRegistration": "registration@server.com",
+    "AdminEmail": "admin@server.com"
   },
   "security": {
     "RateLimits": {
diff --git a/internal/config/config.go b/internal/config/config.go
index 62c6adb..6e56464 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -30,11 +30,10 @@ type AuthenticationConfig struct {
 }
 
 type SMTPConfig struct {
-	Host       string `json:"Host" envconfig:"SMTP_HOST"`
-	User       string `json:"User" envconfig:"SMTP_USER"`
-	Password   string `json:"Password" envconfig:"SMTP_PASS"`
-	AdminEmail string `json:"AdminEmail" envconfig:"ADMIN_MAIL"`
-	Port       int    `json:"Port" default:"465" envconfig:"SMTP_PORT"`
+	Host     string `json:"Host" envconfig:"SMTP_HOST"`
+	User     string `json:"User" envconfig:"SMTP_USER"`
+	Password string `json:"Password" envconfig:"SMTP_PASS"`
+	Port     int    `json:"Port" default:"465" envconfig:"SMTP_PORT"`
 }
 
 type TemplateConfig struct {
@@ -47,6 +46,7 @@ type TemplateConfig struct {
 type RecipientsConfig struct {
 	ContactForm      string `json:"ContactForm" envconfig:"RECIPIENT_CONTACT_FORM"`
 	UserRegistration string `json:"UserRegistration" envconfig:"RECIPIENT_USER_REGISTRATION"`
+	AdminEmail       string `json:"AdminEmail" envconfig:"ADMIN_MAIL"`
 }
 
 type SecurityConfig struct {