Use Google API keys from ENV

petakopi · Aug 3, 2024 · 98de8b6 · 98de8b6
1 parent 04f89e0
commit 98de8b6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,10 @@
 BUGSNAG_API_KEY=
-CLOUDFLARE_TURNSTILE_SITE_KEY=
 CLOUDFLARE_TURNSTILE_SECRET_KEY=
+CLOUDFLARE_TURNSTILE_SITE_KEY=
 DIGITAL_OCEAN_ACCESS_KEY_ID=
 DIGITAL_OCEAN_SECRET_ACCESS_KEY=
+GOOGLE_API_KEY_API=
+GOOGLE_API_KEY_WEB=
 GOOGLE_OAUTH_CLIENT_ID=
 GOOGLE_OAUTH_CLIENT_SECRET=
 MAPBOX_API_KEY=

diff --git a/app/services/google_api/google_location_syncer.rb b/app/services/google_api/google_location_syncer.rb
@@ -35,7 +35,7 @@ def call
   private
 
   def api_key
-    Rails.application.credentials.dig(:google_api_key, :api)
+    ENV.fetch("GOOGLE_API_KEY_API")
   end
 
   def validate_params

diff --git a/app/services/lat_lng_extractor.rb b/app/services/lat_lng_extractor.rb
@@ -29,7 +29,7 @@ def valid?
   end
 
   def google_map_api_key
-    Rails.application.credentials.dig(:google_api_key, :api)
+    ENV.fetch("GOOGLE_API_KEY_API")
   end
 
   def extract_using_redirection

diff --git a/app/services/update_coffee_shop_operation_status.rb b/app/services/update_coffee_shop_operation_status.rb
@@ -47,7 +47,7 @@ def place_id
   end
 
   def api_key
-    Rails.application.credentials.dig(:google_api_key, :api)
+    ENV.fetch("GOOGLE_API_KEY_API")
   end
 
   def service

diff --git a/app/use_cases/google_apis/opening_hours/fetch.rb b/app/use_cases/google_apis/opening_hours/fetch.rb
@@ -21,7 +21,7 @@ def call!
   private
 
   def api_key
-    Rails.application.credentials.dig(:google_api_key, :api)
+    ENV.fetch("GOOGLE_API_KEY_API")
   end
 
   def response

diff --git a/app/views/coffee_shops/edit.html.erb b/app/views/coffee_shops/edit.html.erb
@@ -1,5 +1,5 @@
 <%= content_for(:extra_js) do %>
-<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{Rails.application.credentials.dig(:google_api_key, :web)}&libraries=places&callback=dispatchMapsFormEvent",
+<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{ENV.fetch('GOOGLE_API_KEY_WEB')}&libraries=places&callback=dispatchMapsFormEvent",
     async: true,
     defer: true,
     "data-turbolinks-eval": false %>

diff --git a/app/views/coffee_shops_v2/new.html.erb b/app/views/coffee_shops_v2/new.html.erb
@@ -1,5 +1,5 @@
 <%= content_for(:extra_js) do %>
-<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{Rails.application.credentials.dig(:google_api_key, :web)}&libraries=places&callback=dispatchMapsFormEvent",
+<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{ENV.fetch('GOOGLE_API_KEY_WEB')}&libraries=places&callback=dispatchMapsFormEvent",
     async: true,
     defer: true,
     "data-turbolinks-eval": false %>

diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
@@ -1 +1 @@
-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--Yy2MxsludSOk8SYm--6400BoEG2snZrZ4Zzt4Fig==
+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--TNf8qBu5u9nkgYDB--NJ5aTAxnXy+Hf8F8d0mDAQ==