Compare commits
No commits in common. "7ada05da6a8ffe42c5451ba29146c5d35e612371" and "091cb5ba854eabcde9659c7a3450f79dea0072ce" have entirely different histories.
7ada05da6a
...
091cb5ba85
Binary file not shown.
@ -1,32 +0,0 @@
|
|||||||
import { NextResponse } from "next/server";
|
|
||||||
import { auth } from "@clerk/nextjs/server";
|
|
||||||
import { MEMBERSHIP_FEATURES } from "@/lib/membership/features";
|
|
||||||
import { getUserMembershipContext } from "@/lib/membership/access";
|
|
||||||
|
|
||||||
export async function GET() {
|
|
||||||
try {
|
|
||||||
const { userId } = await auth();
|
|
||||||
if (!userId) {
|
|
||||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const { membershipType, features } = await getUserMembershipContext(userId);
|
|
||||||
|
|
||||||
return NextResponse.json({
|
|
||||||
success: true,
|
|
||||||
data: {
|
|
||||||
membershipType,
|
|
||||||
currentFeatures: features,
|
|
||||||
plans: MEMBERSHIP_FEATURES,
|
|
||||||
},
|
|
||||||
meta: {
|
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
return NextResponse.json(
|
|
||||||
{ error: "Failed to load membership features" },
|
|
||||||
{ status: 500 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -51,15 +51,6 @@ interface UsersListResponse {
|
|||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface MembershipFeaturesResponse {
|
|
||||||
success: boolean;
|
|
||||||
data: {
|
|
||||||
membershipType: MembershipType;
|
|
||||||
currentFeatures: MembershipFeatures;
|
|
||||||
plans: Record<MembershipType, MembershipFeatures>;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function isMembershipType(value: unknown): value is MembershipType {
|
function isMembershipType(value: unknown): value is MembershipType {
|
||||||
return value === "basic" || value === "premium" || value === "vip";
|
return value === "basic" || value === "premium" || value === "vip";
|
||||||
}
|
}
|
||||||
@ -94,35 +85,3 @@ export function getMembershipFeatures(
|
|||||||
): MembershipFeatures {
|
): MembershipFeatures {
|
||||||
return MEMBERSHIP_FEATURES[membershipType];
|
return MEMBERSHIP_FEATURES[membershipType];
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getCurrentMembershipFeaturesFromServer(
|
|
||||||
token: string | null,
|
|
||||||
): Promise<{
|
|
||||||
membershipType: MembershipType;
|
|
||||||
features: MembershipFeatures;
|
|
||||||
}> {
|
|
||||||
if (!token) {
|
|
||||||
return {
|
|
||||||
membershipType: "basic",
|
|
||||||
features: MEMBERSHIP_FEATURES.basic,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await apiClient.get<MembershipFeaturesResponse>(
|
|
||||||
API_ENDPOINTS.MEMBERSHIP.FEATURES,
|
|
||||||
withAuth(token),
|
|
||||||
);
|
|
||||||
|
|
||||||
const data = response.data?.data;
|
|
||||||
if (!data) {
|
|
||||||
return {
|
|
||||||
membershipType: "basic",
|
|
||||||
features: MEMBERSHIP_FEATURES.basic,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
membershipType: data.membershipType,
|
|
||||||
features: data.currentFeatures,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|||||||
@ -44,9 +44,6 @@ export const API_ENDPOINTS = {
|
|||||||
HISTORY: "/api/attendance/history",
|
HISTORY: "/api/attendance/history",
|
||||||
},
|
},
|
||||||
RECOMMENDATIONS: "/api/recommendations",
|
RECOMMENDATIONS: "/api/recommendations",
|
||||||
MEMBERSHIP: {
|
|
||||||
FEATURES: "/api/membership/features",
|
|
||||||
},
|
|
||||||
NUTRITION: {
|
NUTRITION: {
|
||||||
BASE: "/api/nutrition",
|
BASE: "/api/nutrition",
|
||||||
MEALS: "/api/nutrition/meals",
|
MEALS: "/api/nutrition/meals",
|
||||||
|
|||||||
@ -1,18 +1,14 @@
|
|||||||
import { useAuth, useUser } from "@clerk/clerk-expo";
|
import { useAuth, useUser } from "@clerk/clerk-expo";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import {
|
import {
|
||||||
getCurrentMembershipFeaturesFromServer,
|
getCurrentMembershipType,
|
||||||
|
getMembershipFeatures,
|
||||||
type MembershipFeatures,
|
type MembershipFeatures,
|
||||||
type MembershipType,
|
type MembershipType,
|
||||||
} from "../api/membership";
|
} from "../api/membership";
|
||||||
import log from "../utils/logger";
|
import log from "../utils/logger";
|
||||||
|
|
||||||
const BASIC_FEATURES: MembershipFeatures = {
|
const BASIC_FEATURES = getMembershipFeatures("basic");
|
||||||
recommendationsPerMonth: 1,
|
|
||||||
hydrationTracking: false,
|
|
||||||
nutritionTracking: false,
|
|
||||||
advancedStatistics: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
interface UseMembershipResult {
|
interface UseMembershipResult {
|
||||||
membershipType: MembershipType;
|
membershipType: MembershipType;
|
||||||
@ -24,7 +20,6 @@ export function useMembership(): UseMembershipResult {
|
|||||||
const { user } = useUser();
|
const { user } = useUser();
|
||||||
const { getToken, isSignedIn } = useAuth();
|
const { getToken, isSignedIn } = useAuth();
|
||||||
const [membershipType, setMembershipType] = useState<MembershipType>("basic");
|
const [membershipType, setMembershipType] = useState<MembershipType>("basic");
|
||||||
const [features, setFeatures] = useState<MembershipFeatures>(BASIC_FEATURES);
|
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -34,7 +29,6 @@ export function useMembership(): UseMembershipResult {
|
|||||||
if (!isSignedIn || !user?.id) {
|
if (!isSignedIn || !user?.id) {
|
||||||
if (isMounted) {
|
if (isMounted) {
|
||||||
setMembershipType("basic");
|
setMembershipType("basic");
|
||||||
setFeatures(BASIC_FEATURES);
|
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@ -43,16 +37,14 @@ export function useMembership(): UseMembershipResult {
|
|||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const token = await getToken();
|
const token = await getToken();
|
||||||
const result = await getCurrentMembershipFeaturesFromServer(token);
|
const type = await getCurrentMembershipType(user.id, token);
|
||||||
if (isMounted) {
|
if (isMounted) {
|
||||||
setMembershipType(result.membershipType);
|
setMembershipType(type);
|
||||||
setFeatures(result.features);
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
log.error("Failed to load membership", error, { userId: user.id });
|
log.error("Failed to load membership", error, { userId: user.id });
|
||||||
if (isMounted) {
|
if (isMounted) {
|
||||||
setMembershipType("basic");
|
setMembershipType("basic");
|
||||||
setFeatures(BASIC_FEATURES);
|
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
if (isMounted) {
|
if (isMounted) {
|
||||||
@ -70,7 +62,7 @@ export function useMembership(): UseMembershipResult {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
membershipType,
|
membershipType,
|
||||||
features,
|
features: getMembershipFeatures(membershipType) || BASIC_FEATURES,
|
||||||
loading,
|
loading,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user