Skip to content

improve auth stability, support ssr auth, login redirects #524

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

Merged
merged 2 commits into from
Nov 3, 2025
Merged

improve auth stability, support ssr auth, login redirects #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
729d317
improve auth stability, support ssr auth, login redirects
erquhart Oct 30, 2025
4d88d73
drop expectAuth, causing issues
erquhart Oct 31, 2025
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
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@codemirror/lang-javascript": "^6.2.3",
"@codemirror/lang-json": "^6.0.1",
"@convex-dev/auth": "^0.0.88",
"@convex-dev/better-auth": "0.9",
"@convex-dev/better-auth": "0.9.7-alpha.0",
"@convex-dev/react-query": "0.0.0-alpha.11",
"@daytonaio/sdk": "^0.25.6",
"@erquhart/convex-oss-stats": "^0.8.1",
Expand All @@ -49,12 +49,12 @@
"@radix-ui/react-select": "^2.2.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-tooltip": "^1.1.5",
"@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-tabs": "^1.1.13",
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-toggle-group": "^1.1.11",
"@radix-ui/react-tooltip": "^1.1.5",
"@remix-run/node": "^2.8.1",
"@sentry/react": "^8.35.0",
"@sentry/vite-plugin": "^2.22.6",
Expand Down Expand Up @@ -89,8 +89,7 @@
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"convex": "^1.25.4",
"convex-oss-stats": "link:../../../erquhart/convex-oss-stats",
Copy link
Contributor

@jherr jherr Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is going to work.

Copy link
Contributor Author

@erquhart erquhart Oct 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This updates the convex package and removes a non-existent file based package, was left in accidentally from a while ago. The actual package is @erquhart/convex-oss-stats, that dependency is still in place.

"convex": "^1.28.0",
"cors": "^2.8.5",
"d3": "^7.9.0",
"date-fns": "^2.30.0",
Expand Down
85 changes: 41 additions & 44 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 34 additions & 39 deletions src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@ import {
} from 'react-icons/fa'
import { ThemeToggle } from './ThemeToggle'
import { SearchButton } from './SearchButton'
import { Authenticated, Unauthenticated, useQuery } from 'convex/react'
import { AuthLoading } from 'convex/react'
import { Authenticated, useQuery } from 'convex/react'
import { api } from 'convex/_generated/api'
import { MdLibraryBooks, MdLineAxis, MdPerson, MdSupport } from 'react-icons/md'
import { CgClose, CgMenuLeft, CgMusicSpeaker } from 'react-icons/cg'
import { BiSolidCheckShield } from 'react-icons/bi'
import { PiHammerFill, PiSparkleFill } from 'react-icons/pi'
import { libraries } from '~/libraries'
import { sortBy } from '~/utils/utils'
import { convexQuery } from '@convex-dev/react-query'
import { useSuspenseQuery } from '@tanstack/react-query'

export function Navbar({ children }: { children: React.ReactNode }) {
const user = useQuery(api.auth.getCurrentUser)
const { data: user } = useSuspenseQuery(
convexQuery(api.auth.getCurrentUser, {})
)
const matches = useMatches()

const Title =
Expand Down Expand Up @@ -65,48 +68,40 @@ export function Navbar({ children }: { children: React.ReactNode }) {

const loginButton = (
<>
{(() => {
const loginEl = (
<Link
to="/login"
className="flex items-center gap-1 bg-gray-500/20 rounded-lg p-2 opacity-80
{!user && (
<Link
to="/login"
className="flex items-center gap-1 bg-gray-500/20 rounded-lg p-2 opacity-80
hover:opacity-100 whitespace-nowrap uppercase font-black text-xs"
>
<MdPerson className="scale-125" />
<div className="">Log In</div>
</Link>
)

return (
<>
<AuthLoading>{loginEl}</AuthLoading>
<Unauthenticated>{loginEl}</Unauthenticated>
</>
)
})()}

<Authenticated>
<div className="flex items-center gap-2 px-2 py-1 rounded-lg">
<FaUser />
<Link
to="/account"
className="flex-1 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white whitespace-nowrap"
>
My Account
</Link>
</div>
{canAdmin ? (
>
<MdPerson className="scale-125" />
<div className="">Log In</div>
</Link>
)}
{user && (
<>
<div className="flex items-center gap-2 px-2 py-1 rounded-lg">
<FaLock />
<FaUser />
<Link
to="/admin"
className="flex-1 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white"
to="/account"
className="flex-1 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white whitespace-nowrap"
>
Admin
My Account
</Link>
</div>
) : null}
</Authenticated>
{canAdmin && (
<div className="flex items-center gap-2 px-2 py-1 rounded-lg">
<FaLock />
<Link
to="/admin"
className="flex-1 text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-white"
>
Admin
</Link>
</div>
)}
</>
)}
</>
)

Expand Down
Loading
Loading