fix: feide route

src/app/api/auth/feide/route.ts

@@ -11,33 +11,27 @@ export async function GET(request: NextRequest) {
   const cookieStore = await cookies();
   const storedState = cookieStore.get('feide-state')?.value;
   const codeVerifier = cookieStore.get('feide-code-verifier')?.value;
-  console.log('step 1');
-  console.log(code, state, storedState, codeVerifier);
 
   if (!code || !state || !storedState || !codeVerifier) {
     return NextResponse.json(null, { status: 400 });
   }
 
-  console.log('step 2');
   if (state !== storedState) {
     return NextResponse.json(null, { status: 403 });
   }
 
-  console.log('step 3');
   const tokens = await validateFeideAuthorization(code, codeVerifier);
   if (!tokens) {
     return NextResponse.json(null, { status: 500 });
   }
-  console.log('step 4');
   const userInfoResponse = await fetch(env.FEIDE_USERINFO_ENDPOINT, {
     headers: {
       Authorization: `Bearer ${tokens.accessToken}`,
     },
   });
-  console.log('step 5');
   const userInfo = await userInfoResponse.json();
   console.log(userInfo);
-  return new Response(null, {
-    status: 500,
-  });
+
+  cookieStore.delete('feide-state');
+  cookieStore.delete('feide-code-verifier');
 }

src/components/auth/FeideButton.tsx

@@ -1,6 +1,7 @@
 'use client';
 import { FeideLogo } from '@/components/assets/logos/FeideLogo';
 import { Button } from '@/components/ui/Button';
+import { Spinner } from '@/components/ui/Spinner';
 import { api } from '@/lib/api/client';
 import { useRouter } from 'next/navigation';
 
@@ -17,7 +18,7 @@ function FeideButton() {
       className='w-full bg-[#3FACC2]/90 hover:bg-[#3FACC2] dark:bg-[#222832] hover:dark:bg-[#222832]/40'
       onClick={() => signInMutation.mutate()}
     >
-      <FeideLogo title='Feide' />
+      {signInMutation.isPending ? <Spinner /> : <FeideLogo title='Feide' />}
     </Button>
   );
 }

src/server/api/routers/auth.ts

@@ -38,8 +38,6 @@ const authRouter = createRouter({
       secure: env.NODE_ENV === 'production',
     });
 
-    console.log(cookieStore.getAll());
-
     return url.href;
   }),
 });

src/server/auth/feide.ts

@@ -20,7 +20,16 @@ async function createFeideAuthorization() {
   const codeVerifier = generateCodeVerifier();
   const url = await feideOAuthClient.createAuthorizationURL({
     state,
-    scopes: ['openid', 'profile', 'email'],
+    scopes: [
+      'openid',
+      'profile',
+      'userinfo-name',
+      'userid-feide',
+      'email',
+      'userinfo-mobile',
+      'userinfo-photo',
+      'userinfo-birthdate',
+    ],
     codeVerifier,
   });
   return {