fix ui build err

Author: benjamin-747

mono/src/server/http_server.rs

@@ -396,12 +396,12 @@ pub async fn app(ctx: AppContext, host: String, port: u16) -> Router {
         git_object_cache,
         build_dispatch,
         Some(match oauth_config.api_store_backend {
-            common::config::OauthApiStoreBackend::Campsite => OAuthApiStore::Campsite(
-                CampsiteApiStore::new(
+            common::config::OauthApiStoreBackend::Campsite => {
+                OAuthApiStore::Campsite(CampsiteApiStore::new(
                     oauth_config.campsite_api_domain.clone(),
                     oauth_config.campsite_api_session_cookie.clone(),
-                ),
-            ),
+                ))
+            }
             common::config::OauthApiStoreBackend::Tinyship => {
                 OAuthApiStore::Tinyship(TinyshipApiStore::new(oauth_config.tinyship_api_domain))
             }

mono/tests/campsite_api_store_tests.rs

@@ -36,13 +36,12 @@
 
 mod common;
 
+use ::common::config::DEFAULT_CAMPSITE_API_SESSION_COOKIE;
 use anyhow::{Context, Result};
 use common::*;
 use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
 use serde_json::Value;
 
-use common::config::DEFAULT_CAMPSITE_API_SESSION_COOKIE;
-
 const TEST_COOKIE: &str = "test_session_cookie";
 
 // ============================================================================

mono/tests/login_user_extractor_tests.rs

@@ -34,9 +34,9 @@ mod common;
 
 use std::time::Duration;
 
+use ::common::config::DEFAULT_CAMPSITE_API_SESSION_COOKIE;
 use anyhow::{Context, Result};
 use common::*;
-use common::config::DEFAULT_CAMPSITE_API_SESSION_COOKIE;
 use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
 use serde_json::Value;
 

moon/apps/web/utils/apiCookieHeaders.ts

@@ -7,8 +7,9 @@ export const SsrSecretHeader: Record<string, string> = { 'x-campsite-ssr-secret'
 export function apiCookieHeaders(cookies: NextApiRequestCookies) {
   let headers: Record<string, string> = {}
 
-  if (cookies[CAMPSITE_API_SESSION_COOKIE]) {
-    const apiCookie = encodeURIComponent(cookies[CAMPSITE_API_SESSION_COOKIE])
+  const sessionCookie = cookies[CAMPSITE_API_SESSION_COOKIE]
+  if (sessionCookie) {
+    const apiCookie = encodeURIComponent(sessionCookie)
 
     headers['Cookie'] = `${CAMPSITE_API_SESSION_COOKIE}=${apiCookie}`
   }

moon/apps/web/utils/queryClient.ts

@@ -83,9 +83,12 @@ export async function fetcher<T>(url: string, { method, body, cookies }: Fetcher
   let credentials: RequestCredentials | undefined
 
   if (cookies) {
-    const apiCookie = encodeURIComponent(cookies[CAMPSITE_API_SESSION_COOKIE])
+    const sessionCookie = cookies[CAMPSITE_API_SESSION_COOKIE]
+    if (sessionCookie) {
+      const apiCookie = encodeURIComponent(sessionCookie)
 
-    headers.append('Cookie', `${CAMPSITE_API_SESSION_COOKIE}=${apiCookie}`)
+      headers.append('Cookie', `${CAMPSITE_API_SESSION_COOKIE}=${apiCookie}`)
+    }
   } else {
     credentials = 'include'
   }