Mike/freno-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust email/pass addition flow, blog ttl extended

Browse Source
This commit is contained in:
Michael Freno
2026-01-07 21:21:27 -05:00
parent ca28237d13
commit 8f241ce611
6 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/perf-test.ts
View File

@@ -64,7 +64,6 @@ const WARMUP_RUNS = 1;
// Pages to test
const TEST_PAGES: PageTestConfig[] = [
{ name: "Home", path: "/" },
{ name: "About", path: "/about" },
{ name: "Blog Index", path: "/blog" },
{ name: "Blog Post (basic)", path: "/blog/I_made_a_macOS_app_in_a_day" },
{

2
src/config.ts
View File

@@ -147,7 +147,7 @@ export const COOLDOWN_TIMERS = {
export const CACHE_CONFIG = {
BLOG_CACHE_TTL_MS: 24 * 60 * 60 * 1000,
GIT_ACTIVITY_CACHE_TTL_MS: 10 * 60 * 1000,
BLOG_POSTS_LIST_CACHE_TTL_MS: 5 * 60 * 1000,
BLOG_POSTS_LIST_CACHE_TTL_MS: 15 * 60 * 1000,
MAX_STALE_DATA_MS: 7 * 24 * 60 * 60 * 1000,
GIT_ACTIVITY_MAX_STALE_MS: 24 * 60 * 60 * 1000
} as const;

2
src/db/create.ts
View File

@@ -155,6 +155,8 @@ export const model: { [key: string]: string } = {
post_id INTEGER NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_tag_post_id ON Tag (post_id);
CREATE INDEX IF NOT EXISTS idx_tag_value ON Tag (value);
CREATE INDEX IF NOT EXISTS idx_tag_post_value ON Tag (post_id, value);
`,
PostHistory: `
CREATE TABLE PostHistory

84
src/routes/account.tsx
View File

@@ -16,6 +16,7 @@ import PasswordInput from "~/components/ui/PasswordInput";
import Button from "~/components/ui/Button";
import FormFeedback from "~/components/ui/FormFeedback";
import type { UserProfile } from "~/types/user";
import { useAuth } from "~/context/auth";
const getUserProfile = query(async (): Promise<UserProfile | null> => {
"use server";
@@ -27,13 +28,11 @@ const getUserProfile = query(async (): Promise<UserProfile | null> => {
throw redirect("/login");
}
const userId = userState.userId;
const conn = ConnectionFactory();
try {
const res = await conn.execute({
sql: "SELECT * FROM User WHERE id = ?",
args: [userId]
sql: "SELECT provider, image, password_hash FROM User WHERE id = ?",
args: [userState.userId]
});
if (res.rows.length === 0) {
@@ -43,10 +42,10 @@ const getUserProfile = query(async (): Promise<UserProfile | null> => {
const user = res.rows[0] as any;
return {
id: user.id,
email: user.email ?? undefined,
emailVerified: user.email_verified === 1,
displayName: user.display_name ?? undefined,
id: userState.userId,
email: userState.email ?? undefined,
emailVerified: userState.emailVerified,
displayName: userState.displayName ?? undefined,
provider: user.provider ?? undefined,
image: user.image ?? undefined,
hasPassword: !!user.password_hash
@@ -63,6 +62,7 @@ export const route = {
export default function AccountPage() {
const navigate = useNavigate();
const { refreshAuth } = useAuth();
const userData = createAsync(() => getUserProfile(), { deferStream: true });
@@ -451,6 +451,7 @@ export default function AccountPage() {
setSignOutLoading(true);
try {
await api.auth.signOut.mutate();
refreshAuth();
navigate("/");
} catch (error) {
console.error("Sign out failed:", error);
@@ -555,7 +556,11 @@ export default function AccountPage() {
}
>
<div class="bg-blue mt-3 rounded px-3 py-2 text-center text-base text-sm">
💡 Add a password to enable email/password login
{!userProfile().email
? "💡 Add and verify an email to enable email/password login"
: !userProfile().emailVerified
? "💡 Verify your email to enable password setup"
: "💡 Add a password to enable email/password login"}
</div>
</Show>
</div>
@@ -769,6 +774,42 @@ export default function AccountPage() {
</div>
</noscript>
<Show when={!userProfile().hasPassword}>
<Show
when={
userProfile().provider !== "email" &&
(!userProfile().email || !userProfile().emailVerified)
}
>
<div class="bg-yellow mb-4 rounded px-4 py-3 text-center text-base text-sm">
<div class="mb-1 font-semibold">
⚠️ Email Verification Required
</div>
<div>
{!userProfile().email
? "Please add and verify an email address before setting a password."
: "Please verify your email address before setting a password."}
</div>
<Show
when={
userProfile().email &&
!userProfile().emailVerified
}
>
<button
onClick={sendEmailVerification}
class="mt-2 font-semibold text-blue-700 underline transition-all hover:brightness-125"
>
Resend Verification Email
</button>
</Show>
</div>
</Show>
<Show
when={
userProfile().provider === "email" ||
(userProfile().email && userProfile().emailVerified)
}
>
<div class="text-subtext0 mb-4 text-center text-sm">
{userProfile().provider === "email"
? "Set a password to enable password login"
@@ -777,6 +818,7 @@ export default function AccountPage() {
" login"}
</div>
</Show>
</Show>
<Show when={userProfile().hasPassword}>
<PasswordInput
@@ -795,7 +837,13 @@ export default function AccountPage() {
minlength="8"
onInput={handleNewPasswordChange}
onBlur={handlePasswordBlur}
disabled={passwordChangeLoading()}
disabled={
passwordChangeLoading() ||
(!userProfile().hasPassword &&
userProfile().provider !== "email" &&
(!userProfile().email ||
!userProfile().emailVerified))
}
title="Password must be at least 8 characters"
label="New Password"
showStrength
@@ -806,7 +854,13 @@ export default function AccountPage() {
required
minlength="8"
onInput={handlePasswordConfChange}
disabled={passwordChangeLoading()}
disabled={
passwordChangeLoading() ||
(!userProfile().hasPassword &&
userProfile().provider !== "email" &&
(!userProfile().email ||
!userProfile().emailVerified))
}
title="Password must be at least 8 characters"
label="New Password Conf."
/>
@@ -828,7 +882,13 @@ export default function AccountPage() {
<Button
type="submit"
disabled={!passwordsMatch()}
disabled={
!passwordsMatch() ||
(!userProfile().hasPassword &&
userProfile().provider !== "email" &&
(!userProfile().email ||
!userProfile().emailVerified))
}
loading={passwordChangeLoading()}
class="my-6"
>

4
src/routes/blog/index.tsx
View File

@@ -13,11 +13,11 @@ const getPosts = query(async () => {
"use server";
const { getUserState } = await import("~/lib/auth-query");
const { ConnectionFactory } = await import("~/server/utils");
const { withCache } = await import("~/server/cache");
const { withCacheAndStale } = await import("~/server/cache");
const userState = await getUserState();
const privilegeLevel = userState.privilegeLevel;
return withCache(
return withCacheAndStale(
`posts-${privilegeLevel}`,
CACHE_CONFIG.BLOG_POSTS_LIST_CACHE_TTL_MS,
async () => {

8
src/server/api/routers/user.ts
View File

@@ -244,6 +244,14 @@ export const userRouter = createTRPCRouter({
});
}
// For OAuth accounts, require verified email before setting password
if (user.provider !== "email" && (!user.email || !user.email_verified)) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Email verification required before setting password"
});
}
const passwordHash = await hashPassword(newPassword);
await conn.execute({
sql: "UPDATE User SET password_hash = ? WHERE id = ?",