@axcode/axcloud-sdk 0.1.0 → 0.1.2

package/dist/index.mjs

@@ -116,6 +116,14 @@ var AxCloudClient = class {
     }
     return url.toString();
   }
+  /**
+   * API key should only be sent to public endpoints.
+   * This avoids leaking public keys to authenticated/internal routes.
+   */
+  shouldAttachApiKey(path) {
+    const normalized = path.startsWith("/") ? path : `/${path}`;
+    return normalized.startsWith("/public/") || normalized.startsWith("/api/public/") || normalized.startsWith("/content/public/");
+  }
   /**
    * Make an authenticated request
    */
@@ -128,7 +136,7 @@ var AxCloudClient = class {
       const customHeadersRecord = customHeaders;
       Object.assign(headers, customHeadersRecord);
     }
-    if (this.apiKey) {
+    if (this.apiKey && this.shouldAttachApiKey(path)) {
       headers["x-api-key"] = this.apiKey;
     }
     if (this.getAccessToken) {
@@ -247,30 +255,55 @@ function userHasAllPermissions(user, permissions) {
 
 // src/core/forms.ts
 async function submitForm(apiUrl, submission) {
-  const url = `${apiUrl.replace(/\/$/, "")}/public/submit`;
-  const response = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      api_key: submission.apiKey,
-      site: submission.site,
-      form_type: submission.formType,
-      email: submission.email,
-      data: submission.data || {}
-    })
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({ message: "Form submission failed" }));
-    throw new Error(error.message || "Form submission failed");
+  const baseUrl = apiUrl.replace(/\/$/, "");
+  try {
+    const response = await fetch(`${baseUrl}/public/submit`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        api_key: submission.apiKey,
+        site: submission.site,
+        form_type: submission.formType,
+        email: submission.email,
+        data: submission.data || {}
+      })
+    });
+    if (!response.ok) {
+      const error = await response.json().catch(() => ({ message: "Form submission failed" }));
+      throw new Error(error.message || "Form submission failed");
+    }
+    const result = await response.json();
+    return {
+      success: result.success,
+      message: result.message,
+      submissionId: result.submission_id
+    };
+  } catch (primaryError) {
+    try {
+      const notifyResponse = await fetch(`${baseUrl}/public/notify`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          api_key: submission.apiKey,
+          site: submission.site,
+          form_type: submission.formType,
+          email: submission.email
+        })
+      });
+      if (notifyResponse.ok) {
+        const result = await notifyResponse.json();
+        return {
+          success: true,
+          message: result.message || "Thanks! We'll notify you when we launch.",
+          submissionId: "fallback"
+        };
+      }
+    } catch {
+    }
+    throw primaryError;
   }
