@moonbase.sh/vue 0.2.32 → 0.2.34

package/dist/index.cjs

@@ -250,6 +250,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     } finally {
       this.loadedUser.value = true;
     }
+    return this.currentUser.value;
   }
   async updateStorefront() {
     const latestStorefront = await this.client.storefront.get(this.hasUtm.value ? this.utm.value : void 0);
@@ -262,6 +263,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         this.currentOrder.value.currency = latestStorefront.suggestedCurrency;
       }
     }
+    return latestStorefront;
   }
   async pushOrderContent() {
     if (typeof window !== "undefined")
@@ -396,19 +398,18 @@ var import_storefront_api3 = require("@moonbase.sh/storefront-api");
 var import_vue7 = require("vue");
 function useActivationRequest(token, context) {
   const storefront = context != null ? context : (0, import_vue7.inject)(storefrontKey);
-  const requestId = (0, import_vue7.toValue)(token);
-  if (!requestId)
-    throw new Error("No request ID was given when calling `useActivationRequest`");
   if (!storefront)
     throw new Error("No storefront configured");
-  const activationRequest = storefront.stateFactory(`activation-request-${requestId}`, null);
-  const error = storefront.stateFactory(`activation-request-${requestId}-error`, null);
-  const loading = storefront.stateFactory(`activation-request-${requestId}-loading`, true);
-  const fulfilling = storefront.stateFactory(`activation-request-${requestId}-fulfilling`, false);
-  const completing = storefront.stateFactory(`activation-request-${requestId}-completing`, false);
-  const completionTimeout = storefront.stateFactory(`activation-request-${requestId}-completion-timeout`, null);
+  const activationRequest = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}`, null);
+  const error = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}-error`, null);
+  const loading = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}-loading`, true);
+  const fulfilling = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}-fulfilling`, false);
+  const completing = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}-completing`, false);
+  const completionTimeout = storefront.stateFactory(`activation-request-${(0, import_vue7.toValue)(token)}-completion-timeout`, null);
   const checkCompletion = async () => {
-    const completed = await storefront.client.activationRequests.isCompleted(requestId);
+    if (!activationRequest.value)
+      return;
+    const completed = await storefront.client.activationRequests.isCompleted(activationRequest.value.id);
     if (completed && activationRequest.value) {
       activationRequest.value.status = import_storefront_api3.ActivationRequestStatus.Completed;
       completing.value = false;
@@ -416,28 +417,31 @@ function useActivationRequest(token, context) {
       completionTimeout.value = setTimeout(checkCompletion, 1500);
     }
   };
-  if (requestId && requestId.length > 0) {
-    storefront.client.activationRequests.get(requestId).then((result) => {
-      activationRequest.value = result;
-      if (activationRequest.value.status === import_storefront_api3.ActivationRequestStatus.Fulfilled) {
-        completing.value = true;
-        checkCompletion();
+  (0, import_vue7.watch)(() => (0, import_vue7.toValue)(token), async (newRequestId) => {
+    try {
+      if (newRequestId && newRequestId.length > 0) {
+        activationRequest.value = await storefront.client.activationRequests.get(newRequestId);
+        if (activationRequest.value.status === import_storefront_api3.ActivationRequestStatus.Fulfilled) {
+          completing.value = true;
+          checkCompletion();
+        }
+        loading.value = false;
+      } else {
+        error.value = new import_storefront_api3.MoonbaseError("Invalid input", "Missing request id", -1);
+        loading.value = false;
       }
+    } catch (err) {
+      error.value = err;
       loading.value = false;
-    }).catch((e) => {
-      error.value = e;
-      loading.value = false;
-    });
-  } else {
-    error.value = new Error("Missing request id");
-    loading.value = false;
-  }
+    }
+  }, { immediate: true });
   (0, import_vue7.onBeforeUnmount)(() => {
     if (completionTimeout.value)
       clearTimeout(completionTimeout.value);
   });
   (0, import_vue7.watch)(storefront.currentUser, async () => {
     var _a, _b;
+    const requestId = (0, import_vue7.toValue)(token);
     if (!requestId || ((_b = (_a = activationRequest.value) == null ? void 0 : _a.licenseEligibility) == null ? void 0 : _b.eligible))
       return;
     loading.value = true;
@@ -464,23 +468,22 @@ function useActivationRequest(token, context) {
     }),
     fulfillLicense: async () => {
       fulfilling.value = true;
-      activationRequest.value = await storefront.client.activationRequests.fulfillLicense(requestId);
+      activationRequest.value = await storefront.client.activationRequests.fulfillLicense(activationRequest.value.id);
       fulfilling.value = false;
       completing.value = true;
       const _ = checkCompletion();
     },
     fulfillTrial: async () => {
       fulfilling.value = true;
-      activationRequest.value = await storefront.client.activationRequests.fulfillTrial(requestId);
+      activationRequest.value = await storefront.client.activationRequests.fulfillTrial(activationRequest.value.id);
       fulfilling.value = false;
       completing.value = true;
       const _ = checkCompletion();
     },
     cancel: async () => {
-      var _a;
-      if (((_a = activationRequest.value) == null ? void 0 : _a.status) === import_storefront_api3.ActivationRequestStatus.Cancelled)
+      if (!activationRequest.value || activationRequest.value.status === import_storefront_api3.ActivationRequestStatus.Cancelled)
         return;
-      activationRequest.value = await storefront.client.activationRequests.cancel(requestId);
+      activationRequest.value = await storefront.client.activationRequests.cancel(activationRequest.value.id);
     }
   };
 }
@@ -708,7 +711,7 @@ function useAuth(context) {
     },
     confirmEmailChange: async (email, code) => {
       await storefront.client.identity.confirmEmailChange(email, code);
-      const _ = storefront.updateUser();
+      return await storefront.updateUser();
     }
   };
 }

package/dist/index.d.cts

@@ -16,8 +16,8 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
     client: MoonbaseClient;
-    updateUser: () => Promise<void>;
-    updateStorefront: () => Promise<void>;
+    updateUser: () => Promise<User | null>;
+    updateStorefront: () => Promise<Storefront>;
     pushOrderContent: () => Promise<void>;
     resetOrder: () => void;
     closeCheckout: () => void;
@@ -797,7 +797,24 @@ declare function useAuth(context?: StorefrontContext): {
         resetPasswordToken: string | null;
     }>;
     confirmEmail: (email: string, code: string) => Promise<void>;
-    confirmEmailChange: (email: string, code: string) => Promise<void>;
+    confirmEmailChange: (email: string, code: string) => Promise<{
+        id: string;
+        email: string;
+        name: string;
+        tenantId: string;
+        communicationPreferences: {
+            newsletterOptIn: boolean;
+        };
+        address?: {
+            countryCode: string;
+            streetAddress1: string;
+            streetAddress2: string | null;
+            locality: string | null;
+            region: string | null;
+            postCode: string;
+        } | undefined;
+        ownedProducts?: string[] | undefined;
+    } | null>;
 };
 
 declare const storefrontKey: InjectionKey<StorefrontContext>;

package/dist/index.d.ts

@@ -16,8 +16,8 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
     client: MoonbaseClient;
-    updateUser: () => Promise<void>;
-    updateStorefront: () => Promise<void>;
+    updateUser: () => Promise<User | null>;
+    updateStorefront: () => Promise<Storefront>;
     pushOrderContent: () => Promise<void>;
     resetOrder: () => void;
     closeCheckout: () => void;
@@ -797,7 +797,24 @@ declare function useAuth(context?: StorefrontContext): {
         resetPasswordToken: string | null;
     }>;
     confirmEmail: (email: string, code: string) => Promise<void>;
-    confirmEmailChange: (email: string, code: string) => Promise<void>;
+    confirmEmailChange: (email: string, code: string) => Promise<{
+        id: string;
+        email: string;
+        name: string;
+        tenantId: string;
+        communicationPreferences: {
+            newsletterOptIn: boolean;
+        };
+        address?: {
+            countryCode: string;
+            streetAddress1: string;
+            streetAddress2: string | null;
+            locality: string | null;
+            region: string | null;
+            postCode: string;
+        } | undefined;
+        ownedProducts?: string[] | undefined;
+    } | null>;
 };
 
 declare const storefrontKey: InjectionKey<StorefrontContext>;

package/dist/index.js

@@ -215,6 +215,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     } finally {
       this.loadedUser.value = true;
     }
+    return this.currentUser.value;
   }
   async updateStorefront() {
     const latestStorefront = await this.client.storefront.get(this.hasUtm.value ? this.utm.value : void 0);
@@ -227,6 +228,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         this.currentOrder.value.currency = latestStorefront.suggestedCurrency;
       }
     }
+    return latestStorefront;
   }
   async pushOrderContent() {
     if (typeof window !== "undefined")
@@ -357,23 +359,22 @@ function useInventory(context) {
 }
 
 // src/composables/useActivationRequest.ts
-import { ActivationRequestStatus } from "@moonbase.sh/storefront-api";
+import { ActivationRequestStatus, MoonbaseError } from "@moonbase.sh/storefront-api";
 import { computed as computed6, inject as inject6, onBeforeUnmount, toValue, watch as watch2 } from "vue";
 function useActivationRequest(token, context) {
   const storefront = context != null ? context : inject6(storefrontKey);
-  const requestId = toValue(token);
-  if (!requestId)
-    throw new Error("No request ID was given when calling `useActivationRequest`");
   if (!storefront)
     throw new Error("No storefront configured");
-  const activationRequest = storefront.stateFactory(`activation-request-${requestId}`, null);
-  const error = storefront.stateFactory(`activation-request-${requestId}-error`, null);
-  const loading = storefront.stateFactory(`activation-request-${requestId}-loading`, true);
-  const fulfilling = storefront.stateFactory(`activation-request-${requestId}-fulfilling`, false);
-  const completing = storefront.stateFactory(`activation-request-${requestId}-completing`, false);
-  const completionTimeout = storefront.stateFactory(`activation-request-${requestId}-completion-timeout`, null);
+  const activationRequest = storefront.stateFactory(`activation-request-${toValue(token)}`, null);
+  const error = storefront.stateFactory(`activation-request-${toValue(token)}-error`, null);
+  const loading = storefront.stateFactory(`activation-request-${toValue(token)}-loading`, true);
+  const fulfilling = storefront.stateFactory(`activation-request-${toValue(token)}-fulfilling`, false);
+  const completing = storefront.stateFactory(`activation-request-${toValue(token)}-completing`, false);
+  const completionTimeout = storefront.stateFactory(`activation-request-${toValue(token)}-completion-timeout`, null);
   const checkCompletion = async () => {
-    const completed = await storefront.client.activationRequests.isCompleted(requestId);
+    if (!activationRequest.value)
+      return;
+    const completed = await storefront.client.activationRequests.isCompleted(activationRequest.value.id);
     if (completed && activationRequest.value) {
       activationRequest.value.status = ActivationRequestStatus.Completed;
       completing.value = false;
@@ -381,28 +382,31 @@ function useActivationRequest(token, context) {
       completionTimeout.value = setTimeout(checkCompletion, 1500);
     }
   };
-  if (requestId && requestId.length > 0) {
-    storefront.client.activationRequests.get(requestId).then((result) => {
-      activationRequest.value = result;
-      if (activationRequest.value.status === ActivationRequestStatus.Fulfilled) {
-        completing.value = true;
-        checkCompletion();
+  watch2(() => toValue(token), async (newRequestId) => {
+    try {
+      if (newRequestId && newRequestId.length > 0) {
+        activationRequest.value = await storefront.client.activationRequests.get(newRequestId);
+        if (activationRequest.value.status === ActivationRequestStatus.Fulfilled) {
+          completing.value = true;
+          checkCompletion();
+        }
+        loading.value = false;
+      } else {
+        error.value = new MoonbaseError("Invalid input", "Missing request id", -1);
+        loading.value = false;
       }
+    } catch (err) {
+      error.value = err;
       loading.value = false;
-    }).catch((e) => {
-      error.value = e;
-      loading.value = false;
-    });
-  } else {
-    error.value = new Error("Missing request id");
-    loading.value = false;
-  }
+    }
+  }, { immediate: true });
   onBeforeUnmount(() => {
     if (completionTimeout.value)
       clearTimeout(completionTimeout.value);
   });
   watch2(storefront.currentUser, async () => {
     var _a, _b;
+    const requestId = toValue(token);
     if (!requestId || ((_b = (_a = activationRequest.value) == null ? void 0 : _a.licenseEligibility) == null ? void 0 : _b.eligible))
       return;
     loading.value = true;
@@ -429,23 +433,22 @@ function useActivationRequest(token, context) {
     }),
     fulfillLicense: async () => {
       fulfilling.value = true;
-      activationRequest.value = await storefront.client.activationRequests.fulfillLicense(requestId);
+      activationRequest.value = await storefront.client.activationRequests.fulfillLicense(activationRequest.value.id);
       fulfilling.value = false;
       completing.value = true;
       const _ = checkCompletion();
     },
     fulfillTrial: async () => {
       fulfilling.value = true;
-      activationRequest.value = await storefront.client.activationRequests.fulfillTrial(requestId);
+      activationRequest.value = await storefront.client.activationRequests.fulfillTrial(activationRequest.value.id);
       fulfilling.value = false;
       completing.value = true;
       const _ = checkCompletion();
     },
     cancel: async () => {
-      var _a;
-      if (((_a = activationRequest.value) == null ? void 0 : _a.status) === ActivationRequestStatus.Cancelled)
+      if (!activationRequest.value || activationRequest.value.status === ActivationRequestStatus.Cancelled)
         return;
-      activationRequest.value = await storefront.client.activationRequests.cancel(requestId);
+      activationRequest.value = await storefront.client.activationRequests.cancel(activationRequest.value.id);
     }
   };
 }
@@ -673,7 +676,7 @@ function useAuth(context) {
     },
     confirmEmailChange: async (email, code) => {
       await storefront.client.identity.confirmEmailChange(email, code);
-      const _ = storefront.updateUser();
+      return await storefront.updateUser();
     }
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.2.32",
+  "version": "0.2.34",
   "description": "Package to let you build vue.js storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@vue/devtools-api": "^6.6.3",
     "uuid": "^9.0.1",
     "zod": "^3.23.8",
-    "@moonbase.sh/storefront-api": "0.2.32"
+    "@moonbase.sh/storefront-api": "0.2.34"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.8",