Beautiful Open-Source Form Builder
104a6 utm tracking in db (#578)
Favour Olayinka5ab3477e0a46
diff --git a/api/app/Http/Controllers/Auth/OAuthController.php b/api/app/Http/Controllers/Auth/OAuthController.phpindex 145b02cbc..43af9762e 100644--- a/api/app/Http/Controllers/Auth/OAuthController.php+++ b/api/app/Http/Controllers/Auth/OAuthController.php@@ -113,11 +113,12 @@ class OAuthController extends Controllerreturn $user;}+ $utmData = request()->utm_data;$user = User::create(['name' => $socialiteUser->getName(),'email' => $email,'email_verified_at' => now(),- 'utm_data' => json_decode(request()->utm_data, true)+ 'utm_data' => is_string($utmData) ? json_decode($utmData, true) : $utmData]);// Create and sync workspacediff --git a/client/pages/oauth/callback.vue b/client/pages/oauth/callback.vueindex 35f826382..d270359d8 100644--- a/client/pages/oauth/callback.vue+++ b/client/pages/oauth/callback.vue@@ -33,6 +33,7 @@import { useNuxtApp } from "nuxt/app";const { $utm } = useNuxtApp();+const router = useRouter()const route = useRoute()const authStore = useAuthStore()@@ -40,6 +41,10 @@ const workspacesStore = useWorkspacesStore()const formsStore = useFormsStore()const logEvent = useAmplitude().logEventconst loading = ref(true)+const form = useForm({+ code: '',+ utm_data: null,+})definePageMeta({alias: '/oauth/:provider/callback'@@ -47,15 +52,10 @@ definePageMeta({function handleCallback() {- const code = route.query.codeconst provider = route.params.provider- opnFetch(`/oauth/${provider}/callback`, {- method: 'POST',- params: {- code,- utm_data: $utm.value- }- }).then(async (data) => {+ form.code = route.query.code+ form.utm_data = $utm.value+ form.post(`/oauth/${provider}/callback`).then(async (data) => {authStore.setToken(data.token)const [userDataResponse, workspacesResponse] = await Promise.all([opnFetch("user"),