Skip to content

✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.

feat: improve premium checks

AykutSaraccd4cc07c419b
diff --git a/src/containers/Modals/AccountModal/index.tsx b/src/containers/Modals/AccountModal/index.tsx
index 353d6f09..1aa85c57 100644
--- a/src/containers/Modals/AccountModal/index.tsx
+++ b/src/containers/Modals/AccountModal/index.tsx
@@ -47,6 +47,7 @@ const StyledContainer = styled.div`
export const AccountModal: React.FC<ModalProps> = ({ opened, onClose }) => {
const user = useSupaUser();
const isPremium = useUser(state => state.premium);
+ const isOrg = useUser(state => state.organization);
const premiumCancelled = useUser(state => state.premiumCancelled);
const setVisible = useModal(state => state.setVisible);
const logout = useUser(state => state.logout);
@@ -76,7 +77,7 @@ export const AccountModal: React.FC<ModalProps> = ({ opened, onClose }) => {
<div>
{isPremium ? (
<Badge color={premiumCancelled ? "teal" : "indigo"}>
- Premium {premiumCancelled && "(Cancelled)"}
+ Premium {premiumCancelled ? "(Cancelled)" : isOrg && "(Organization)"}
</Badge>
) : (
<Badge variant="outline" color="gray">
diff --git a/src/store/useUser.ts b/src/store/useUser.ts
index 73653a94..542b998c 100644
--- a/src/store/useUser.ts
+++ b/src/store/useUser.ts
@@ -8,24 +8,12 @@ interface UserActions {
setSession: (session: Session) => void;
}
-interface Premium {
- id: 101;
- created_at: "2023-07-29T17:33:10.403228+00:00";
- user: null;
- status: "active";
- ends_at: null;
- subscription_id: null;
- variant_id: null;
- renews_at: null;
- cancelled: null;
- email: "[email protected]";
-}
-
interface UserStates {
user: User | null;
isAuthenticated: boolean;
premium: boolean;
premiumCancelled: boolean;
+ organization: boolean;
}
const initialStates: UserStates = {
@@ -33,21 +21,22 @@ const initialStates: UserStates = {
isAuthenticated: false,
premium: false,
premiumCancelled: false,
+ organization: false,
};
const useUser = create<UserStates & UserActions>()(set => ({
...initialStates,
setSession: async session => {
- const {
- data: { user },
- error,
- } = await supabase.auth.getUser();
-
- if (error) return toast.error(error.message);
-
- supabase.rpc("get_subscription", { email_arg: session.user.email }).then(({ data }) => {
- if (data) set({ premium: data[0].status === "active" });
- set({ user, isAuthenticated: true });
+ supabase.rpc("get_subscription_info").then(({ data }) => {
+ if (data) {
+ set({
+ premium: data.premium,
+ organization: data.organization,
+ premiumCancelled: !!data.cancelled,
+ });
+ }
+
+ set({ user: session.user, isAuthenticated: true });
});
},
logout: async () => {