feat: remove redirect_uri from adapter settings

Author: SerVitasik

custom/OAuthCallback.vue

@@ -18,12 +18,13 @@ onMounted(async () => {
   const urlParams = new URLSearchParams(window.location.search);
   const code = urlParams.get('code');
   const state = urlParams.get('state');
-  
-  if (code && state) {
+  const redirectUri = window.location.origin + '/oauth/callback';
+  if (code && state && redirectUri) {
     const encodedCode = encodeURIComponent(code);
     const encodedState = encodeURIComponent(state);
+    const encodedRedirectUri = encodeURIComponent(redirectUri);
     const response = await callAdminForthApi({
-      path: `/oauth/callback?code=${encodedCode}&state=${encodedState}`,
+      path: `/oauth/callback?code=${encodedCode}&state=${encodedState}&redirect_uri=${encodedRedirectUri}`,
       method: 'GET',
     });
     if (response.allowedLogin) {

custom/OAuthLoginButtons.vue

@@ -1,9 +1,9 @@
 <template>
   <div :class="meta.iconOnly ? 'flex flex-row justify-center items-center gap-3' : 'flex flex-col justify-center items-center gap-2'" >
-    <button 
+    <a 
       v-for="provider in meta.providers" 
       :key="provider.provider"
-      @click="handleLogin(provider.authUrl)" 
+      :href="handleLogin(provider.authUrl)" 
       class="border dark:border-gray-400 flex items-center justify-center hover:bg-gray-50 hover:dark:border-gray-300 hover:dark:bg-gray-700"
       :class="[
         meta.iconOnly ? 'w-11 h-11 p-0' : 'w-full py-2 px-4',
@@ -12,7 +12,7 @@
     >
       <div v-html="provider.icon" class="w-6 h-6" :class="meta.iconOnly ? 'mr-0' : 'mr-4'" :alt="getProviderName(provider.provider)" />
       <span v-if="!meta.iconOnly" class="font-medium dark:text-white">Continue with {{ getProviderName(provider.provider) }}</span>
-    </button>
+    </a>
   </div>
 </template>
 
@@ -29,6 +29,9 @@ const getProviderName = (provider) => {
 };
 
 const handleLogin = (authUrl) => {
-  window.location.href = authUrl;
+  const redirectUri = window.location.origin + '/oauth/callback';
+  const url = new URL(authUrl);
+  url.searchParams.set('redirect_uri', redirectUri);
+  return url.toString();
 };
 </script>

index.ts

@@ -155,7 +155,7 @@ export default class OAuthPlugin extends AdminForthPlugin {
       path: '/oauth/callback',
       noAuth: true,
       handler: async ({ query, response, headers, cookies, requestUrl }) => {
-        const { code, state } = query;
+        const { code, state, redirect_uri } = query;
         if (!code) {
           return { error: 'No authorization code provided' };
         }
@@ -173,7 +173,7 @@ export default class OAuthPlugin extends AdminForthPlugin {
             return { error: 'Invalid OAuth provider' };
           }
 
-          const userInfo = await adapter.getTokenFromCode(code);
+          const userInfo = await adapter.getTokenFromCode(code, redirect_uri);
 
           let user = await this.adminforth.resource(this.resource.resourceId).get([
             Filters.EQ(this.options.emailField, userInfo.email)