Merge pull request #270 from imdhemy/step-setting-google-app-creds-twice

[1.x] Stop setting Credentials path twice
imdhemy · Jan 28, 2023 · e41a470 · e41a470
2 parents d008441 + 6420e6d
commit e41a470
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ServiceProviders/LiapServiceProvider.php b/src/ServiceProviders/LiapServiceProvider.php
@@ -112,8 +112,13 @@ private function registerConfig(): void
     {
         $this->mergeConfigFrom(self::CONFIG_PATH, self::CONFIG_KEY);
 
-        $googleCredentials = (string)config(self::CONFIG_KEY.'.google_application_credentials');
+        // Check if it should set GOOGLE_APPLICATION_CREDENTIALS to the configured path
+        $currentGoogleCredPath = getenv('GOOGLE_APPLICATION_CREDENTIALS');
+        if ($currentGoogleCredPath && file_exists($currentGoogleCredPath)) {
+            return;
+        }
 
+        $googleCredentials = (string)config(self::CONFIG_KEY.'.google_application_credentials');
         if (! empty($googleCredentials) && ! is_dir($googleCredentials)) {
             if (! file_exists($googleCredentials)) {
                 throw new RuntimeException("Google Application Credentials file not found at $googleCredentials");