From fc1b16647b351031b4d84814e9b297294f1e87d4 Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Tue, 22 Oct 2024 00:55:49 -0400 Subject: [PATCH] fix: return exact google path for production --- .../Integration/Services/GoogleService.php | 8 ++++--- package.json | 24 +++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/Domains/Integration/Services/GoogleService.php b/app/Domains/Integration/Services/GoogleService.php index e71bd9d0..462e7915 100644 --- a/app/Domains/Integration/Services/GoogleService.php +++ b/app/Domains/Integration/Services/GoogleService.php @@ -2,17 +2,19 @@ namespace App\Domains\Integration\Services; -use App\Domains\Integration\Models\Integration; use Exception; -use Google\Client as GoogleClient; use Google\Service\Gmail; use Google\Service\Oauth2; +use Google\Client as GoogleClient; +use App\Domains\Integration\Models\Integration; class GoogleService { public static function getConfigPath() { - return base_path(config('integrations.google.credentials_path')); + return config('app.env') === 'local' + ? base_path(config('integrations.google.credentials_path')) + : config('integrations.google.credentials_path'); } public static function setTokens($data, $user, $integrationId = null) diff --git a/package.json b/package.json index 658a0a8a..83d9b756 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@iconify-json/fluent": "^1.2.4", "@iconify-json/ic": "^1.2.1", "@iconify-json/ion": "^1.2.1", - "@iconify-json/material-symbols": "^1.2.4", + "@iconify-json/material-symbols": "^1.2.5", "@iconify-json/mdi": "^1.2.1", "@inertiajs/vue3": "^1.2.0", "@mertasan/tailwindcss-variables": "^2.7.0", @@ -57,11 +57,11 @@ "axios": "^1.7.7", "commit-and-tag-version": "^12.5.0", "date-fns": "^4.1.0", - "eslint": "^9.12.0", + "eslint": "^9.13.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-html": "^8.1.2", "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-vue": "^9.29.0", + "eslint-plugin-vue": "^9.29.1", "exact-math": "^2.2.3", "husky": "^9.1.6", "laravel-vite-plugin": "^1.0.5", @@ -69,17 +69,17 @@ "naive-ui": "^2.40.1", "postcss": "^8.4.47", "prettier": "^3.3.3", - "sass": "^1.79.5", - "slug": "^9.1.0", - "tailwindcss": "^3.4.13", + "sass": "^1.80.3", + "slug": "^10.0.0", + "tailwindcss": "^3.4.14", "typescript": "^5.6.3", "unplugin-icons": "^0.19.3", "unplugin-vue-components": "^0.27.4", "uuid": "^10.0.0", - "vite": "^5.4.8", + "vite": "^5.4.9", "vite-plugin-pwa": "^0.20.5", - "vitepress": "^1.4.0", - "vue": "^3.5.11", + "vitepress": "^1.4.1", + "vue": "^3.5.12", "vue-multiselect": "^3.1.0", "vue3-apexcharts": "^1.7.0", "vueuse-temporals": "^1.6.0" @@ -89,15 +89,15 @@ "@originjs/vite-plugin-federation": "^1.3.6", "@vueuse/components": "^11.1.0", "apexcharts": "^3.54.1", - "chart.js": "^4.4.4", - "element-plus": "^2.8.5", + "chart.js": "^4.4.5", + "element-plus": "^2.8.6", "floating-vue": "^5.2.2", "fuse.js": "^7.0.0", "luxon": "^3.5.0", "pinia": "^2.2.4", "randomcolor": "^0.6.2", "vanilla-icon-picker": "^1.3.1", - "vite-plugin-vue-devtools": "^7.4.6", + "vite-plugin-vue-devtools": "^7.5.2", "vue-chartjs": "^5.3.1", "vue-draggable-next": "^2.2.1", "vue-i18n": "^9.14.1",