-  const result = await response.json();
-  return {
-    success: result.success,
-    message: result.message,
-    submissionId: result.submission_id
-  };
 }
 function createFormHelper(config) {
   return {
@@ -570,15 +603,15 @@ function useUser() {
   };
 }
 function useOrg() {
-  const { client, orgId, stage, config } = useAxCloudContext();
-  const usePublicEndpoint = Boolean(config.apiKey);
+  const { client, orgId, stage, isPublicMode } = useAxCloudContext();
+  const usePublicEndpoint = isPublicMode;
   const query = useQuery({
     queryKey: ["axcloud", "organization", orgId, stage, usePublicEndpoint],
     queryFn: async () => {
       if (usePublicEndpoint) {
         return client.get(`/content/public/${orgId}/org`);
       } else {
-        return client.get(`/${stage}/api/organizations/${orgId}`);
+        return client.get(`/orgs/api/organizations/${orgId}`);
       }
     },
     staleTime: 1e3 * 60 * 10
@@ -630,7 +663,20 @@ function useNews(options = {}) {
   } = options;
   const usePublicEndpoint = isPublicMode || publicOnly;
   const query = useQuery({
-    queryKey: ["axcloud", "news", orgId, usePublicEndpoint, options],
+    queryKey: [
+      "axcloud",
+      "news",
+      orgId,
+      usePublicEndpoint,
+      page,
+      pageSize,
+      status,
+      visibility,
+      sectionId,
+      search,
+      sortBy,
+      sortOrder
+    ],
     queryFn: async () => {
       const endpoint = usePublicEndpoint ? `/content/public/${orgId}/news` : `/content/members/${orgId}/news`;
       return client.get(endpoint, {
@@ -661,6 +707,7 @@ var MEMBER_ENDPOINT_TYPES = ["news", "pages", "events"];
 function useContent(contentType, options = {}) {
   const { client, orgId, isPublicMode } = useAxCloudContext();
   const {
+    publicOnly = false,
     page = 1,
     pageSize = 20,
     status = "published",
@@ -671,9 +718,24 @@ function useContent(contentType, options = {}) {
     sortOrder = "desc"
   } = options;
   const query = useQuery({
-    queryKey: ["axcloud", "content", orgId, contentType, isPublicMode, options],
+    queryKey: [
+      "axcloud",
+      "content",
+      orgId,
+      contentType,
+      isPublicMode,
+      publicOnly,
+      page,
+      pageSize,
+      status,
+      visibility,
+      sectionId,
+      search,
+      sortBy,
+      sortOrder
+    ],
     queryFn: async () => {
-      const useMemberEndpoint = !isPublicMode && MEMBER_ENDPOINT_TYPES.includes(contentType);
+      const useMemberEndpoint = !isPublicMode && !publicOnly && MEMBER_ENDPOINT_TYPES.includes(contentType);
       const endpoint = useMemberEndpoint ? `/content/members/${orgId}/${contentType}` : `/content/public/${orgId}/${contentType}`;
       return client.get(endpoint, {
         page,
@@ -733,7 +795,7 @@ function useMySection(options = {}) {
         throw new Error("User is not assigned to a section");
       }
       const section = await client.get(
-        `/${stage}/api/sections/${sectionId}`,
+        `/orgs/api/organizations/${orgId}/sections/${sectionId}`,
         { includeMembers: includeMembers ? "true" : void 0 }
       );
       return section;
@@ -762,7 +824,7 @@ function useSections() {
   const query = useQuery({
     queryKey: ["axcloud", "sections", orgId, stage],
     queryFn: async () => {
-      return client.get(`/${stage}/api/organizations/${orgId}/sections`);
+      return client.get(`/orgs/api/organizations/${orgId}/sections`);
     },
     staleTime: 1e3 * 60 * 10
     // 10 minutes
@@ -779,7 +841,7 @@ function useForms(options = {}) {
   const { client, stage } = useAxCloudContext();
   const { formType, status, limit = 50, cursor } = options;
   const query = useQuery({
-    queryKey: ["axcloud", "forms", "submissions", stage, options],
+    queryKey: ["axcloud", "forms", "submissions", stage, formType, status, limit, cursor],
     queryFn: async () => {
       const params = { limit };
       if (formType) params.form_type = formType;
@@ -840,13 +902,13 @@ function useUpdateFormSubmission() {
 }
 var LINKED_ACCOUNTS_QUERY_KEY = ["axcloud", "linked-accounts"];
 function useLinkedAccounts() {
+  const { client, stage } = useAxCloudContext();
   const { isAuthenticated } = useAuth();
   const queryClient = useQueryClient();
   const query = useQuery({
-    queryKey: LINKED_ACCOUNTS_QUERY_KEY,
+    queryKey: [...LINKED_ACCOUNTS_QUERY_KEY, stage],
     queryFn: async () => {
-      const client = getClient();
-      return client.get("/api/users/me/identities");
+      return client.get(`/identities/api/users/me/identities`);
     },
     enabled: isAuthenticated,
     staleTime: 1e3 * 60 * 5
@@ -854,9 +916,8 @@ function useLinkedAccounts() {
   });
   const linkMutation = useMutation({
     mutationFn: async (provider) => {
-      const client = getClient();
       const response = await client.post(
-        `/api/users/me/identities/${provider}/link`,
+        `/identities/api/users/me/identities/${provider}/link`,
         {}
       );
       if (response.authorization_url) {
@@ -870,9 +931,8 @@ function useLinkedAccounts() {
   });
   const unlinkMutation = useMutation({
     mutationFn: async (provider) => {
-      const client = getClient();
       return client.delete(
-        `/api/users/me/identities/${provider}`
+        `/identities/api/users/me/identities/${provider}`
       );
     },
     onSuccess: () => {