diff --git a/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue b/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue
index bd00094..56e3c73 100644
--- a/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue
+++ b/src/components/app/Popouts/Popouts/GDriveLinkMenu.vue
@@ -74,10 +74,6 @@ export default {
         );
         window.onmessage = async e => {
           consentWindow.close();
-          if (!e.data.code) return;
-          const url = new URL(e.data.code);
-          const code = url.searchParams.get("code");
-          await settingsService.GDriveAuth(code);
         };
       }
     },
diff --git a/src/services/settingsService.js b/src/services/settingsService.js
index 6d8017f..4080a41 100644
--- a/src/services/settingsService.js
+++ b/src/services/settingsService.js
@@ -7,8 +7,8 @@ export default {
   GDriveURL ()  {
     return wrapper(instance().get('/settings/drive/url'));
   },
-  GDriveAuth (code) {
-    return wrapper(instance().post('/settings/drive/auth', {code}));
+  GDriveAuth (code, token) {
+    return wrapper(instance().post('/settings/drive/auth', {code, token}));
   },
   setApperance (apperance, boolean) {
     return wrapper(instance().put('/settings/apperance', {
diff --git a/src/views/GDriveCallback.vue b/src/views/GDriveCallback.vue
index ba1607d..0247cf4 100644
--- a/src/views/GDriveCallback.vue
+++ b/src/views/GDriveCallback.vue
@@ -1,14 +1,19 @@
 <template>
-  <div>
-    Redirecting...
-  </div>
+  <div>Redirecting...</div>
 </template>
 
 <script>
+import settingsService from "../services/settingsService.js";
+
 export default {
-    mounted() {
-        window.opener.postMessage({code: location.href}, "*");
-    }
-}
+  async mounted() {
+    const url = new URL(location.href);
+    const token = url.searchParams.get("token");
+    const code = url.searchParams.get("code");
+    await settingsService.GDriveAuth(code, token);
+
+    window.opener.postMessage({ status: 'done' }, "*");
+  }
+};
 </script>