Skip to content

Fix GitHub user cache consistency and fallback session shape #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Esubaalew wants to merge 1 commit into
base: main
Choose a base branch
from
+172 −85
Open

Fix GitHub user cache consistency and fallback session shape #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions apps/web/src/app/(app)/dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,51 @@ import {
getUserEvents,
getTrendingRepos,
} from "@/lib/github";
import type { IssueItem, SearchResult } from "@/lib/github-types";
import { DashboardContent } from "@/components/dashboard/dashboard-content";
import { all } from "better-all";

export const metadata: Metadata = {
title: "Dashboard",
};

const EMPTY_SEARCH_RESULTS: SearchResult<IssueItem> = {
items: [],
total_count: 0,
};

export default async function DashboardPage() {
const session = await getServerSession();
if (!session) return redirect("/");
const { githubUser } = session;
const hasGitHubLogin = Boolean(githubUser.login);
const { reviewRequests, myOpenPRs, myIssues, repos, notifications, activity, trending } =
await all({
reviewRequests: async () =>
await searchIssues(
`is:pr is:open review-requested:${githubUser.login}`,
10,
),
hasGitHubLogin
? await searchIssues(
`is:pr is:open review-requested:${githubUser.login}`,
10,
)
: EMPTY_SEARCH_RESULTS,
myOpenPRs: async () =>
await searchIssues(`is:pr is:open author:${githubUser.login}`, 10),
hasGitHubLogin
? await searchIssues(
`is:pr is:open author:${githubUser.login}`,
10,
)
: EMPTY_SEARCH_RESULTS,
myIssues: async () =>
await searchIssues(
`is:issue is:open assignee:${githubUser.login}`,
10,
),
hasGitHubLogin
? await searchIssues(
`is:issue is:open assignee:${githubUser.login}`,
10,
)
: EMPTY_SEARCH_RESULTS,
repos: async () => await getUserRepos("updated", 30),
notifications: async () => await getNotifications(20),
activity: async () => await getUserEvents(githubUser.login, 20),
activity: async () =>
hasGitHubLogin ? await getUserEvents(githubUser.login, 20) : [],
trending: async () => await getTrendingRepos(undefined, "weekly", 8),
});

Expand Down
220 changes: 145 additions & 75 deletions apps/web/src/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { betterAuth } from "better-auth";
import { betterAuth, type BetterAuthPlugin } from "better-auth";
import { prismaAdapter } from "better-auth/adapters/prisma";
import { prisma } from "./db";
import { Octokit } from "@octokit/rest";
Expand All @@ -15,16 +15,69 @@ import { getStripeClient, isStripeEnabled } from "./billing/stripe";
import { grantSignupCredits } from "./billing/credit";
import { patSignIn } from "./auth-plugins/pat-signin";

async function getOctokitUser(token: string) {
const cached = await redis.get<ReturnType<(typeof octokit)["users"]["getAuthenticated"]>>(
`github_user:${token}`,
);
type GitHubUserProfile = Awaited<ReturnType<Octokit["users"]["getAuthenticated"]>>["data"];
type AuthSessionValue = NonNullable<Awaited<ReturnType<typeof auth.api.getSession>>>;
type AuthGitHubUser = GitHubUserProfile & { accessToken: string };

function asAuthPlugin(plugin: unknown): BetterAuthPlugin {
return plugin as BetterAuthPlugin;
}

async function getOctokitUser(token: string): Promise<GitHubUserProfile> {
const hash = await createHash("SHA-256", "base64").digest(token);
const cacheKey = `github_user:${hash}`;
const cached = await redis.get<GitHubUserProfile>(cacheKey);
if (cached) return cached;
const octokit = new Octokit({ auth: token });
const githubUser = await octokit.users.getAuthenticated();
const hash = await createHash("SHA-256", "base64").digest(token);
waitUntil(redis.set(`github_user:${hash}`, JSON.stringify(githubUser.data), { ex: 3600 }));
return githubUser;
waitUntil(redis.set(cacheKey, JSON.stringify(githubUser.data), { ex: 3600 }));
return githubUser.data;
}

function buildFallbackGitHubUser(session: AuthSessionValue, accessToken: string): AuthGitHubUser {
return {
id: 0,
login: "",
node_id: "",
avatar_url: session.user.image ?? "",
gravatar_id: "",
url: "",
html_url: "",
followers_url: "",
following_url: "",
gists_url: "",
starred_url: "",
subscriptions_url: "",
organizations_url: "",
repos_url: "",
events_url: "",
received_events_url: "",
type: "User",
site_admin: false,
name: session.user.name ?? "",
company: null,
blog: "",
location: null,
email: session.user.email ?? null,
hireable: null,
bio: null,
twitter_username: null,
notification_email: null,
public_repos: 0,
public_gists: 0,
followers: 0,
following: 0,
created_at: "",
updated_at: "",
private_gists: undefined,
total_private_repos: undefined,
owned_private_repos: undefined,
disk_usage: undefined,
collaborators: undefined,
two_factor_authentication: undefined,
plan: undefined,
accessToken,
};
}

export const auth = betterAuth({
Expand All @@ -46,36 +99,44 @@ export const auth = betterAuth({
patSignIn(),
...(isStripeEnabled
? [
stripe({
stripeClient: getStripeClient(),
stripeWebhookSecret:
process.env.STRIPE_WEBHOOK_SECRET!,
createCustomerOnSignUp: true,
onCustomerCreate: async ({ user }) => {
await grantSignupCredits(user.id);
},
subscription: {
enabled: true,
plans: [
{
name: "base",
priceId: process.env
.STRIPE_BASE_PRICE_ID!,
lineItems: [
{
price: process
.env
.STRIPE_METERED_PRICE_ID!,
},
],
},
],
},
}),
asAuthPlugin(
stripe({
stripeClient: getStripeClient(),
stripeWebhookSecret:
process.env.STRIPE_WEBHOOK_SECRET!,
createCustomerOnSignUp: true,
onCustomerCreate: async ({ user }) => {
await grantSignupCredits(user.id);
},
subscription: {
enabled: true,
plans: [
{
name: "base",
priceId: process.env
.STRIPE_BASE_PRICE_ID!,
lineItems: [
{
price: process
.env
.STRIPE_METERED_PRICE_ID!,
},
],
},
],
},
}),
),
]
: []),
...(process.env.VERCEL
? [oAuthProxy({ productionURL: "https://www.better-hub.com" })]
? [
asAuthPlugin(
oAuthProxy({
productionURL: "https://www.better-hub.com",
}),
),
]
: []),
],
user: {
Expand Down Expand Up @@ -135,51 +196,60 @@ export const auth = betterAuth({
},
});

export const getServerSession = cache(async () => {
try {
const { session, account } = await all({
async session() {
const session = await auth.api.getSession({
headers: await headers(),
});
return session;
},
async account() {
const session = await auth.api.getAccessToken({
headers: await headers(),
body: { providerId: "github" },
});
return session;
},
});
if (!session || !account?.accessToken) {
return null;
}
let githubUserData: Record<string, unknown> | null = null;
export const getServerSession = cache(
async (): Promise<{
user: AuthSessionValue["user"];
session: AuthSessionValue;
githubUser: AuthGitHubUser;
} | null> => {
try {
const githubUser = await getOctokitUser(account.accessToken);
githubUserData = githubUser?.data ?? null;
} catch {
// GitHub API may be rate-limited; don't treat as unauthenticated.
}
if (!githubUserData) {
const { session, account } = await all({
async session() {
const session = await auth.api.getSession({
headers: await headers(),
});
return session;
},
async account() {
const session = await auth.api.getAccessToken({
headers: await headers(),
body: { providerId: "github" },
});
return session;
},
});
if (!session || !account?.accessToken) {
return null;
}
let githubUserData: GitHubUserProfile | null = null;
try {
const githubUser = await getOctokitUser(account.accessToken);
githubUserData = githubUser ?? null;
} catch {
// GitHub API may be rate-limited; don't treat as unauthenticated.
}
if (!githubUserData) {
return {
user: session.user,
session,
githubUser: buildFallbackGitHubUser(
session,
account.accessToken,
),
};
}
return {
user: session.user,
session,
githubUser: { accessToken: account.accessToken } as any,
githubUser: {
...githubUserData,
accessToken: account.accessToken,
} satisfies AuthGitHubUser,
};
} catch {
return null;
}
return {
user: session.user,
session,
githubUser: {
...githubUserData,
accessToken: account.accessToken,
},
};
} catch {
return null;
}
});
},
);

export type $Session = NonNullable<Awaited<ReturnType<typeof getServerSession>>>;
Loading