From 2670db15c53ca404289f8428eb4f032e529f4272 Mon Sep 17 00:00:00 2001
From: BlockListed <44610569+BlockListed@users.noreply.github.com>
Date: Sat, 9 Sep 2023 14:15:30 +0200
Subject: [PATCH] make accounts support multi-domains

---
 src/api/core/accounts.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index a97c4c31..5eda27a6 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -9,7 +9,7 @@ use crate::{
         register_push_device, unregister_push_device, AnonymousNotify, EmptyResult, JsonResult, JsonUpcase, Notify,
         PasswordOrOtpData, UpdateType,
     },
-    auth::{decode_delete, decode_invite, decode_verify_email, ClientHeaders, Headers},
+    auth::{decode_delete, decode_invite, decode_verify_email, ClientHeaders, Headers, HostInfo},
     crypto,
     db::{models::*, DbConn},
     mail,
@@ -1042,6 +1042,7 @@ struct AuthRequestRequest {
 async fn post_auth_request(
     data: Json<AuthRequestRequest>,
     headers: ClientHeaders,
+    host_info: HostInfo,
     mut conn: DbConn,
     nt: Notify<'_>,
 ) -> JsonResult {
@@ -1076,13 +1077,13 @@ async fn post_auth_request(
         "creationDate": auth_request.creation_date.and_utc(),
         "responseDate": null,
         "requestApproved": false,
-        "origin": CONFIG.domain_origin(),
+        "origin": host_info.origin,
         "object": "auth-request"
     })))
 }
 
 #[get("/auth-requests/<uuid>")]
-async fn get_auth_request(uuid: &str, mut conn: DbConn) -> JsonResult {
+async fn get_auth_request(uuid: &str, host_info: HostInfo, mut conn: DbConn) -> JsonResult {
     let auth_request = match AuthRequest::find_by_uuid(uuid, &mut conn).await {
         Some(auth_request) => auth_request,
         None => {
@@ -1103,7 +1104,7 @@ async fn get_auth_request(uuid: &str, mut conn: DbConn) -> JsonResult {
             "creationDate": auth_request.creation_date.and_utc(),
             "responseDate": response_date_utc,
             "requestApproved": auth_request.approved,
-            "origin": CONFIG.domain_origin(),
+            "origin": host_info.origin,
             "object":"auth-request"
         }
     )))
@@ -1122,6 +1123,7 @@ struct AuthResponseRequest {
 async fn put_auth_request(
     uuid: &str,
     data: Json<AuthResponseRequest>,
+    host_info: HostInfo,
     mut conn: DbConn,
     ant: AnonymousNotify<'_>,
     nt: Notify<'_>,
@@ -1158,14 +1160,14 @@ async fn put_auth_request(
             "creationDate": auth_request.creation_date.and_utc(),
             "responseDate": response_date_utc,
             "requestApproved": auth_request.approved,
-            "origin": CONFIG.domain_origin(),
+            "origin": host_info.origin,
             "object":"auth-request"
         }
     )))
 }
 
 #[get("/auth-requests/<uuid>/response?<code>")]
-async fn get_auth_request_response(uuid: &str, code: &str, mut conn: DbConn) -> JsonResult {
+async fn get_auth_request_response(uuid: &str, code: &str, host_info: HostInfo, mut conn: DbConn) -> JsonResult {
     let auth_request = match AuthRequest::find_by_uuid(uuid, &mut conn).await {
         Some(auth_request) => auth_request,
         None => {
@@ -1190,14 +1192,14 @@ async fn get_auth_request_response(uuid: &str, code: &str, mut conn: DbConn) ->
             "creationDate": auth_request.creation_date.and_utc(),
             "responseDate": response_date_utc,
             "requestApproved": auth_request.approved,
-            "origin": CONFIG.domain_origin(),
+            "origin": host_info.origin,
             "object":"auth-request"
         }
     )))
 }
 
 #[get("/auth-requests")]
-async fn get_auth_requests(headers: Headers, mut conn: DbConn) -> JsonResult {
+async fn get_auth_requests(headers: Headers, host_info: HostInfo, mut conn: DbConn) -> JsonResult {
     let auth_requests = AuthRequest::find_by_user(&headers.user.uuid, &mut conn).await;
 
     Ok(Json(json!({
@@ -1217,7 +1219,7 @@ async fn get_auth_requests(headers: Headers, mut conn: DbConn) -> JsonResult {
                 "creationDate": request.creation_date.and_utc(),
                 "responseDate": response_date_utc,
                 "requestApproved": request.approved,
-                "origin": CONFIG.domain_origin(),
+                "origin": host_info.origin,
                 "object":"auth-request"
             })
         }).collect::<Vec<Value>>(),