From 81f227c5e730274d657776d1c8e0622d5f28d5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Sat, 5 Mar 2022 16:55:02 +0100
Subject: [PATCH] added callback url to the socialite settings

---
 resources/css/tailwind.css                    |  4 +++
 .../Others/Tables/DatatableWrapper.vue        |  6 ----
 .../AppSettings/AppSettingsTabs/SignInUp.vue  | 29 +++++++++++++++++++
 .../SocialiteCallbackController.php           |  4 +--
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/resources/css/tailwind.css b/resources/css/tailwind.css
index bceb341a..fb4462a8 100644
--- a/resources/css/tailwind.css
+++ b/resources/css/tailwind.css
@@ -28,4 +28,8 @@
 
 .grid-view-sidebar {
     @apply grid grid-cols-3 content-start md:grid-cols-2 lg:grid-cols-3 lg:gap-2 xl:grid-cols-4 xl:gap-4 2xl:grid-cols-5;
+}
+
+.page-link {
+    @apply block flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-sm font-bold transition duration-200 hover:bg-light-background;
 }
\ No newline at end of file
diff --git a/resources/js/components/Others/Tables/DatatableWrapper.vue b/resources/js/components/Others/Tables/DatatableWrapper.vue
index 12af8040..ee552629 100644
--- a/resources/js/components/Others/Tables/DatatableWrapper.vue
+++ b/resources/js/components/Others/Tables/DatatableWrapper.vue
@@ -295,9 +295,3 @@ export default {
     },
 }
 </script>
-
-<style lang="scss" scoped>
-.page-link {
-    @apply block flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-sm font-bold transition duration-200 hover:bg-light-background;
-}
-</style>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
index 07d6a511..b04286cd 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
@@ -49,6 +49,14 @@
                 />
             </AppInputSwitch>
 
+            <AppInputText
+				v-if="facebook.allowedService"
+                :title="$t('Your Callback URL')"
+                :description="$t('Please copy your url and paste it to the service callback URL.')"
+            >
+                <CopyInput size="small" :str="getCallbackEndpoint('facebook')" />
+            </AppInputText>
+
             <div
                 v-if="config.isFacebookLoginConfigured && facebook.allowedService"
                 @click="facebook.isVisibleCredentialsForm = !facebook.isVisibleCredentialsForm"
@@ -127,6 +135,14 @@
                 />
             </AppInputSwitch>
 
+			<AppInputText
+				v-if="google.allowedService"
+				:title="$t('Your Callback URL')"
+				:description="$t('Please copy your url and paste it to the service callback URL.')"
+			>
+                <CopyInput size="small" :str="getCallbackEndpoint('google')" />
+            </AppInputText>
+
             <div
                 v-if="config.isGoogleLoginConfigured && google.allowedService"
                 @click="google.isVisibleCredentialsForm = !google.isVisibleCredentialsForm"
@@ -203,6 +219,14 @@
                 />
             </AppInputSwitch>
 
+			<AppInputText
+				v-if="github.allowedService"
+				:title="$t('Your Callback URL')"
+				:description="$t('Please copy your url and paste it to the service callback URL.')"
+			>
+                <CopyInput size="small" :str="getCallbackEndpoint('github')" />
+            </AppInputText>
+
             <div
                 v-if="config.isGithubLoginConfigured && github.allowedService"
                 @click="github.isVisibleCredentialsForm = !github.isVisibleCredentialsForm"
@@ -269,6 +293,7 @@ import { Edit2Icon } from 'vue-feather-icons'
 import { ValidationProvider, ValidationObserver } from 'vee-validate/dist/vee-validate.full'
 import SwitchInput from '../../../../components/Others/Forms/SwitchInput'
 import AppInputSwitch from '../../../../components/Admin/AppInputSwitch'
+import CopyInput from '../../../../components/Others/Forms/CopyInput'
 import FormLabel from '../../../../components/Others/Forms/FormLabel'
 import ButtonBase from '../../../../components/FilesView/ButtonBase'
 import AppInputText from '../../../../components/Admin/AppInputText'
@@ -281,6 +306,7 @@ import axios from 'axios'
 export default {
     name: 'SignInUp',
     components: {
+        CopyInput,
         ValidationObserver,
         ValidationProvider,
         AppInputSwitch,
@@ -330,6 +356,9 @@ export default {
         }
     },
     methods: {
+        getCallbackEndpoint(service) {
+            return `${this.config.host}/socialite/${service}/callback`
+        },
         async storeCredentials(service) {
             // Validate fields
             const isValid = await this.$refs.credentialsForm.validate()
diff --git a/src/App/Socialite/Controllers/SocialiteCallbackController.php b/src/App/Socialite/Controllers/SocialiteCallbackController.php
index 1f6582fb..6dc0598b 100644
--- a/src/App/Socialite/Controllers/SocialiteCallbackController.php
+++ b/src/App/Socialite/Controllers/SocialiteCallbackController.php
@@ -56,10 +56,10 @@ class SocialiteCallbackController extends Controller
         ]);
 
         // Create User
-        $user = ($this->createNewUser)($data);
+        $newUser = ($this->createNewUser)($data);
 
         // Login user
-        $this->guard->login($user->first());
+        $this->guard->login($newUser);
 
         return redirect()->to('/platform/files');
     }