File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 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" ,
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ import ErrorMessage from "@/components/error-message";
22import { Button } from "@/components/ui/button" ;
33import { Input } from "@/components/ui/input" ;
44import { Label } from "@/components/ui/label" ;
5- import { fiefAuth } from "@/helpers/fief" ;
65import { User } from "@/types/user" ;
76
87async 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 }
Original file line number Diff line number Diff line change 11"use client" ;
2-
3- import { FiefAuthProvider } from "@fief/fief/nextjs/react" ;
42import { IBM_Plex_Mono } from "next/font/google" ;
53import "./globals.css" ;
64import { 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 >
Original file line number Diff line number Diff 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 ) ;
Original file line number Diff line number Diff line change 11"use server" ;
22
33import { cookies } from "next/headers" ;
4- import { SESSION_COOKIE_NAME } from "./fief " ;
4+ import { SESSION_COOKIE_NAME } from "./auth " ;
55
66const API_BASE = process . env . NEXT_PUBLIC_API_URL ;
77
Original file line number Diff line number Diff line change 1+ export const SESSION_COOKIE_NAME = "user_session" ;
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11import 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-
133export 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}
You can’t perform that action at this time.
0 commit comments