Skip to content

Commit ecb0484

Browse files
committed
Remove fief lib from frontend
1 parent faf89df commit ecb0484

9 files changed

Lines changed: 26 additions & 142 deletions

File tree

webapp/package-lock.json

Lines changed: 0 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webapp/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"lint": "next lint"
1111
},
1212
"dependencies": {
13-
"@fief/fief": "^0.15.0",
1413
"@radix-ui/react-dialog": "^1.1.14",
1514
"@radix-ui/react-dropdown-menu": "^2.1.15",
1615
"@radix-ui/react-label": "^2.1.7",

webapp/src/app/(dashboard)/profile/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import ErrorMessage from "@/components/error-message";
22
import { Button } from "@/components/ui/button";
33
import { Input } from "@/components/ui/input";
44
import { Label } from "@/components/ui/label";
5-
import { fiefAuth } from "@/helpers/fief";
65
import { User } from "@/types/user";
76

87
async function getUser(): Promise<User | null> {
9-
const userId = await fiefAuth.getUserId();
8+
// TODO: implement without fief
9+
const userId = null;
1010
if (!userId) {
1111
return null;
1212
}

webapp/src/app/layout.tsx

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
"use client";
2-
3-
import { FiefAuthProvider } from "@fief/fief/nextjs/react";
42
import { IBM_Plex_Mono } from "next/font/google";
53
import "./globals.css";
64
import { SWRProvider } from "../helpers/swr";
@@ -19,23 +17,15 @@ export default function RootLayout({
1917
{/* suppressHydrationWarning is a Next theme recommendation */}
2018
<body className={font.className}>
2119
<SWRProvider>
22-
<FiefAuthProvider
23-
currentUserPath={`${process.env.NEXT_PUBLIC_API_URL}/auth/check`}
24-
state={{
25-
userinfo: null,
26-
accessTokenInfo: null,
27-
}}
20+
<ThemeProvider
21+
attribute="class"
22+
defaultTheme="dark"
23+
forcedTheme="dark"
24+
disableTransitionOnChange
2825
>
29-
<ThemeProvider
30-
attribute="class"
31-
defaultTheme="dark"
32-
forcedTheme="dark"
33-
disableTransitionOnChange
34-
>
35-
{children}
36-
<Toaster />
37-
</ThemeProvider>
38-
</FiefAuthProvider>
26+
{children}
27+
<Toaster />
28+
</ThemeProvider>
3929
</SWRProvider>
4030
</body>
4131
</html>

webapp/src/components/navbar.tsx

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,20 @@ export default function NavBar({
251251
onClose={() => setNewOrgModalOpen(false)}
252252
onOrganizationCreated={refreshOrgList}
253253
/>
254-
<NavItem
255-
isSelected={selected === "profile"}
256-
onClick={() => {
257-
setSelected("profile");
258-
setSheetOpened?.(false);
259-
window.location.href = USER_PROFILE_URL!; // Redirect to Fief profile to handle profile updates there
260-
}}
261-
paddingY={1.5}
262-
icon={<UserIcon className={iconStyles} />}
263-
>
264-
Profile
265-
</NavItem>
254+
{USER_PROFILE_URL && (
255+
<NavItem
256+
isSelected={selected === "profile"}
257+
onClick={() => {
258+
setSelected("profile");
259+
setSheetOpened?.(false);
260+
window.location.href = USER_PROFILE_URL!; // Redirect to Fief profile to handle profile updates there
261+
}}
262+
paddingY={1.5}
263+
icon={<UserIcon className={iconStyles} />}
264+
>
265+
Profile
266+
</NavItem>
267+
)}
266268
<NavItem
267269
onClick={() => {
268270
setSheetOpened?.(false);

webapp/src/helpers/api-server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use server";
22

33
import { cookies } from "next/headers";
4-
import { SESSION_COOKIE_NAME } from "./fief";
4+
import { SESSION_COOKIE_NAME } from "./auth";
55

66
const API_BASE = process.env.NEXT_PUBLIC_API_URL;
77

webapp/src/helpers/auth.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const SESSION_COOKIE_NAME = "user_session";

webapp/src/helpers/fief.ts

Lines changed: 0 additions & 48 deletions
This file was deleted.

webapp/src/middleware.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
import type { NextRequest } from "next/server";
22

3-
import { fiefAuth } from "./helpers/fief";
4-
5-
const authMiddleware = fiefAuth.middleware([
6-
{
7-
matcher:
8-
"/((?!api|_next/static|_next/image|favicon.ico|icons/|public/).*)",
9-
parameters: {},
10-
},
11-
]);
12-
133
export async function middleware(request: NextRequest) {
144
const pathname = request.nextUrl.pathname;
155

@@ -21,6 +11,4 @@ export async function middleware(request: NextRequest) {
2111
) {
2212
return;
2313
}
24-
25-
return authMiddleware(request);
2614
}

0 commit comments

Comments
 (0)