flowrix 1.0.1-beta.58 → 1.0.1-beta.59

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "flowrix",
   "configKey": "flowrix",
-  "version": "1.0.1-beta.58",
+  "version": "1.0.1-beta.59",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/Checkout/PaymentMethods/useFlowrixpay.d.ts

@@ -6,7 +6,46 @@ declare global {
 }
 export default function (): {
     checkoutStore: any;
-    user: import("vue").ComputedRef<import("../../../stores/index.js").User | null>;
+    user: {
+        id: number;
+        fullname: string;
+        firstname: string;
+        lastname: string;
+        email: string;
+        avatar: string;
+        country_id: number | null;
+        country: {
+            id: number;
+            name: string;
+            emoji: string;
+        } | null;
+        state_id: number | null;
+        state: string | null;
+        suburb: string | null;
+        dob: string | null;
+        phone: string | null;
+        address: string | null;
+        mobile: string | null;
+        company: string | null;
+        addresses: {
+            id: number;
+            fullname: string | null;
+            firstname: string;
+            middlename: string | null;
+            lastname: string;
+            address: string;
+            suburb: string;
+            state: string | null;
+            state_id: number | null;
+            country: string;
+            country_id: number;
+            postcode: string;
+            mobile: string;
+            shipping: number;
+            billing: number;
+        }[];
+        created_at: string;
+    } | null;
     ChangeCard: (token?: string) => void;
     getpaymentMethod: (paymentMethod: string, inputData: any, totalPrice: string) => Promise<void>;
     saveToCheckoutSession: (inputData: any) => void;

package/dist/runtime/composables/Checkout/PaymentMethods/useFlowrixpay.js

@@ -1,8 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
-import { useAuth } from "../../useAuth.js";
+import { useAuthStore } from "../../../stores/auth.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
-  const { user } = useAuth();
+  const { user } = useAuthStore();
   const payment = new PaymentJs();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
     try {

package/dist/runtime/composables/Checkout/PaymentMethods/useOpayo.d.ts

@@ -5,5 +5,44 @@ export default function (): {
     opayoMonthValidations: (inputData: any) => void;
     opayoYearValidations: () => void;
     ChangeCard: (token?: string) => void;
-    user: import("vue").ComputedRef<import("../../../stores/index.js").User | null>;
+    user: {
+        id: number;
+        fullname: string;
+        firstname: string;
+        lastname: string;
+        email: string;
+        avatar: string;
+        country_id: number | null;
+        country: {
+            id: number;
+            name: string;
+            emoji: string;
+        } | null;
+        state_id: number | null;
+        state: string | null;
+        suburb: string | null;
+        dob: string | null;
+        phone: string | null;
+        address: string | null;
+        mobile: string | null;
+        company: string | null;
+        addresses: {
+            id: number;
+            fullname: string | null;
+            firstname: string;
+            middlename: string | null;
+            lastname: string;
+            address: string;
+            suburb: string;
+            state: string | null;
+            state_id: number | null;
+            country: string;
+            country_id: number;
+            postcode: string;
+            mobile: string;
+            shipping: number;
+            billing: number;
+        }[];
+        created_at: string;
+    } | null;
 };

package/dist/runtime/composables/Checkout/PaymentMethods/useOpayo.js

@@ -1,8 +1,8 @@
 import { useCheckoutStore } from "../../../stores/Checkout.js";
-import { useAuth } from "../../useAuth.js";
+import { useAuthStore } from "../../../stores/auth.js";
 export default function() {
   const checkoutStore = useCheckoutStore();
-  const { user } = useAuth();
+  const { user } = useAuthStore();
   const getpaymentMethod = async (paymentMethod, inputData, totalPrice) => {
     try {
       inputData.paymentmethod = paymentMethod;

package/dist/runtime/composables/Checkout/useCheckout.js

@@ -4,7 +4,7 @@ import { useCartStore } from "../../stores/Cart.js";
 import { useCheckoutStore } from "../../stores/Checkout.js";
 import { useCountry } from "../Extras/useCountry.js";
 import { useRouter, useRoute } from "vue-router";
-import { useAuth } from "../useAuth.js";
+import { useAuthStore } from "../../stores/auth.js";
 export default function() {
   const router = useRouter();
   const route = useRoute();
@@ -12,7 +12,7 @@ export default function() {
     user,
     token,
     isAuthenticated
-  } = useAuth();
+  } = useAuthStore();
   const { profile } = useCompanyProfile();
   const cartStore = useCartStore();
   const companyCountryId = computed(() => profile?.data.country_id || "");

package/dist/runtime/composables/Checkout/useShippingAddress.js

@@ -3,7 +3,7 @@ import { useCheckoutStore } from "../../stores/Checkout.js";
 import { useCountry } from "../Extras/useCountry.js";
 import { useCompanyProfile } from "../../stores/useCompanyProfile.js";
 import useStripe from "./PaymentMethods/useStripe.js";
-import { useAuth } from "../useAuth.js";
+import { useAuthStore } from "../../stores/auth.js";
 export default function(inputData) {
   const {
     status,
@@ -16,7 +16,7 @@ export default function(inputData) {
     signIn,
     signOut,
     refresh
-  } = useAuth();
+  } = useAuthStore();
   const AuthStore = ref();
   const checkoutStore = useCheckoutStore();
   const CountryData = useCountry().data;

package/dist/runtime/composables/Customer/useRegister.js

@@ -1,10 +1,10 @@
 import { ref } from "vue";
 import { useRouter, useRoute } from "#vue-router";
-import { useAuth } from "../useAuth.js";
+import { useAuthStore } from "../../stores/auth.js";
 export default function() {
   const router = useRouter();
   const route = useRoute();
-  const { signUp } = useAuth();
+  const { signUp } = useAuthStore();
   const form_error = ref("");
   const inputData = ref({ passwordStrengthValue: 0 });
   const { showPassword, togglePassword } = useTogglePassword();

package/dist/runtime/composables/Header/useHeader.js

@@ -1,10 +1,11 @@
 import { defineAsyncComponent, ref, computed } from "vue";
-import { useNavMenu, useCompanyProfile, useAuth, useCartStore, useSearchStore } from "#imports";
+import { useNavMenu, useCompanyProfile, useCartStore, useSearchStore } from "#imports";
+import { useAuthStore } from "../../stores/auth.js";
 export default function() {
   const wordpressUrl = import.meta.env.VITE_APP_WORDPRESS_URL;
   const NavMenu = useNavMenu();
   const CompanyProfile = useCompanyProfile();
-  const { user } = useAuth();
+  const { user } = useAuthStore();
   const cartStore = useCartStore();
   const useSearch = useSearchStore();
   const companyProfile = computed(() => CompanyProfile.profile);

package/dist/runtime/composables/index.d.ts

@@ -25,6 +25,7 @@ export * from './Checkout/PaymentMethods/usePaypal.js';
 export * from './Checkout/PaymentMethods/useStripe.js';
 export * from './Checkout/PaymentMethods/useZippay.js';
 export * from './Customer/useRegister.js';
+export * from './Customer/useLogin.js';
 export * from './Extras/useCountry.js';
 export * from './Extras/useDateFormatter.js';
 export * from './Extras/useNumberOnly.js';
@@ -55,7 +56,6 @@ export * from './SideBar/Filters/useSorting.js';
 export { useAddresses } from './useAddresses.js';
 export { useQuickView } from './Product/useQuickView.js';
 export { useAddToCart } from './useAddToCart.js';
-export { useAuth } from './useAuth.js';
 export { useCards } from './useCards.js';
 export { useClientApi } from './useClientApi.js';
 export { useCountries } from './useCountries.js';

package/dist/runtime/composables/index.js

@@ -25,6 +25,7 @@ export * from "./Checkout/PaymentMethods/usePaypal.js";
 export * from "./Checkout/PaymentMethods/useStripe.js";
 export * from "./Checkout/PaymentMethods/useZippay.js";
 export * from "./Customer/useRegister.js";
+export * from "./Customer/useLogin.js";
 export * from "./Extras/useCountry.js";
 export * from "./Extras/useDateFormatter.js";
 export * from "./Extras/useNumberOnly.js";
@@ -55,7 +56,6 @@ export * from "./SideBar/Filters/useSorting.js";
 export { useAddresses } from "./useAddresses.js";
 export { useQuickView } from "./Product/useQuickView.js";
 export { useAddToCart } from "./useAddToCart.js";
-export { useAuth } from "./useAuth.js";
 export { useCards } from "./useCards.js";
 export { useClientApi } from "./useClientApi.js";
 export { useCountries } from "./useCountries.js";

package/dist/runtime/composables/useAddresses.js

@@ -1,6 +1,6 @@
 import { computed } from "vue";
 import { useAddressesStore } from "../stores/addresses.js";
-import { useAuth } from "./useAuth.js";
+import { useAuthStore } from "../stores/auth.js";
 import { useApi } from "../utils/api.js";
 function formatErrorMessage(message) {
   if (!message) return "An error occurred";
@@ -19,7 +19,7 @@ function formatErrorMessage(message) {
 }
 export function useAddresses() {
   const store = useAddressesStore();
-  const { fetchProfile } = useAuth();
+  const { fetchProfile } = useAuthStore();
   const { post, patch, delete: deleteRequest } = useApi();
   async function addAddress(userData) {
     store.setLoading(true);

package/dist/runtime/middleware/flowrix.js

@@ -9,15 +9,26 @@ function getCookie(name) {
     return null;
   }
 }
+const parseCookies = (cookieString) => {
+  return Object.fromEntries(
+    cookieString.split(";").map((c) => {
+      const [key, ...v] = c.trim().split("=");
+      return [key, decodeURIComponent(v.join("="))];
+    })
+  );
+};
 async function request(method, config = {}, endpoint, options = {}) {
   const FLOWRIX_API_KEY = config.public?.FLOWRIX_API_KEY || "";
   const FLOWRIX_API_SECRET = config.public?.FLOWRIX_API_SECRET || "";
   const FLOWRIX_API_ORIGIN = config.public?.FLOWRIX_API_ORIGIN || "";
   let FLOWRIX_API_BASE = config.public?.FLOWRIX_API_BASE_V2 || "";
+  const cookiesObj = parseCookies(config.cookies || "");
+  const authToken = cookiesObj["authToken"];
   const headers = {
     "x-public-key": FLOWRIX_API_KEY,
     "x-session-token": getCookie("x-session-token"),
     "Access-Control-Expose-Headers": "x-session-token",
+    "authorization": `Bearer ${authToken}`,
     "Origin": FLOWRIX_API_ORIGIN,
     ...options.headers
   };

package/dist/runtime/server/api/category/[...slug].js

@@ -1,7 +1,8 @@
 import { defineEventHandler, getQuery, createError } from "h3";
-import { $fetch } from "ofetch";
 import { writeFile, mkdir, readFile } from "fs/promises";
 import { join } from "path";
+import { flowrixApi } from "../../../middleware/flowrix.js";
+import { useRuntimeConfig } from "#imports";
 const CACHE_DIR = join(process.cwd(), ".nuxt", "cache", "nitro", "categories");
 export const categoryCache = /* @__PURE__ */ new Map();
 async function ensureCacheDir() {
@@ -29,15 +30,13 @@ export default defineEventHandler(async (event) => {
   } catch (error) {
   }
   try {
-    const category = await $fetch(`${process.env.FLOWRIX_API_BASE}categories/${slug}`, {
-      query,
-      method: "get",
-      headers: {
-        "x-public-key": process.env.FLOWRIX_API_KEY,
-        "x-api-secret": process.env.FLOWRIX_API_SECRET,
-        "Origin": process.env.FLOWRIX_API_ORIGIN
-      }
-    });
+    const config = useRuntimeConfig();
+    const rawCookies = event.req.headers.cookie || "";
+    const apiConfig = {
+      ...config,
+      cookies: rawCookies
+    };
+    const category = await flowrixApi.get(`categories/${slug}`, apiConfig);
     await ensureCacheDir();
     await writeFile(filePath, JSON.stringify(category, null, 2), "utf-8");
     return category;

package/dist/runtime/server/api/cmspost/all.js

@@ -1,4 +1,4 @@
-import { defineEventHandler, getRouterParam } from "h3";
+import { defineEventHandler, getQuery, getRouterParam } from "h3";
 import { $fetch } from "ofetch";
 export const Page = /* @__PURE__ */ new Map();
 export default defineEventHandler(async (event) => {

package/dist/runtime/server/api/company/profile.js

@@ -3,8 +3,13 @@ import { flowrixApi } from "../../../middleware/flowrix.js";
 import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
   try {
-    let config = useRuntimeConfig();
-    const companyProfile = await flowrixApi.get(`company/profile`, config);
+    const config = useRuntimeConfig();
+    const rawCookies = event.req.headers.cookie || "";
+    const apiConfig = {
+      ...config,
+      cookies: rawCookies
+    };
+    const companyProfile = await flowrixApi.get(`company/profile`, apiConfig);
     return companyProfile;
   } catch (error) {
     setResponseStatus(event, 500);

package/dist/runtime/stores/auth.d.ts

@@ -51,12 +51,4 @@ export declare const useAuthStore: import("pinia").StoreDefinition<"auth", AuthS
     getToken: (state: AuthState) => string | null;
     isLoggedIn: (state: AuthState) => boolean;
     isHydrated: (state: AuthState) => boolean;
-}, {
-    setAuth({ user, token }: {
-        user: User;
-        token: string;
-    }): void;
-    loadAuth(): void;
-    logout(): void;
-    setHydrated(): void;
-}>;
+}, {}>;

package/dist/runtime/stores/auth.js

@@ -1,4 +1,6 @@
 import { defineStore } from "pinia";
+import { flowrixApi } from "../middleware/flowrix.js";
+import { useRuntimeConfig } from "#imports";
 export const useAuthStore = defineStore("auth", {
   state: () => ({
     user: null,
@@ -7,13 +9,40 @@ export const useAuthStore = defineStore("auth", {
     _hydrated: false
   }),
   actions: {
-    setAuth({ user, token }) {
-      this.user = user;
-      this.token = token;
-      this.isAuthenticated = true;
-      if (process.client) {
-        localStorage.setItem("auth_token", token);
-        localStorage.setItem("auth_user", JSON.stringify(user));
+    async userLogin(userFields) {
+      try {
+        const apiUrl = "login";
+        const config = useRuntimeConfig();
+        let rawCookies = "";
+        if (process.client) {
+          rawCookies = document.cookie || "";
+        }
+        const apiConfig = {
+          ...config,
+          cookies: rawCookies
+        };
+        const response = await flowrixApi.post(
+          apiUrl,
+          apiConfig,
+          {
+            body: userFields
+          }
+        );
+        console.log(response);
+        if (response.status == "Success") {
+          const authTokenCookie = useCookie("authToken", {
+            sameSite: "none",
+            // cross-site requests
+            secure: true,
+            // must be https
+            path: "/",
+            expires: /* @__PURE__ */ new Date("2099-12-31")
+          });
+          authTokenCookie.value = response.data.access_token;
+        }
+        return response;
+      } catch (error) {
+        return error.data;
       }
     },
     loadAuth() {
@@ -55,5 +84,8 @@ export const useAuthStore = defineStore("auth", {
     getToken: (state) => state.token,
     isLoggedIn: (state) => state.isAuthenticated,
     isHydrated: (state) => state._hydrated
+  },
+  persist: {
+    enabled: true
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowrix",
-  "version": "1.0.1-beta.58",
+  "version": "1.0.1-beta.59",
   "description": "Plug-and-play Nuxt eCommerce cart powered by FLOWRiX. Subscription required.",
   "license": "MIT",
   "type": "module",

package/dist/runtime/composables/useAuth.d.ts

@@ -1,45 +0,0 @@
-import { type User } from '../stores/auth.js';
-export interface AuthCredentials {
-    email: string;
-    password: string;
-}
-export interface ChangePasswordData {
-    current_password: string;
-    password: string;
-    password_confirmation: string;
-}
-export interface AuthResponse {
-    status: string;
-    message: string | Record<string, string[]> | null;
-    data: {
-        access_token: string;
-        token_type: string;
-        expires_in: number | null;
-        user: User;
-    } | null;
-}
-export declare function useAuth(): {
-    login: (credentials: AuthCredentials) => Promise<AuthResponse>;
-    register: (data: AuthCredentials & {
-        name?: string;
-    }) => Promise<AuthResponse>;
-    verifyEmail: (email: string) => Promise<AuthResponse>;
-    verifyToken: (email: string, token: string) => Promise<AuthResponse>;
-    resetPassword: (token: string, password: string, password_confirmation: string) => Promise<AuthResponse>;
-    logout: () => Promise<void>;
-    fetchProfile: () => Promise<User | null>;
-    updateProfile: (userData: any) => Promise<{
-        status: string;
-        message: string;
-    }>;
-    changePassword: (passwordData: ChangePasswordData) => Promise<{
-        status: string;
-        message: string;
-    }>;
-    initializeAuth: () => void;
-    formatErrorMessage: (message: string | Record<string, string[]> | null) => string;
-    user: import("vue").ComputedRef<User | null>;
-    token: import("vue").ComputedRef<string | null>;
-    isAuthenticated: import("vue").ComputedRef<boolean>;
-    isHydrated: import("vue").ComputedRef<boolean>;
-};

package/dist/runtime/composables/useAuth.js

@@ -1,180 +0,0 @@
-import { computed } from "vue";
-import { useAuthStore } from "../stores/auth.js";
-import { useApi } from "../utils/api.js";
-export function useAuth() {
-  const authStore = useAuthStore();
-  const { post, get } = useApi();
-  function formatErrorMessage(message) {
-    if (!message) return "";
-    if (typeof message === "string") {
-      return message;
-    }
-    const errorMessages = [];
-    for (const [, errors] of Object.entries(message)) {
-      if (Array.isArray(errors)) {
-        errorMessages.push(...errors);
-      } else {
-        errorMessages.push(String(errors));
-      }
-    }
-    return errorMessages.join(", ");
-  }
-  async function login(credentials) {
-    try {
-      const response = await post("/login", credentials);
-      if (response.status === "Success" && response.data?.access_token && response.data?.user) {
-        authStore.setAuth({
-          user: response.data.user,
-          token: response.data.access_token
-        });
-      }
-      return response;
-    } catch (error) {
-      console.error("Login error:", error);
-      const message = error.data ? formatErrorMessage(error.data.message) : error.message || "Login failed";
-      return {
-        status: "Error",
-        message,
-        data: null
-      };
-    }
-  }
-  async function register(data) {
-    try {
-      const response = await post("/mystore/customer/create", data);
-      return response;
-    } catch (error) {
-      console.error("Registration error:", error);
-      const message = error.data ? formatErrorMessage(error.data.message) : error.message || "Registration failed";
-      return {
-        status: "Error",
-        message,
-        data: null
-      };
-    }
-  }
-  async function verifyEmail(email) {
-    try {
-      const response = await post("/verify-email", { email });
-      return response;
-    } catch (error) {
-      console.error("Verify email error:", error);
-      const message = error.data ? formatErrorMessage(error.data.message) : error.message || "email verification failed";
-      return {
-        status: "Error",
-        message,
-        data: null
-      };
-    }
-  }
-  async function verifyToken(email, token) {
-    try {
-      const response = await post("/verify-token", { email, token });
-      return response;
-    } catch (error) {
-      console.error("Verify token error:", error);
-      const message = error.data ? formatErrorMessage(error.data.message) : error.message || "Token verification failed";
-      return {
-        status: "Error",
-        message,
-        data: null
-      };
-    }
-  }
-  async function resetPassword(token, password, password_confirmation) {
-    try {
-      const response = await post("/reset-password", {
-        token,
-        password,
-        password_confirmation
-      });
-      return response;
-    } catch (error) {
-      console.error("Reset password error:", error);
-      const message = error.data ? formatErrorMessage(error.data.message) : error.message || "Password reset failed";
-      return {
-        status: "Error",
-        message,
-        data: null
-      };
-    }
-  }
-  async function logout() {
-    try {
-      await post("/mystore/customer/logout", {});
-    } catch (error) {
-      console.error("Logout API failed:", error);
-    } finally {
-      authStore.logout();
-    }
-  }
-  async function fetchProfile() {
-    try {
-      const response = await get("/mystore/customer/profile");
-      if (response.status === "Success" && response.data) {
-        authStore.user = response.data;
-        if (import.meta.client) {
-          localStorage.setItem("auth_user", JSON.stringify(response.data));
-        }
-        return response.data;
-      }
-      return null;
-    } catch (error) {
-      console.error("Fetch profile failed:", error);
-      return null;
-    }
-  }
-  async function updateProfile(userData) {
-    try {
-      const response = await post("/mystore/customer/profile/update", userData);
-      if (response.status === "Success") {
-        await fetchProfile();
-        return { status: response.status, message: response.message || "Profile Updated Successfully" };
-      } else {
-        const errorMessage = formatErrorMessage(response.message);
-        throw new Error(errorMessage);
-      }
-    } catch (error) {
-      console.error("Update profile error:", error);
-      const errorMessage = error.data ? formatErrorMessage(error.data.message) : error.message || "Failed to update profile";
-      throw new Error(errorMessage);
-    }
-  }
-  async function changePassword(passwordData) {
-    try {
-      const response = await post("/mystore/customer/change-password", passwordData);
-      if (response.status === "Success") {
-        return { status: "Success", message: "Password updated successfully" };
-      } else {
-        const errorMessage = formatErrorMessage(response.message);
-        throw new Error(errorMessage);
-      }
-    } catch (error) {
-      console.error("Change password error:", error);
-      const errorMessage = error.data ? formatErrorMessage(error.data.message) : error.message || "Failed to change password";
-      throw new Error(errorMessage);
-    }
-  }
-  const initializeAuth = () => {
-    if (import.meta.client && !authStore.isHydrated) {
-      authStore.loadAuth();
-    }
-  };
-  return {
-    login,
-    register,
-    verifyEmail,
-    verifyToken,
-    resetPassword,
-    logout,
-    fetchProfile,
-    updateProfile,
-    changePassword,
-    initializeAuth,
-    formatErrorMessage,
-    user: computed(() => authStore.getUser),
-    token: computed(() => authStore.getToken),
-    isAuthenticated: computed(() => authStore.isLoggedIn),
-    isHydrated: computed(() => authStore.isHydrated)
-  };
-}