Merge branch 'dev' of github.com:fosrl/pangolin into dev

src/app/[orgId]/settings/resources/[niceId]/general/page.tsx

@@ -471,15 +471,11 @@ export default function GeneralForm() {
                                             ? `${sanitizedSubdomain}.${selectedDomain.baseDomain}`
                                             : selectedDomain.baseDomain;
 
-                                        setResourceFullDomain(sanitizedFullDomain);
+                                        setResourceFullDomain(`${resource.ssl ? "https" : "http"}://${sanitizedFullDomain}`);
                                         form.setValue("domainId", selectedDomain.domainId);
                                         form.setValue("subdomain", sanitizedSubdomain);
 
                                         setEditDomainOpen(false);
-
-                                        toast({
-                                            description: `Final domain: ${sanitizedFullDomain}`,
-                                        });
                                     }
                                 }}
                             >

src/lib/api/index.ts

@@ -22,7 +22,7 @@ export function createApiClient({ env }: { env: Env }): AxiosInstance {
         axios.defaults.withCredentials = true;
     } else {
         // user is accessing through a proxy
-        baseURL = window.location.origin + `/${suffix}`;
+        baseURL = `${env.app.dashboardUrl}/${suffix}`;
     }
 
     if (!baseURL) {