From 465114c7b7cfd17d588cb1da7a191b2a8367e499 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Sun, 27 Nov 2022 21:29:59 +0900
Subject: feat: Update configuration to meet hosting env

---
 code/api/src/Data/Models/AppConfiguration.cs  | 6 +++---
 code/api/src/Services/PasswordResetService.cs | 3 +--
 code/app/src/lib/configuration.ts             | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'code')

diff --git a/code/api/src/Data/Models/AppConfiguration.cs b/code/api/src/Data/Models/AppConfiguration.cs
index 0f720ce..e2d7fa6 100644
--- a/code/api/src/Data/Models/AppConfiguration.cs
+++ b/code/api/src/Data/Models/AppConfiguration.cs
@@ -62,9 +62,9 @@ public class AppConfiguration
     public string SMTP_PASSWORD { get; set; }
     public string EMAIL_FROM_ADDRESS { get; set; }
     public string EMAIL_FROM_DISPLAY_NAME { get; set; }
-    public string PORTAL_URL { get; set; }
     public string GITHUB_CLIENT_ID { get; set; }
     public string GITHUB_CLIENT_SECRET { get; set; }
+    public string CANONICAL_FRONTEND_URL { get; set; }
     public string APP_AES_KEY { get; set; }
 
     /// <summary>
@@ -92,11 +92,11 @@ public class AppConfiguration
             SMTP_PASSWORD = SMTP_PASSWORD.Obfuscate() ?? "",
             EMAIL_FROM_ADDRESS,
             EMAIL_FROM_DISPLAY_NAME,
-            PORTAL_URL,
             GITHUB_CLIENT_ID = GITHUB_CLIENT_ID.Obfuscate() ?? "",
             GITHUB_CLIENT_SECRET = GITHUB_CLIENT_SECRET.Obfuscate() ?? "",
             APP_AES_KEY = APP_AES_KEY.Obfuscate() ?? "",
-            CERT1 = CERT1().PublicKey.Oid.FriendlyName
+            CERT1 = CERT1().PublicKey.Oid.FriendlyName,
+            CANONICAL_FRONTEND_URL
         };
     }
 }
\ No newline at end of file
diff --git a/code/api/src/Services/PasswordResetService.cs b/code/api/src/Services/PasswordResetService.cs
index 02ba312..cb4bc1e 100644
--- a/code/api/src/Services/PasswordResetService.cs
+++ b/code/api/src/Services/PasswordResetService.cs
@@ -49,7 +49,6 @@ public class PasswordResetService
         var request = new PasswordResetRequest(user);
         _database.PasswordResetRequests.Add(request);
         await _database.SaveChangesAsync(cancellationToken);
-        var portalUrl = _configuration.PORTAL_URL;
         var emailFromAddress = _configuration.EMAIL_FROM_ADDRESS;
         var emailFromDisplayName = _configuration.EMAIL_FROM_DISPLAY_NAME;
         var zonedExpirationDate = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(request.ExpirationDate, requestTz.Id);
@@ -64,7 +63,7 @@ Hi {user.Username}
 
 Go to the following link to set a new password.
 
-{portalUrl}/reset-password/{request.Id}
+{_configuration.CANONICAL_FRONTEND_URL}/reset-password/{request.Id}
 
 The link expires at {zonedExpirationDate:yyyy-MM-dd hh:mm}.
 If you did not request a password reset, no action is required.
diff --git a/code/app/src/lib/configuration.ts b/code/app/src/lib/configuration.ts
index 5a6a1bf..541be35 100644
--- a/code/app/src/lib/configuration.ts
+++ b/code/app/src/lib/configuration.ts
@@ -1,4 +1,4 @@
-export const BASE_DOMAIN = "dev.greatoffice.app";
+export const BASE_DOMAIN = "dev.greatoffice.life";
 export const DEV_BASE_DOMAIN = "http://localhost";
 export const API_ADDRESS = "https://api." + BASE_DOMAIN;
 export const DEV_API_ADDRESS = "http://localhost:5000";
-- 
cgit v1.3