feat(auth): include subscription tier in token and session payload
- Adds subscription tier info to access/refresh tokens. - Stores tier details in session Redis record. - Returns tier data in login/register response. - Uses default tier when user has none.
This commit is contained in:
1 parent
7f42def478
commit
d27526e026
20 files changed
+2133
-40
No files matched your search
@@ -18,6 +18,10 @@ import {
|
||||
} from "@/lib/prisma/queries/users";
|
||||
import { setSession } from "@/lib/redis/session";
|
||||
import { randomUUID } from "crypto";
|
||||
import {
|
||||
getDefaultSubscriptionTier,
|
||||
getSubscriptionTierById,
|
||||
} from "@/lib/prisma/queries/subscription-tiers";
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
@@ -125,8 +129,20 @@ export async function POST(request: NextRequest) {
|
||||
await updateLastLogin(user.user_id);
|
||||
|
||||
// Gerar tokens
|
||||
const accessToken = generateAccessToken(user.user_id, user.username);
|
||||
const refreshToken = generateRefreshToken(user.user_id, user.username);
|
||||
const tierInfo =
|
||||
user.subscription_tier ??
|
||||
(user.subscription_tier_id
|
||||
? await getSubscriptionTierById(user.subscription_tier_id)
|
||||
: await getDefaultSubscriptionTier());
|
||||
|
||||
const accessToken = generateAccessToken(user.user_id, user.username, {
|
||||
tierSlug: tierInfo?.slug ?? undefined,
|
||||
tierLevel: tierInfo?.level ?? undefined,
|
||||
});
|
||||
const refreshToken = generateRefreshToken(user.user_id, user.username, {
|
||||
tierSlug: tierInfo?.slug ?? undefined,
|
||||
tierLevel: tierInfo?.level ?? undefined,
|
||||
});
|
||||
|
||||
// Criar sessão no Redis
|
||||
const sessionId = randomUUID();
|
||||
@@ -136,6 +152,10 @@ export async function POST(request: NextRequest) {
|
||||
email: user.email,
|
||||
accessToken,
|
||||
createdAt: Date.now(),
|
||||
subscriptionTierId: tierInfo?.subscription_tier_id ?? null,
|
||||
subscriptionTierSlug: tierInfo?.slug ?? null,
|
||||
subscriptionTierName: tierInfo?.name ?? null,
|
||||
subscriptionTierLevel: tierInfo?.level ?? null,
|
||||
});
|
||||
|
||||
// Criar resposta
|
||||
@@ -150,6 +170,14 @@ export async function POST(request: NextRequest) {
|
||||
lastName: user.last_name,
|
||||
accountLevel: user.account_level,
|
||||
hasDonated: user.has_donated,
|
||||
subscriptionTier: tierInfo
|
||||
? {
|
||||
id: tierInfo.subscription_tier_id,
|
||||
name: tierInfo.name,
|
||||
slug: tierInfo.slug,
|
||||
level: tierInfo.level,
|
||||
}
|
||||
: null,
|
||||
},
|
||||
accessToken,
|
||||
},
|
||||
|
||||
@@ -23,6 +23,7 @@ import { setSession } from "@/lib/redis/session";
|
||||
import { randomUUID } from "crypto";
|
||||
import { createUser } from "@/lib/prisma/queries/users";
|
||||
import { createCharacter } from "@/lib/prisma/queries/characters";
|
||||
import { getDefaultSubscriptionTier } from "@/lib/prisma/queries/subscription-tiers";
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
try {
|
||||
@@ -186,10 +187,19 @@ export async function POST(request: NextRequest) {
|
||||
});
|
||||
|
||||
// Gerar tokens
|
||||
const accessToken = generateAccessToken(newUser.userId, newUser.username);
|
||||
const defaultTier = await getDefaultSubscriptionTier();
|
||||
|
||||
const accessToken = generateAccessToken(newUser.userId, newUser.username, {
|
||||
tierSlug: defaultTier?.slug ?? undefined,
|
||||
tierLevel: defaultTier?.level ?? undefined,
|
||||
});
|
||||
const refreshToken = generateRefreshToken(
|
||||
newUser.userId,
|
||||
newUser.username
|
||||
newUser.username,
|
||||
{
|
||||
tierSlug: defaultTier?.slug ?? undefined,
|
||||
tierLevel: defaultTier?.level ?? undefined,
|
||||
}
|
||||
);
|
||||
|
||||
// Criar sessão no Redis
|
||||
@@ -200,6 +210,10 @@ export async function POST(request: NextRequest) {
|
||||
email: newUser.email,
|
||||
accessToken,
|
||||
createdAt: Date.now(),
|
||||
subscriptionTierId: defaultTier?.subscription_tier_id ?? null,
|
||||
subscriptionTierSlug: defaultTier?.slug ?? null,
|
||||
subscriptionTierName: defaultTier?.name ?? null,
|
||||
subscriptionTierLevel: defaultTier?.level ?? null,
|
||||
});
|
||||
|
||||
// Criar resposta
|
||||
@@ -210,6 +224,14 @@ export async function POST(request: NextRequest) {
|
||||
userId: newUser.userId,
|
||||
username: newUser.username,
|
||||
email: newUser.email,
|
||||
subscriptionTier: defaultTier
|
||||
? {
|
||||
id: defaultTier.subscription_tier_id,
|
||||
name: defaultTier.name,
|
||||
slug: defaultTier.slug,
|
||||
level: defaultTier.level,
|
||||
}
|
||||
: null,
|
||||
},
|
||||
accessToken,
|
||||
},
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { cookies } from "next/headers";
|
||||
import { secureLogger } from "@/lib/secure-logger";
|
||||
import { getSession, refreshSession, deleteSession } from "@/lib/redis/session";
|
||||
import { getSession, refreshSession, deleteSession, setSession } from "@/lib/redis/session";
|
||||
import { verifyAccessToken } from "@/lib/auth/jwt";
|
||||
import { getMainCharacter } from "@/lib/prisma/queries/characters";
|
||||
import { getUserById } from "@/lib/prisma/queries/users";
|
||||
import { getSubscriptionTierById, getDefaultSubscriptionTier } from "@/lib/prisma/queries/subscription-tiers";
|
||||
|
||||
/**
|
||||
* GET /api/auth/session
|
||||
@@ -27,7 +29,7 @@ export async function GET(request: NextRequest) {
|
||||
}
|
||||
|
||||
// Buscar sessão no Redis
|
||||
const session = await getSession(sessionId);
|
||||
let session = await getSession(sessionId);
|
||||
|
||||
if (!session) {
|
||||
// Limpar cookie se sessão não existe
|
||||
@@ -63,6 +65,55 @@ export async function GET(request: NextRequest) {
|
||||
return response;
|
||||
}
|
||||
|
||||
let tierInfo:
|
||||
| {
|
||||
subscription_tier_id: number | null;
|
||||
name: string | null;
|
||||
slug: string | null;
|
||||
level: number | null;
|
||||
}
|
||||
| null = {
|
||||
subscription_tier_id: session.subscriptionTierId,
|
||||
name: session.subscriptionTierName,
|
||||
slug: session.subscriptionTierSlug,
|
||||
level: session.subscriptionTierLevel,
|
||||
};
|
||||
|
||||
if (
|
||||
tierInfo.subscription_tier_id === undefined ||
|
||||
tierInfo.subscription_tier_id === null ||
|
||||
tierInfo.slug === null
|
||||
) {
|
||||
const dbUser = await getUserById(session.userId);
|
||||
const fetchedTier = dbUser?.subscription_tier
|
||||
? await getSubscriptionTierById(dbUser.subscription_tier.subscription_tier_id)
|
||||
: await getDefaultSubscriptionTier();
|
||||
|
||||
tierInfo = fetchedTier
|
||||
? {
|
||||
subscription_tier_id: fetchedTier.subscription_tier_id,
|
||||
name: fetchedTier.name,
|
||||
slug: fetchedTier.slug,
|
||||
level: fetchedTier.level,
|
||||
}
|
||||
: {
|
||||
subscription_tier_id: null,
|
||||
name: null,
|
||||
slug: null,
|
||||
level: null,
|
||||
};
|
||||
|
||||
session = {
|
||||
...session,
|
||||
subscriptionTierId: tierInfo.subscription_tier_id,
|
||||
subscriptionTierName: tierInfo.name,
|
||||
subscriptionTierSlug: tierInfo.slug,
|
||||
subscriptionTierLevel: tierInfo.level,
|
||||
};
|
||||
|
||||
await setSession(sessionId, session);
|
||||
}
|
||||
|
||||
// Atualizar TTL da sessão
|
||||
await refreshSession(sessionId);
|
||||
|
||||
@@ -78,6 +129,14 @@ export async function GET(request: NextRequest) {
|
||||
username: session.username,
|
||||
email: session.email,
|
||||
characterName: mainCharacter?.character_name || null,
|
||||
subscriptionTier: tierInfo
|
||||
? {
|
||||
id: tierInfo.subscription_tier_id,
|
||||
name: tierInfo.name,
|
||||
slug: tierInfo.slug,
|
||||
level: tierInfo.level,
|
||||
}
|
||||
: null,
|
||||
},
|
||||
},
|
||||
{ status: 200 }
|
||||
|
||||
Reference in new issue
Block a user