-
-
-
-
-
- {displayName}
-
+ {
+ header: 'VTuber',
+ accessorFn: d => ({
+ displayName: d.vtuber.display_name,
+ image: d.vtuber.image,
+ imageBlur: d.vtuber.image_blur
+ }),
+ cell: info => {
+ const { displayName, image, imageBlur } = info.getValue<{ displayName: string, image: string, imageBlur: string }>();
+ return (
+ <>
+
+
+
+
-
- )
- }
- },
- {
- header: 'Date',
- accessorFn: d => format(new Date(d.date), 'yyyy-MM-dd HH:mm'),
- sortingFn: 'datetime',
- sortDescFirst: true,
- cell: info => (
{info.getValue() as string})
- },
- {
- header: 'Platform',
- accessorFn: d => [
- (d.is_chaturbate_stream && 'CB'),
- (d.is_fansly_stream && 'Fansly')
- ].filter(Boolean).join(', ') || '???'
- },
- {
- header: 'Status',
- accessorFn: d => {
- if (!d.archive_status) return 'missing';
- return d.archive_status
- }
- },
- // {
- // header: 'Name',
- // footer: props => props.column.id,
- // columns: [
- // {
- // accessorKey: 'firstName',
- // cell: info => info.getValue(),
- // footer: props => props.column.id,
- // },
- // {
- // accessorFn: row => row.lastName,
- // id: 'lastName',
- // cell: info => info.getValue(),
- // header: () =>
Last Name ,
- // footer: props => props.column.id,
- // },
- // ],
- // },
+
+ {displayName}
+
+
+
+ )
+ }
+ },
+ {
+ header: 'Date',
+ accessorFn: d => format(new Date(d.date), 'yyyy-MM-dd HH:mm'),
+ sortingFn: 'datetime',
+ sortDescFirst: true,
+ cell: info => (
{info.getValue() as string})
+ },
+ {
+ header: 'Platform',
+ accessorFn: d => [
+ (d.is_chaturbate_stream && 'CB'),
+ (d.is_fansly_stream && 'Fansly')
+ ].filter(Boolean).join(', ') || '???'
+ },
+ {
+ header: 'Status',
+ accessorFn: d => {
+ if (!d.archive_status) return 'missing';
+ return d.archive_status
+ }
+ },
+ // {
+ // header: 'Name',
+ // footer: props => props.column.id,
+ // columns: [
+ // {
+ // accessorKey: 'firstName',
+ // cell: info => info.getValue(),
+ // footer: props => props.column.id,
+ // },
+ // {
+ // accessorFn: row => row.lastName,
+ // id: 'lastName',
+ // cell: info => info.getValue(),
+ // header: () =>
Last Name ,
+ // footer: props => props.column.id,
+ // },
+ // ],
+ // },
],
[]
)
@@ -157,8 +157,8 @@ export default function StreamsTable() {
return (
-
- {isPending &&
}
+
+ {isPending &&
}
{!isPending && <>
@@ -187,8 +187,8 @@ export default function StreamsTable() {
{row.getVisibleCells().map(cell => {
return (
-
{flexRender(
@@ -203,86 +203,85 @@ export default function StreamsTable() {
})}
-
-
-
-
- table.firstPage()}
- disabled={!table.getCanPreviousPage()}
- >
- {'<<'}
-
- table.previousPage()}
- disabled={!table.getCanPreviousPage()}
- >
- {'<'}
-
- table.nextPage()}
- disabled={!table.getCanNextPage()}
- >
- {'>'}
-
- table.lastPage()}
- disabled={!table.getCanNextPage()}
- >
- {'>>'}
-
-
-
- Page
-
- {table.getState().pagination.pageIndex + 1} of{' '}
- {table.getPageCount().toLocaleString()}
-
-
-
- {/* second row with page number input and pages-per-screen select */}
-
-
- Go to page:
-
-
-
-
-
-
{
- table.setPageSize(Number(e.target.value))
- }}
+
+
+
+ table.firstPage()}
+ disabled={!table.getCanPreviousPage()}
>
- {[20, 50, 100].map(pageSize => (
-
- Show {pageSize}
-
- ))}
-
+ {'<<'}
+
+ table.previousPage()}
+ disabled={!table.getCanPreviousPage()}
+ >
+ {'<'}
+
+ table.nextPage()}
+ disabled={!table.getCanNextPage()}
+ >
+ {'>'}
+
+ table.lastPage()}
+ disabled={!table.getCanNextPage()}
+ >
+ {'>>'}
+
+
+
+ Page
+
+ {table.getState().pagination.pageIndex + 1} of{' '}{table.getPageCount().toLocaleString()}
+
- }
+
+ {/* second row with page number input and pages-per-screen select */}
+
+
+ Go to page:
+
+
+
+
+
+ {
+ table.setPageSize(Number(e.target.value))
+ }}
+ >
+ {[20, 50, 100].map(pageSize => (
+
+ Show {pageSize}
+
+ ))}
+
+
+
+
+ }
-
-
+
+
)
}
diff --git a/services/next/app/components/vod-card.tsx b/services/next/app/components/vod-card.tsx
index 1d8ba2b..ad2a2df 100644
--- a/services/next/app/components/vod-card.tsx
+++ b/services/next/app/components/vod-card.tsx
@@ -3,6 +3,7 @@ import { getSafeDate } from '@/app/lib/dates';
import { IVtuber } from '@futureporn/types';
import Image from "next/legacy/image"
import { LocalizedDate } from '@/app/components/localized-date'
+import Skeleton from "react-loading-skeleton";
interface IVodCardProps {
id: number;
@@ -24,19 +25,21 @@ export default function VodCard({id, title, date, muxAsset, thumbnail = 'https:/
- {/* @todo restore thumbnail image */}
- {/*
- */}
+ {thumbnail &&
+
+
+ }
+ {!thumbnail &&
missing thumbnail
}
{vtuber.display_name}
diff --git a/services/next/app/config/clientConfigs.ts b/services/next/app/config/clientConfigs.ts
index d5723a2..2442989 100644
--- a/services/next/app/config/clientConfigs.ts
+++ b/services/next/app/config/clientConfigs.ts
@@ -1,6 +1,11 @@
if (!process.env.NEXT_PUBLIC_API_DOMAIN) throw new Error('Missing NEXT_PUBLIC_API_DOMAIN env var');
if (!process.env.NEXT_PUBLIC_WEBSITE_DOMAIN) throw new Error('Missing NEXT_PUBLIC_WEBSITE_DOMAIN env var');
+if (!process.env.NEXT_PUBLIC_UPPY_COMPANION_URL) throw new Error('Missing NEXT_PUBLIC_UPPY_COMPANION_URL env var');
+if (!process.env.NEXT_PUBLIC_SITE_URL) throw new Error('Missing NEXT_PUBLIC_SITE_URL env var');
+if (!process.env.NEXT_PUBLIC_STRAPI_URL) throw new Error('Missing NEXT_PUBLIC_STRAPI_URL env var');
+if (!process.env.NEXT_PUBLIC_POSTGREST_URL) throw new Error('Missing NEXT_PUBLIC_POSTGREST_URL env var');
+
// const apiDomain = process.env.NEXT_PUBLIC_API_DOMAIN!
// const websiteDomain = process.env.NEXT_PUBLIC_WEBSITE_DOMAIN!
diff --git a/services/next/app/config/configs.ts b/services/next/app/config/configs.ts
index 653d059..c0134ea 100644
--- a/services/next/app/config/configs.ts
+++ b/services/next/app/config/configs.ts
@@ -1,21 +1,16 @@
-
-if (!process.env.PATREON_CLIENT_ID) throw new Error("PATREON_CLIENT_ID was missing from env");
-if (!process.env.PATREON_CLIENT_SECRET) throw new Error('Missing PATREON_CLIENT_SECRET env var');
-if (!process.env.KEYCLOAK_CLIENT_ID) throw new Error(`KEYCLOAK_CLIENT_ID missing in env!`);
-if (!process.env.KEYCLOAK_CLIENT_SECRET) throw new Error(`KEYCLOAK_CLIENT_SECRET missing in env!`);
-if (!process.env.KEYCLOAK_ISSUER) throw new Error(`KEYCLOAK_ISSUER missing in env!`);
-if (!process.env.NEXTAUTH_SECRET) throw new Error(`NEXTAUTH_SECRET missing in env!`);
-if (!process.env.NEXTAUTH_URL) throw new Error(`NEXTAUTH_URL missing in env!`);
-
+// When adding env vars here, make sure to also add the assertion in ./server.ts
const patreonClientId = process.env.PATREON_CLIENT_ID!
const patreonClientSecret = process.env.PATREON_CLIENT_SECRET!
const keycloakClientId = process.env.KEYCLOAK_CLIENT_ID!
const keycloakClientSecret = process.env.KEYCLOAK_CLIENT_SECRET!
const keycloakIssuer = process.env.KEYCLOAK_ISSUER!
+const keycloakLocalUrl = process.env.KEYCLOAK_LOCAL_URL!
+const keycloakUrl = process.env.KEYCLOAK_URL!
const nextAuthSecret = process.env.NEXTAUTH_SECRET!
const nextAuthUrl = process.env.NEXTAUTH_URL!
+const nextUrl = process.env.NEXT_PUBLIC_URL!
export interface ServerConfig {
patreonClientId: string;
@@ -23,8 +18,11 @@ export interface ServerConfig {
keycloakClientId: string;
keycloakClientSecret: string;
keycloakIssuer: string;
+ keycloakLocalUrl: string;
+ keycloakUrl: string;
nextAuthSecret: string;
nextAuthUrl: string;
+ nextUrl: string;
}
export const configs: ServerConfig = {
@@ -33,6 +31,9 @@ export const configs: ServerConfig = {
keycloakClientId,
keycloakClientSecret,
keycloakIssuer,
+ keycloakLocalUrl,
+ keycloakUrl,
nextAuthSecret,
nextAuthUrl,
+ nextUrl,
}
\ No newline at end of file
diff --git a/services/next/app/config/server.ts b/services/next/app/config/server.ts
new file mode 100644
index 0000000..a70e23c
--- /dev/null
+++ b/services/next/app/config/server.ts
@@ -0,0 +1,20 @@
+/**
+ * this file exists to give us verbose errors when we forget to define a server-side env var.
+ * configs should go in ./configs
+ */
+
+'use server';
+
+export async function main () {
+ if (!process.env.PATREON_CLIENT_ID) throw new Error("PATREON_CLIENT_ID was missing from env");
+ if (!process.env.PATREON_CLIENT_SECRET) throw new Error('Missing PATREON_CLIENT_SECRET env var');
+ if (!process.env.KEYCLOAK_CLIENT_ID) throw new Error(`KEYCLOAK_CLIENT_ID missing in env!`);
+ if (!process.env.KEYCLOAK_CLIENT_SECRET) throw new Error(`KEYCLOAK_CLIENT_SECRET missing in env!`);
+ if (!process.env.KEYCLOAK_ISSUER) throw new Error(`KEYCLOAK_ISSUER missing in env!`);
+ if (!process.env.KEYCLOAK_LOCAL_URL) throw new Error(`KEYCLOAK_LOCAL_URL missing in env!`);
+ if (!process.env.NEXTAUTH_SECRET) throw new Error(`NEXTAUTH_SECRET missing in env!`);
+ if (!process.env.NEXTAUTH_URL) throw new Error(`NEXTAUTH_URL missing in env!`);
+ if (!process.env.NEXT_PUBLIC_URL) throw new Error(`NEXT_PUBLIC_URL missing in env!`);
+}
+
+main()
diff --git a/services/next/app/latest-vods/[page]/page.tsx b/services/next/app/latest-vods/[page]/page.tsx
index 93ba533..17ebc96 100644
--- a/services/next/app/latest-vods/[page]/page.tsx
+++ b/services/next/app/latest-vods/[page]/page.tsx
@@ -9,23 +9,20 @@ interface IPageParams {
}
export default async function Page({ params: { page } }: IPageParams) {
- let vods;
- try {
- vods = await getVods(page, 24, true);
- } catch (error) {
- console.error("An error occurred:", error);
- return
Error: {JSON.stringify(error)}
;
- }
+
+ const pageSize = 24
+ const { count, vods } = await getVods(page, pageSize, true);
+
return (
<>
Latest VODs
page {page}
-
+
);
diff --git a/services/next/app/lib/auth.ts b/services/next/app/lib/auth.ts
index fff8f94..1c7a690 100644
--- a/services/next/app/lib/auth.ts
+++ b/services/next/app/lib/auth.ts
@@ -4,7 +4,8 @@ import { jwtDecode } from "jwt-decode";
import { type JWT } from "next-auth/jwt";
import { User, Profile } from "next-auth";
import { configs } from "../config/configs";
-import { getPatreonMemberships, getKeycloakIdpToken, updateKeycloakUserPatreonEntitlements } from "./patreon";
+import { getPatreonMemberships, getKeycloakIdpToken, updateKeycloakUserPatreonEntitlements, tiersToRolesMap } from "./patreon";
+import { getTierNameFromTierId } from "./keycloak";
declare module "next-auth" {
@@ -41,6 +42,9 @@ declare module "next-auth/jwt" {
export const authOptions: NextAuthOptions = {
+ session: {
+ strategy: "jwt"
+ },
providers: [
KeycloakProvider({
clientId: configs.keycloakClientId,
@@ -49,51 +53,122 @@ export const authOptions: NextAuthOptions = {
})
],
callbacks: {
- async jwt({ token, account, profile }) {
-
- // console.log(`jwt() callback. account as follows.`)
- // console.log(account)
- // console.log(`jwt() callback. token as follows.`)
- // console.log(token)
- console.log(`jwt() callback. profile as follows.`)
- console.log(profile)
-
- if (account) {
+
+ async jwt({ token, account, profile }): Promise
{
+ if (account) {
+ // First-time login, save the `access_token`, its expiry and the `refresh_token`
const decodedAccountToken = jwtDecode(account.access_token as any) as KeycloakProfile
- console.log(`jwt() callback. decodedAccountToken as follows.`)
- console.log(decodedAccountToken)
- token.client_roles = decodedAccountToken.realm_access.roles
- token.scope = decodedAccountToken.scope
+ return {
+ ...token,
+ access_token: account.access_token,
+ expires_at: account.expires_at,
+ refresh_token: account.refresh_token,
+ client_roles: decodedAccountToken.realm_access.roles,
+ scope: decodedAccountToken.scope,
+ resource_access: decodedAccountToken.resource_access,
+ profile: profile,
+ }
+ } else if (Date.now() < token.expires_at * 1000) {
+ // Subsequent logins, but the `access_token` is still valid
+ return token
+ } else {
+ // Subsequent logins, but the `access_token` has expired, try to refresh it
+ if (!token.refresh_token) throw new TypeError("Missing refresh_token")
+
+ try {
+ console.log(`>>> we are refreshing the token`)
+ const response = await fetch(`https://keycloak.fp.sbtp.xyz/realms/futureporn/protocol/openid-connect/token`, {
+ method: 'POST',
+ headers: {
+ 'content-type': 'application/x-www-form-urlencoded',
+ },
+ body: new URLSearchParams({
+ grant_type: 'refresh_token',
+ client_id: configs.keycloakClientId,
+ client_secret: configs.keycloakClientSecret,
+ refresh_token: token.refresh_token,
+ }).toString(),
+ })
+
+ const tokensOrError = await response.json()
+
+ if (!response.ok) throw tokensOrError
+
+ const newTokens = tokensOrError as {
+ access_token: string
+ expires_in: number
+ refresh_token?: string
+ }
+
+ token.access_token = newTokens.access_token
+ token.expires_at = Math.floor(
+ Date.now() / 1000 + newTokens.expires_in
+ )
+ // Some providers only issue refresh tokens once, so preserve if we did not get a new one
+ if (newTokens.refresh_token) {
+ token.refresh_token = newTokens.refresh_token
+ }
- token.expires_at = account.expires_at ?? 0;
- token.access_token = account.access_token!;
- token.refresh_token = account.refresh_token!;
- }
- if (profile) {
- token.profile = profile
+
+ return token
+ } catch (error) {
+ console.error("Error refreshing access_token", error)
+ // If we fail to refresh the token, return an error so we can handle it on the page
+ token.error = "RefreshTokenError"
+ return token
+ }
}
-
- return token;
},
+
+
+ // async jwt({ token, account, profile }) {
+
+
+
+ // if (account) {
+ // const decodedAccountToken = jwtDecode(account.access_token as any) as KeycloakProfile
+ // // console.log(`jwt() callback. decodedAccountToken as follows.`)
+ // // console.log(decodedAccountToken)
+ // token.client_roles = decodedAccountToken.realm_access.roles
+ // token.scope = decodedAccountToken.scope
+ // token.resource_access = decodedAccountToken.resource_access;
+
+ // token.expires_at = account.expires_at ?? 0;
+ // token.access_token = account.access_token!;
+ // token.refresh_token = account.refresh_token!;
+ // }
+
+ // if (profile) {
+ // token.profile = profile
+ // }
+
+ // return token;
+ // },
async session({ session, token, trigger }) {
+
// console.log(`Token interceptor to add token info to the session to use on the pages. trigger=${trigger}`)
// console.log(JSON.stringify(token, null, 2))
// console.log('session as follows')
// console.log(JSON.stringify(session, null, 2))
+
+ // get user's patreon tiers and adds them to the appropriate keycloak group
+ const entitledTiers = await updateKeycloakUserPatreonEntitlements(token)
+ // console.log(`entitledTiers=${JSON.stringify(entitledTiers)}`)
+ const entitledTierName = getTierNameFromTierId(entitledTiers[0])
+ const entitledRoles = tiersToRolesMap[entitledTierName]
+ console.log(`entitledRoles=${entitledRoles.join(', ')}`)
+
const userId = token?.sub
if (!userId) throw new Error('failed to get userId from token.sub');
- // side effect which gets user's patreon tiers and adds them to the appropriate keycloak group
- await updateKeycloakUserPatreonEntitlements(token)
// session.account = token.account
session.profile = token.profile
- session.roles = token.client_roles
+ session.roles = entitledRoles // this is a hack to avoid the user having to log in twice to get synced with keycloak roles
session.token = token
-
return session
}
diff --git a/services/next/app/lib/b2File.ts b/services/next/app/lib/b2File.ts
index 68d1eb3..03bcd9b 100644
--- a/services/next/app/lib/b2File.ts
+++ b/services/next/app/lib/b2File.ts
@@ -2,12 +2,10 @@ import { IMeta } from "@futureporn/types";
export interface IB2File {
id: number;
- attributes: {
- url: string;
- key: string;
- uploadId: string;
- cdnUrl: string;
- }
+ url: string;
+ key: string;
+ uploadId: string;
+ cdn_url: string;
}
export interface IB2FileResponse {
data: IB2File;
diff --git a/services/next/app/lib/constants.ts b/services/next/app/lib/constants.ts
index d036fa5..50e3a52 100644
--- a/services/next/app/lib/constants.ts
+++ b/services/next/app/lib/constants.ts
@@ -7,7 +7,6 @@ export const siteUrl = ''+process.env.NEXT_PUBLIC_SITE_URL
export const strapiUrl = ''+process.env.NEXT_PUBLIC_STRAPI_URL
export const postgrestUrl = ''+process.env.NEXT_PUBLIC_POSTGREST_URL
export const postgrestLocalUrl = 'http://postgrest.futureporn.svc.cluster.local:9000'
-export const keycloakLocalUrl = 'http://keycloak.futureporn.svc.cluster.local:8080'
export const patreonCampaignId: string = '8012692'
export const patreonSupporterBenefitId: string = '4760169'
export const patreonQuantumSupporterId: string = '10663202'
diff --git a/services/next/app/lib/keycloak.ts b/services/next/app/lib/keycloak.ts
index bf7646d..bbd6181 100644
--- a/services/next/app/lib/keycloak.ts
+++ b/services/next/app/lib/keycloak.ts
@@ -1,5 +1,4 @@
import { type Tier, type TiersList, tiers } from './patreon'
-import { keycloakLocalUrl } from './constants'
import { configs } from '../config/configs';
export interface UMAToken {
@@ -34,9 +33,15 @@ export const patreonToKeycloakMap: Record = {
};
+export function getTierNameFromTierId(tierId: string): string {
+ const tierName = Object.entries(tiers).find(([_, id]) => id === tierId)?.[0];
+ if (!tierName) throw new Error(`getTierNameFromTierId failed to convert tierId=${tierId} into a tier name.`);
+ return tierName
+}
+
export function getKeycloakIdFromTierId(tierId: string): string | undefined {
// Find the tier name corresponding to the provided tier ID
- const tierName = Object.entries(tiers).find(([_, id]) => id === tierId)?.[0];
+ const tierName = getTierNameFromTierId(tierId)
if (!tierName) {
console.warn(`Tier ID ${tierId} not found in tiers map.`);
@@ -60,7 +65,7 @@ export function getKeycloakIdFromTierId(tierId: string): string | undefined {
* This service account has manage-users role so it can modify their group memebership.
*/
export async function getUMAToken(): Promise {
- const res = await fetch(`${keycloakLocalUrl}/realms/futureporn/protocol/openid-connect/token`, {
+ const res = await fetch(`${configs.keycloakLocalUrl}/realms/futureporn/protocol/openid-connect/token`, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
@@ -83,14 +88,16 @@ export async function getUMAToken(): Promise {
export async function getUserGroups(uma: UMAToken, userId: string): Promise {
- const res = await fetch(`${keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups`, {
+ if (!uma) throw new Error('getUserGroups() requires a UMAToken as second param, but it was undefined.');
+ if (!userId) throw new Error('getUserGroups() requires a userId as second param, but it was undefined.');
+ const res = await fetch(`${configs.keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups`, {
headers: {
'Authorization': `Bearer ${uma.access_token}`
}
})
const data = await res.json() as KeycloakGroup[]
if (!res.ok) {
- throw new Error(`failed to getUserGroups. body=${data}, res.status=${res.status}, res.statusText=${res.statusText}`);
+ throw new Error(`failed to getUserGroups. body=${JSON.stringify(data, null, 2)}, res.status=${res.status}, res.statusText=${res.statusText}`);
}
return data.map((g) => g.id)
}
@@ -98,7 +105,7 @@ export async function getUserGroups(uma: UMAToken, userId: string): Promise {
- const res = await fetch(`${keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups/${groupId}`, {
+ const res = await fetch(`${configs.keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups/${groupId}`, {
method: 'PUT',
headers: {
'Authorization': `Bearer ${uma.access_token}`
@@ -110,30 +117,40 @@ export async function addUserGroup(uma: UMAToken, userId: string, groupId: strin
}
-export async function deleteUserGroup(uma: UMAToken, userId: string, groupId: string): Promise {
- const res = await fetch(`${keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups/${groupId}`, {
+export async function removeUserGroup(uma: UMAToken, userId: string, groupId: string): Promise {
+ const res = await fetch(`${configs.keycloakLocalUrl}/admin/realms/futureporn/users/${userId}/groups/${groupId}`, {
method: 'DELETE',
headers: {
'Authorization': `Bearer ${uma.access_token}`
}
})
if (!res.ok) {
- throw new Error(`failed to deleteUserGroup. res.status=${res.status}, res.statusText=${res.statusText}`);
+ throw new Error(`failed to removeUserGroup. res.status=${res.status}, res.statusText=${res.statusText}`);
}
}
-
-function compareArrays(desired: T[], actual: T[]) {
- const missing = desired.filter(item => !actual.includes(item));
- const extra = actual.filter(item => !desired.includes(item));
-
- return { missing, extra };
+/**
+ * Identifies the changes required to sync the actual state with the desired state.
+ *
+ * @param desired - Array of desired group IDs.
+ * @param actual - Array of actual group IDs.
+ * @returns An object with:
+ * - `toAdd`: Groups in `desired` but not in `actual` (need to be added).
+ * - `toRemove`: Groups in `actual` but not in `desired` (need to be removed).
+ */
+export function calculateSyncChanges(desired: string[], actual: string[]) {
+ const toAdd = Array.from(new Set(desired.filter(item => !actual.includes(item))));
+ const toRemove = Array.from(new Set(actual.filter(item => !desired.includes(item))));
+ return { toAdd, toRemove };
}
-export async function syncronizeKeycloakRoles(keycloakUserId: string, patreonTiersList: TiersList) {
+export async function syncronizeKeycloakRoles(keycloakUserId: string, patreonTiersList: TiersList): Promise {
+
+ if (!keycloakUserId) throw new Error('syncronizeKeycloakRoles() requires userId as first param, but it was undefined.');
+ if (!patreonTiersList) throw new Error('patreonTiersList() requires userId as second param, but it was undefined.');
// 1. [-] get Keycloak service account uma token
// POST https://keycloak.fp.sbtp.xyz/realms/futureporn/protocol/openid-connect/token
@@ -148,46 +165,44 @@ export async function syncronizeKeycloakRoles(keycloakUserId: string, patreonTie
//
- console.log('uma token as follows')
const uma = await getUMAToken()
- console.log(uma)
+ // console.log('uma token as follows')
+ // console.log(uma)
+ // console.log('got uma token')
const desiredKeycloakGroupIds = patreonTiersList
.map((entitledTierId) => getKeycloakIdFromTierId(entitledTierId))
.filter((groupId): groupId is string => groupId !== undefined);
-
+ // console.log(`got desiredKeycloakGroupIds=${desiredKeycloakGroupIds.join(', ')}`)
if (desiredKeycloakGroupIds.length === 0) {
throw new Error(`failed to get keycloak group id from the following patreon tiers: ${patreonTiersList.join(',')}`);
}
- console.log('desiredKeycloakGroupIds as follows')
- console.log(desiredKeycloakGroupIds)
+ // console.log('desiredKeycloakGroupIds as follows')
+ // console.log(desiredKeycloakGroupIds)
const actualKeycloakGroupIds = await getUserGroups(uma, keycloakUserId);
- console.log(`actualKeyclaokGroupIds as follows`)
- console.log(actualKeycloakGroupIds)
+ // console.log(`actualKeyclaokGroupIds as follows`)
+ // console.log(actualKeycloakGroupIds)
+
+
+ const { toAdd, toRemove } = calculateSyncChanges(desiredKeycloakGroupIds, actualKeycloakGroupIds);
- const { missing, extra } = compareArrays(desiredKeycloakGroupIds, actualKeycloakGroupIds)
- console.log(`missing=${missing.join(',')} extra=${extra.join(',')}`)
+ if (toAdd.length > 0) {
+ // console.log(`Groups to add: ${toAdd.join(', ')}`);
+ await Promise.all(toAdd.map(groupId => addUserGroup(uma, keycloakUserId, groupId)));
+ }
-
- if (missing) {
- console.log(`Adding the following keycloak groups ${missing.join(',')}`)
- const addPromises = missing.map((groupId) => addUserGroup(uma, keycloakUserId, groupId))
- await Promise.all(addPromises)
- }
-
-
- if (extra) {
- console.log(`Removing the following keycloak groups ${extra.join(',')}`)
- const removePromises = extra.map((groupId) => deleteUserGroup(uma, keycloakUserId, groupId))
- await Promise.all(removePromises)
+ if (toRemove.length > 0) {
+ // console.log(`Groups to remove: ${toRemove.join(', ')}`);
+ await Promise.all(toRemove.map(groupId => removeUserGroup(uma, keycloakUserId, groupId)));
}
+
console.log('finished updating keycloak groups.')
diff --git a/services/next/app/lib/patreon.ts b/services/next/app/lib/patreon.ts
index 8faf873..2bbbd2c 100644
--- a/services/next/app/lib/patreon.ts
+++ b/services/next/app/lib/patreon.ts
@@ -1,11 +1,10 @@
import { postgrestLocalUrl, patreonVideoAccessBenefitId, giteaUrl } from './constants'
import { type IPatron } from '@futureporn/types'
import { PublicPatron } from '@futureporn/utils/patron.ts';
-import { keycloakLocalUrl, patreonApiIdentityUrl } from "./constants";
import { Session } from 'next-auth';
import { JWT } from 'next-auth/jwt';
import { type UMAToken, getKeycloakIdFromTierId, getUMAToken, syncronizeKeycloakRoles } from './keycloak';
-
+import { patreonApiIdentityUrl } from './constants';
export type TiersList = string[]
@@ -121,7 +120,25 @@ export const tiers = {
}
-export async function updateKeycloakUserPatreonEntitlements(token: JWT) {
+// Maps patreon tiers to keycloak roles
+// @todo this is a dirty hack, this should be removed once we figure out how to sync keycloak roles at login.
+export const tiersToRolesMap: Record = {
+ everyone: ['cdn_2', 'default-roles-futureporn', 'offline_access', 'uma_authorization'],
+ free: ['cdn_2', 'default-roles-futureporn', 'offline_access', 'uma_authorization'],
+ archiveSupporter: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization'],
+ stealthSupporter: ['hacker', 'cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization'],
+ tuneItUp: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization'],
+ maxQ: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader'],
+ archiveCollector: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader'],
+ advancedArchiveSupporter: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader'],
+ quantumSupporter: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader'],
+ sneakyQuantumSupporter: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader'],
+ luberPlusPlus: ['cdn_2', 'cdn_1', 'patron', 'website_shoutout', 'offline_access', 'default-roles-futureporn', 'uma_authorization', 'uploader']
+};
+
+
+
+export async function updateKeycloakUserPatreonEntitlements(token: JWT): Promise {
console.log(`updateKeycloakUserPatreonEntitlements() invoked.`)
@@ -141,11 +158,11 @@ export async function updateKeycloakUserPatreonEntitlements(token: JWT) {
await syncronizeKeycloakRoles(userId, patreonTiersList)
-
+ return patreonTiersList
}
export async function getKeycloakIdpToken(access_token: string): Promise {
- console.log(`getKeycloakIdpToken() using access_token=${access_token}`)
+ // console.log(`getKeycloakIdpToken() using access_token=${access_token}`)
// @todo check the access_token. if it is expired, use the refresh_token to get a new access_token.
diff --git a/services/next/app/lib/streams.ts b/services/next/app/lib/streams.ts
index 9ae60f6..ee93f1e 100644
--- a/services/next/app/lib/streams.ts
+++ b/services/next/app/lib/streams.ts
@@ -14,37 +14,39 @@ const fetchStreamsOptions = {
}
-export async function getStreamByCuid(cuid: string): Promise {
- const query = qs.stringify({
- filters: {
- cuid: {
- $eq: cuid
- }
- },
- pagination: {
- limit: 1
- },
- populate: {
- vtuber: {
- fields: ['slug', 'displayName']
- },
- tweet: {
- fields: ['isChaturbateInvite', 'isFanslyInvite', 'url']
- },
- vods: {
- fields: ['note', 'cuid', 'publishedAt'],
- populate: {
- tagVodRelations: {
- fields: ['id']
- },
- timestamps: '*'
- }
- }
- }
- });
+export async function getStreamByUUID(uuid: string): Promise {
+ // const query = qs.stringify({
+ // filters: {
+ // cuid: {
+ // $eq: cuid
+ // }
+ // },
+ // pagination: {
+ // limit: 1
+ // },
+ // populate: {
+ // vtuber: {
+ // fields: ['slug', 'displayName']
+ // },
+ // tweet: {
+ // fields: ['isChaturbateInvite', 'isFanslyInvite', 'url']
+ // },
+ // vods: {
+ // fields: ['note', 'cuid', 'publishedAt'],
+ // populate: {
+ // tagVodRelations: {
+ // fields: ['id']
+ // },
+ // timestamps: '*'
+ // }
+ // }
+ // }
+ // });
+ const query = `select=*,vods(*),vtuber:vtubers(slug,display_name,id,image,image_blur)&uuid=eq.${uuid}&limit=1`
const res = await fetch(`${postgrestUrl}/streams?${query}`);
const json = await res.json();
- return json.data[0];
+ console.log(json)
+ return json[0];
}
export function getUrl(stream: IStream, slug: string, date: string): string {
@@ -289,6 +291,7 @@ export async function getAllStreamsForVtuber(vtuberId: number, archiveStatuses =
*/
export async function fetchStreamData({ pageIndex, pageSize }: { pageIndex: number, pageSize: number }) {
+ // console.log(`fetchStreamData() invoked`)
const offset = pageIndex * pageSize;
// const query = qs.stringify({
// populate: {
@@ -310,19 +313,19 @@ export async function fetchStreamData({ pageIndex, pageSize }: { pageIndex: numb
// },
// sort: ['date:desc']
// })
- const query = 'select=*,vtuber:vtubers(*)'
+ const query = 'select=*,vtuber:vtubers(id,slug,image,image_blur,theme_color,display_name)'
const response = await fetch(
`${postgrestUrl}/streams?${query}`
);
const data = await response.json();
- console.log(data)
+ // console.log(data)
const filtered = data.filter((datum: any) => !!datum?.vtuber)
const d = {
rows: filtered,
pageCount: Math.ceil(filtered.length / pageSize),
rowCount: filtered,
}
- console.log(`fetchStreamData with pageIndex=${pageIndex}, pageSize=${pageSize}\n\n${JSON.stringify(d, null, 2)}`)
+ // console.log(`fetchStreamData with pageIndex=${pageIndex}, pageSize=${pageSize}\n\n${JSON.stringify(d, null, 2)}`)
return d;
}
diff --git a/services/next/app/lib/vods.ts b/services/next/app/lib/vods.ts
index 925a235..0be5def 100644
--- a/services/next/app/lib/vods.ts
+++ b/services/next/app/lib/vods.ts
@@ -24,6 +24,8 @@ export interface IVodPageProps {
};
}
+
+
export interface IVodsResponse {
data: IVod[];
meta: IMeta;
@@ -286,9 +288,9 @@ export async function getVod(id: number): Promise {
return data;
}
-export async function getVods(page: number = 1, pageSize: number = 25, sortDesc = true): Promise {
+export async function getVods(page: number = 1, pageSize: number = 25, sortDesc = true): Promise<{ vods: IVod[], count: number }> {
// const query = qs.stringify(
- // {
+ // {
// populate: {
// vtuber: {
// fields: ['slug', 'displayName', 'image', 'imageBlur']
@@ -323,25 +325,36 @@ export async function getVods(page: number = 1, pageSize: number = 25, sortDesc
'*',
'vtuber:vtubers(id,slug,image,display_name,image_blur)',
// 'mux_asset:mux_assets(playback_id,asset_id)',
- // 'thumbnail:b2_files(cdn_url)'
+ 'thumbnail:b2_files(cdn_url)'
]
const queryObject = {
select: selects.join(','),
+ limit: pageSize,
+ offset: page*pageSize
};
const query = qs.stringify(queryObject, { encode: false });
const res = await fetch(
`${postgrestLocalUrl}/vods?${query}`,
- fetchVodsOptions
+ Object.assign({}, fetchVodsOptions, { headers: {
+ 'Prefer': 'count=exact'
+ }})
);
+ const data = await res.json()
if (!res.ok) {
- const body = await res.text()
- throw new Error(`Failed to fetch vods status=${res.status}, statusText=${res.statusText}, body=${body}`);
+ throw new Error(`Failed to fetch vods status=${res.status}, statusText=${res.statusText}, data=${data}`);
+ }
+
+ console.log(`${data.length} vods. sample as follows.`)
+ console.log(data[0])
+ // https://postgrest.org/en/latest/references/api/pagination_count.html
+ // HTTP/1.1 206 Partial Content
+ // Content-Range: 0-24/3572000
+ const count = parseInt(res.headers.get('Content-Range')?.split('/').at(-1) || '0')
+ return {
+ vods: data,
+ count: count
}
- const json = await res.json()
- // console.log('vods as follows')
- // console.log(json)
- return json;
}
diff --git a/services/next/app/page.tsx b/services/next/app/page.tsx
index 970d1f1..f1d2031 100644
--- a/services/next/app/page.tsx
+++ b/services/next/app/page.tsx
@@ -14,7 +14,7 @@ import { ErrorCard } from "./components/error-card";
export default async function Page() {
- const vods = await getVods(1, 9, true);
+ const { vods, count } = await getVods(1, 9, true);
const vtubers = await getVtubers();
@@ -38,12 +38,10 @@ export default async function Page() {
Latest VODs
-
+
{!vods &&
Error: Failed to fetch VODs from the database
}
-
-
{vods && vods.map((vod: IVod) => (
))}
+
=> {
+ const response = await fetch(`/api/auth/renew`)
+ const data = await response.json()
+ return data
+}
diff --git a/services/next/app/profile/hooks/patreonCurrentlyEntitledTiers.ts b/services/next/app/profile/hooks/patreonCurrentlyEntitledTiers.ts
new file mode 100644
index 0000000..1440cda
--- /dev/null
+++ b/services/next/app/profile/hooks/patreonCurrentlyEntitledTiers.ts
@@ -0,0 +1,16 @@
+import { TiersList } from "@/app/lib/patreon"
+
+export async function fetchPatreonCurrentlyEntitledTiers (): Promise {
+ const response = await fetch(`/api/patreon/currently-entitled-tiers`, {
+ credentials: 'include'
+ })
+ const data = await response.json()
+
+ if (!response.ok) {
+ throw new Error(`failed to fetchPatreonCurrentlyEntitledTiers() res.status=${response.status}`)
+ }
+
+
+ console.log(data)
+ return data
+}
diff --git a/services/next/app/profile/hooks/updateIsUsernamePublic.ts b/services/next/app/profile/hooks/updateIsUsernamePublic.ts
deleted file mode 100644
index 1053ad7..0000000
--- a/services/next/app/profile/hooks/updateIsUsernamePublic.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export type UpdateMetadataInput = { isUsernamePublic: boolean }
-
-
-export async function updateIsUsernamePublic (data: UpdateMetadataInput): Promise {
- const res = await fetch('/api/user/metadata', {
- method: 'POST',
- body: JSON.stringify({
- isUsernamePublic: data.isUsernamePublic
- })
- })
- const d = await res.json()
- if (!res.ok) throw new Error(`failed to updateIsUsernamePublic. ${res.status} ${res.statusText}`);
- return d
-}
\ No newline at end of file
diff --git a/services/next/app/profile/hooks/updateProfile.ts b/services/next/app/profile/hooks/updateProfile.ts
new file mode 100644
index 0000000..3c6bac4
--- /dev/null
+++ b/services/next/app/profile/hooks/updateProfile.ts
@@ -0,0 +1,21 @@
+import { configs } from "@/app/config/configs";
+
+
+export type UpdateIsUsernamePublicInput = {
+ isUsernamePublic: boolean;
+ access_token: string;
+}
+
+
+export async function updateIsUsernamePublic (data: UpdateIsUsernamePublicInput): Promise {
+ console.log(`upadateIsUernamePublic configs.nextUrl=${configs.nextUrl}`)
+ const res = await fetch(`${configs.nextUrl}/api/profile`, {
+ method: 'POST',
+ body: JSON.stringify({
+ username_visibility: data.isUsernamePublic
+ })
+ })
+ const d = await res.json()
+ if (!res.ok) throw new Error(`failed to updateProfile. ${res.status} ${res.statusText}`);
+ return d
+}
\ No newline at end of file
diff --git a/services/next/app/profile/hooks/useMetadata.ts b/services/next/app/profile/hooks/useMetadata.ts
index 09049a2..62149e9 100644
--- a/services/next/app/profile/hooks/useMetadata.ts
+++ b/services/next/app/profile/hooks/useMetadata.ts
@@ -1,52 +1,52 @@
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
+// import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
-export type MetadataPayload = {
- metadata: {
- first_name: string
- last_name: string
- patreon: {
- entitledTiers: string[],
- lifetimeSupportCents: number,
- currentlyEntitledSupportCents: number
- },
- isUsernamePublic: boolean
- }
-}
-export type UpdateMetadataInput = { isUsernamePublic: boolean }
+// export type MetadataPayload = {
+// metadata: {
+// first_name: string
+// last_name: string
+// patreon: {
+// entitledTiers: string[],
+// lifetimeSupportCents: number,
+// currentlyEntitledSupportCents: number
+// },
+// isUsernamePublic: boolean
+// }
+// }
+// export type UpdateMetadataInput = { isUsernamePublic: boolean }
-const fetchMetadata = async (): Promise => {
- const response = await fetch(`/api/user/metadata`)
- const data = await response.json()
- return data
-}
+// const fetchMetadata = async (): Promise => {
+// const response = await fetch(`/api/user/attributes`)
+// const data = await response.json()
+// return data
+// }
-const fetchMutateMetadata = async (data: UpdateMetadataInput): Promise => {
- const res = await fetch('/api/user/metadata', {
- method: 'POST',
- body: JSON.stringify({
- isUsernamePublic: data.isUsernamePublic
- })
- })
- if (!res.ok) throw new Error(`failed to fetchMutateMetadata. ${res.status} ${res.statusText}`);
-}
+// const fetchMutateMetadata = async (data: UpdateMetadataInput): Promise => {
+// const res = await fetch('/api/user/attributes', {
+// method: 'POST',
+// body: JSON.stringify({
+// isUsernamePublic: data.isUsernamePublic
+// })
+// })
+// if (!res.ok) throw new Error(`failed to fetchMutateMetadata. ${res.status} ${res.statusText}`);
+// }
-const useMetadata = () => {
- return useQuery({
- queryKey: ['user/metadata'],
- queryFn: () => fetchMetadata()
- })
-}
+// const useMetadata = () => {
+// return useQuery({
+// queryKey: ['user/attributes'],
+// queryFn: () => fetchMetadata()
+// })
+// }
-const useMutateMetadata = () => {
- const queryClient = useQueryClient()
+// const useMutateMetadata = () => {
+// const queryClient = useQueryClient()
- return useMutation({
- mutationFn: (data: UpdateMetadataInput) => fetchMutateMetadata(data),
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['user/metadata'] })
- }
- })
-}
+// return useMutation({
+// mutationFn: (data: UpdateMetadataInput) => fetchMutateMetadata(data),
+// onSuccess: () => {
+// queryClient.invalidateQueries({ queryKey: ['user/attributes'] })
+// }
+// })
+// }
-export { useMetadata, fetchMetadata, useMutateMetadata }
+// export { useMetadata, fetchMetadata, useMutateMetadata }
diff --git a/services/next/app/profile/page.tsx b/services/next/app/profile/page.tsx
index 291afc9..0a54f91 100644
--- a/services/next/app/profile/page.tsx
+++ b/services/next/app/profile/page.tsx
@@ -4,12 +4,19 @@ import 'react-loading-skeleton/dist/skeleton.css';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faSpinner, faCheckCircle, faXmarkCircle } from "@fortawesome/free-solid-svg-icons";
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { updateIsUsernamePublic } from "./hooks/updateIsUsernamePublic";
+// import { updateIsUsernamePublic } from "./hooks/updateProfile";
+import { useQuery } from '@tanstack/react-query';
import ProtectedRoute from "../components/protected-route";
import VibrateTest from "../components/vibrate-test";
import { useSession } from "next-auth/react"
import { LoginButton, LogoutButton } from "../components/auth-buttons";
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
+import Link from 'next/link';
+import { useEffect } from 'react';
+import { useState } from 'react';
+import { fetchPatreonCurrentlyEntitledTiers } from './hooks/patreonCurrentlyEntitledTiers';
+import { Spinner } from '../components/spinner';
+import { signIn, signOut } from "next-auth/react";
export default function Page() {
@@ -18,13 +25,29 @@ export default function Page() {
// if (sessionContext.loading) {
// return ()
+ // useEffect(() => {
+ // const fetchData = async () => {
+ // const res = await fetch(`${process.env.KEYCLOAK_URL}/protocol/openid-connect/token`, {
+ // method: 'POST',
+ // headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+ // body: new URLSearchParams({
+ // client_id: process.env.KEYCLOAK_CLIENT_ID,
+ // client_secret: process.env.KEYCLOAK_CLIENT_SECRET,
+ // grant_type: 'refresh_token',
+ // refresh_token: session.refreshToken,
+ // }),
+ // });
+
+ // const data = await res.json();
+
+ // if (res.ok) {
+ // // Update session with new token
+ // session.accessToken = data.access_token;
+ // session.refreshToken = data.refresh_token;
+ // res.status(200).json(session);
+ // } else {
+ // res.status(400).json({ error: 'Token refresh failed' });
+ // }
+ // }
+
+ // fetchData();
+ // }, [isGo]);
return (
@@ -49,16 +100,20 @@ export default function Page() {
{/* {(metadataQuery.isPending) &&
Debug section
- {/* {(metadataQuery.isPending) ?
:
isPending=false } */}
+ {/* {(isPending) ?
:
Patreon entitlements synced. } */}
{/*
metadataQuery as follows
*/}
{/*
{JSON.stringify(metadataQuery.data, null, 2)} */}
session as follows
-
{JSON.stringify(session, null, 2)}
- {(session.status === 'unauthenticated') &&
}
+
{JSON.stringify(data, null, 2)}
+ {(status === 'unauthenticated') &&
}
+
+ {/*
refetch()}>Refetch */}
+
update()}>Update
+
renewJwt()}>RenewJWT
- {(session.data?.user) &&
+ {(data?.user) &&
Profile
@@ -69,11 +124,16 @@ export default function Page() {
{/*
{username}
*/}
-
{session.data?.user?.name}
+
{data?.user?.name}
+ {/* Patronage
+
+
You belong to the {patreonTier} tier. Thank you!
+
Patron Perks
Test Perk (not real)
@@ -85,11 +145,9 @@ export default function Page() {
@@ -117,6 +175,7 @@ export default function Page() {
}
)
+
// if (metadataQuery.isPending) return {JSON.stringify(metadataQuery.data, null, 2)}@todo
@@ -160,10 +219,10 @@ export default function Page() {
//
//
// Display {(!!username) ? username :
- //
//
diff --git a/services/next/middleware.ts b/services/next/middleware.ts
index 01ab6e7..1cc033e 100644
--- a/services/next/middleware.ts
+++ b/services/next/middleware.ts
@@ -24,7 +24,7 @@ import { configs } from "./app/config/configs";
export const tokenRefreshBufferSeconds = 300;
export const isSessionSecure = configs.nextAuthUrl.startsWith("https://");
-export const SESSION_COOKIE = isSessionSecure ? "__Secure-next-auth.session-token" : "next-auth.session-token";
+export const sessionCookieName = isSessionSecure ? "__Secure-next-auth.session-token" : "next-auth.session-token";
// export const sessionTimeout = 60 * 60 * 24 * 30; // 30 days
export const sessionTimeout = 60 * 5
export const signinSubUrl = "/api/auth/signin";
@@ -68,8 +68,7 @@ export async function refreshAccessToken(token: JWT): Promise {
expires_at: newAccessToken?.expires_in + timeInSeconds,
refresh_token: newAccessToken?.refresh_token ?? token?.refresh_token
};
- console.log('newToken as follows')
- console.log(newToken)
+ console.log('refreshAccessToken() succeeded.')
return newToken
} catch (e) {
@@ -88,81 +87,102 @@ export async function refreshAccessToken(token: JWT): Promise {
*/
export function shouldUpdateToken(token: JWT): boolean {
const timeInSeconds = Math.floor(Date.now() / 1000);
- return timeInSeconds >= (token?.expires_at - tokenRefreshBufferSeconds);
+ const timeRemaining = token?.expires_at - timeInSeconds; // Calculate time remaining
+ console.log(`shouldUpdateToken() -- access_token -- ${getTokenExpiryStatus(token.expires_at)}`);
+ return timeRemaining <= tokenRefreshBufferSeconds; // Should refresh if within buffer
}
export function updateCookie(
- sessionToken: string | null,
- request: NextRequest,
- response: NextResponse
+ sessionToken: string | null,
+ request: NextRequest,
+ response: NextResponse
): NextResponse {
- /*
- * BASIC IDEA:
- *
- * 1. Set request cookies for the incoming getServerSession to read new session
- * 2. Updated request cookie can only be passed to server if it's passed down here after setting its updates
- * 3. Set response cookies to send back to browser
- */
+ /*
+ * BASIC IDEA:
+ *
+ * 1. Set request cookies for the incoming getServerSession to read new session
+ * 2. Updated request cookie can only be passed to server if it's passed down here after setting its updates
+ * 3. Set response cookies to send back to browser
+ */
- if (sessionToken) {
- // console.log('Set the session token in the request and response cookies for a valid session')
- // request.cookies.set(SESSION_COOKIE, sessionToken);
- response = NextResponse.next({
- request: {
- headers: request.headers
- }
- });
- response.cookies.set(SESSION_COOKIE, sessionToken, {
- httpOnly: true,
- maxAge: sessionTimeout,
- secure: isSessionSecure,
- sameSite: "lax"
- });
+ if (sessionToken) {
+ // Set the session token in the request and response cookies for a valid session
+ request.cookies.set(sessionCookieName, sessionToken);
+ response = NextResponse.next({
+ request: {
+ headers: request.headers
+ }
+ });
+ response.cookies.set(sessionCookieName, sessionToken, {
+ httpOnly: true,
+ maxAge: sessionTimeout,
+ secure: isSessionSecure,
+ sameSite: "lax"
+ });
+ } else {
+ request.cookies.delete(sessionCookieName);
+ return NextResponse.redirect(new URL(signinSubUrl, request.url));
+ }
+
+ return response;
+}
+
+function getTokenExpiryStatus(expiryDate: number): string {
+ const now = Date.now(); // Current time in milliseconds
+
+ // Convert expiryDate (which is in seconds) to milliseconds
+ const expiryTime = expiryDate * 1000;
+
+ const differenceInSeconds = Math.floor((expiryTime - now) / 1000); // Difference in seconds
+
+ if (differenceInSeconds > 0) {
+ return `Token will expire in ${differenceInSeconds} seconds (${expiryDate})`;
+ } else if (differenceInSeconds < 0) {
+ return `Token expired ${Math.abs(differenceInSeconds)} seconds ago (${expiryDate})`;
} else {
- request.cookies.delete(SESSION_COOKIE);
- return NextResponse.redirect(new URL(signinSubUrl, request.url));
+ return "Token is expiring now"; // Edge case when the token expires exactly at the current time
}
-
- return response;
}
-// @todo this is broken. This sets multiple cookies with the same name.
// @todo this is broken. The updated session token does not get used!
export const middleware: NextMiddleware = async (request: NextRequest) => {
-
+ const path = request.nextUrl.pathname;
const token = await getToken({ req: request });
- // console.log(`middlew.are. token as follows`)
- // console.log(token)
let response = NextResponse.next();
- // return response
+ return response
+
+ console.log(`middleware on path=${path}`)
+ response.cookies.set('cookie-crisp', 'yummy-cereal-yum-yum!');
+
if (!token) {
- return response
+ return response;
}
- // we only want to consider updating the token if the request is not an auth request
- if (request.nextUrl.pathname.startsWith('/api/auth')) {
- return response
+ if (path.startsWith('/api/auth')) {
+ return response;
}
- // we only want to consider updating the token if the request is accessing /api/patreon/* endpoint
- if (!request.nextUrl.pathname.startsWith('/api/patreon')) {
- return response
- }
+
if (shouldUpdateToken(token)) {
console.log(`Attempting to update the token.`)
-
try {
+ console.log(`middleware.ts before refreshAccessToken() we are looking at token -- ${getTokenExpiryStatus(token.expires_at)}`)
+ const newToken = await refreshAccessToken(token)
+ console.log(`middleware.ts after refreshAccessToken() -- ${getTokenExpiryStatus(newToken.expires_at)}`)
+ // console.log(JSON.stringify(newToken))
const newSessionToken = await encode({
secret: configs.nextAuthSecret,
- token: await refreshAccessToken(token),
+ token: newToken,
maxAge: sessionTimeout
});
+ console.log('newSessionToken as follows')
+ console.log(newSessionToken)
response = updateCookie(newSessionToken, request, response);
} catch (error) {
console.log("Error refreshing token: ", error);
@@ -171,6 +191,18 @@ export const middleware: NextMiddleware = async (request: NextRequest) => {
}
console.log(`We succeeded in updating the token.`)
- // console.log(response)
+
+
return response;
-};
\ No newline at end of file
+};
+
+
+export const config = {
+ matcher: [
+ /*
+ * Match all request paths that start with:
+ * - /api/patreon/
+ */
+ '/api/patreon/:path*',
+ ],
+}
\ No newline at end of file