Skip to content

Remove fief lib from frontend #1018

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

Draft
prmths128 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove fief lib from frontend #1018

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
48 changes: 0 additions & 48 deletions webapp/package-lock.json
View file
Open in desktop

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

1 change: 0 additions & 1 deletion webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"lint": "next lint"
},
"dependencies": {
"@fief/fief": "^0.15.0",
"@radix-ui/react-dialog": "^1.1.14",
"@radix-ui/react-dropdown-menu": "^2.1.15",
"@radix-ui/react-label": "^2.1.7",
Expand Down
10 changes: 0 additions & 10 deletions webapp/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"use client";

import { FiefAuthProvider } from "@fief/fief/nextjs/react";
import { IBM_Plex_Mono } from "next/font/google";
import "./globals.css";
import { SWRProvider } from "../helpers/swr";
Expand All @@ -19,13 +17,6 @@ export default function RootLayout({
{/* suppressHydrationWarning is a Next theme recommendation */}
<body className={font.className}>
<SWRProvider>
<FiefAuthProvider
currentUserPath={`${process.env.NEXT_PUBLIC_API_URL}/auth/check`}
state={{
userinfo: null,
accessTokenInfo: null,
}}
>
<ThemeProvider
attribute="class"
defaultTheme="dark"
Expand All @@ -35,7 +26,6 @@ export default function RootLayout({
{children}
<Toaster />
</ThemeProvider>
</FiefAuthProvider>
</SWRProvider>
</body>
</html>
Expand Down
2 changes: 2 additions & 0 deletions webapp/src/components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ export default function NavBar({
onClose={() => setNewOrgModalOpen(false)}
onOrganizationCreated={refreshOrgList}
/>
{ USER_PROFILE_URL &&
<NavItem
isSelected={selected === "profile"}
onClick={() => {
Expand All @@ -263,6 +264,7 @@ export default function NavBar({
>
Profile
</NavItem>
}
<NavItem
onClick={() => {
setSheetOpened?.(false);
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/helpers/api-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use server";

import { cookies } from "next/headers";
import { SESSION_COOKIE_NAME } from "./fief";
import { SESSION_COOKIE_NAME } from "./auth";

const API_BASE = process.env.NEXT_PUBLIC_API_URL;

Expand Down
1 change: 1 addition & 0 deletions webapp/src/helpers/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const SESSION_COOKIE_NAME = "user_session";
48 changes: 0 additions & 48 deletions webapp/src/helpers/fief.ts
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions webapp/src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
import type { NextRequest } from "next/server";

import { fiefAuth } from "./helpers/fief";

const authMiddleware = fiefAuth.middleware([
{
matcher:
"/((?!api|_next/static|_next/image|favicon.ico|icons/|public/).*)",
parameters: {},
},
]);

export async function middleware(request: NextRequest) {
const pathname = request.nextUrl.pathname;

Expand All @@ -22,5 +12,5 @@ export async function middleware(request: NextRequest) {
return;
}

return authMiddleware(request);
// return authMiddleware(request);
}
Loading