Merge pull request #1457 from PRX/fix/apple_info

kookster · web-flow · commit 0f9b6668d94c · 2026-03-25T11:34:46.000-04:00
Remove api url
diff --git a/app/models/apple/api.rb b/app/models/apple/api.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+# NOTE: This code does not connect directly to Apple, a bridge lambda is used in between to handle communication and API calls.
+# This is not an official Apple API client, and to use Apple API you will need to have your own agreement with Apple to access their APIs.
+
 module Apple
   class Api
-    API_BASE = "https://api.podcastsconnect.apple.com/v1/"
-
     ERROR_RETRIES = 3
     SUCCESS_CODES = [200, 201].freeze
     DEFAULT_BATCH_SIZE = 5
@@ -28,6 +29,14 @@ def self.from_env
         key: apple_key_pem)
     end
 
+    def self.api_base
+      ENV["APPLE_PODCASTS_CONNECT_API_URL"]
+    end
+
+    def self.api_aud_name
+      ENV["APPLE_PODCASTS_CONNECT_AUD_NAME"]
+    end
+
     def self.from_key(apple_key)
       new(provider_id: apple_key.provider_id,
         key_id: apple_key.key_id,
@@ -70,7 +79,7 @@ def jwt_payload
 
       {iss: provider_id,
        exp: now.to_i + (60 * 15),
-       aud: "podcastsconnect-v1"}
+       aud: self.class.api_aud_name}
     end
 
     def jwt_headers
@@ -114,7 +123,7 @@ def get_paged_collection(api_frag)
     end
 
     def self.join_url(api_frag)
-      URI.join(API_BASE, api_frag)
+      URI.join(api_base, api_frag)
     end
 
     def join_url(api_frag)
diff --git a/test/factories/apple_podcast_container_api_response_factory.rb b/test/factories/apple_podcast_container_api_response_factory.rb
@@ -14,7 +14,7 @@
 
     after(:build) do |response_container, evaluator|
       response_container["api_response"] = {"request_metadata" => {},
-       "api_url" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}",
+       "api_url" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}",
        "api_parameters" => {},
        "api_response" =>
        {"ok" => true,
@@ -31,11 +31,11 @@
           "relationships" =>
           {"podcastDeliveries" =>
             {"links" =>
-              {"self" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}/relationships/podcastDeliveries",
-               "related" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}/podcastDeliveries",
-               "include" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}?include=podcastDeliveries"}}},
-          "links" => {"self" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}"}},
-          "links" => {"self" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/#{evaluator.podcast_container_id}"}}}}
+              {"self" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}/relationships/podcastDeliveries",
+               "related" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}/podcastDeliveries",
+               "include" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}?include=podcastDeliveries"}}},
+          "links" => {"self" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}"}},
+          "links" => {"self" => "https://aardvark.prx.org/podcastContainers/#{evaluator.podcast_container_id}"}}}}
       response_container
     end
 
diff --git a/test/factories/apple_podcast_delivery_file_api_response_factory.rb b/test/factories/apple_podcast_delivery_file_api_response_factory.rb
@@ -19,7 +19,7 @@
       response_container["external_id"] = evaluator.podcast_delivery_file_id
       response_container["feeder_type"] = :podcast_delivery_files
       response_container["api_response"] = {"request_metadata" => {"apple_episode_id" => evaluator.apple_episode_id, "podcast_delivery_id" => evaluator.podcast_delivery_id},
-       "api_url" => "https://api.podcastsconnect.apple.com/v1/podcastDeliveryFiles/#{evaluator.podcast_delivery_file_id}",
+       "api_url" => "https://aardvark.prx.org/podcastDeliveryFiles/#{evaluator.podcast_delivery_file_id}",
        "api_parameters" => {},
        "api_response" =>
        {"ok" => true,
diff --git a/test/fixtures/apple_countries_and_regions.json b/test/fixtures/apple_countries_and_regions.json
@@ -7,12 +7,12 @@
         "name": "AA country"
       },
       "links": {
-        "self": "https://api.podcastsconnect.apple.com/v1/countriesAndRegions/AA"
+        "self": "https://aardvark.prx.org/countriesAndRegions/AA"
       }
     }
   ],
   "links": {
-    "self": "https://api.podcastsconnect.apple.com/v1/countriesAndRegions?limit=200"
+    "self": "https://aardvark.prx.org/countriesAndRegions?limit=200"
   },
   "meta": {
     "paging": {
diff --git a/test/models/apple/podcast_delivery_test.rb b/test/models/apple/podcast_delivery_test.rb
@@ -83,7 +83,7 @@ class Apple::PodcastDeliveryTest < ActiveSupport::TestCase
   describe ".get_urls_for_container_podcast_deliveries" do
     let(:podcast_container_deliveries_json) do
       {"request_metadata" => {"apple_episode_id" => "apple-episode-id", "podcast_container_id" => 1},
-       "api_url" => "https://api.podcastsconnect.apple.com/v1/podcastContainers/12345/relationships/podcastDeliveries",
+       "api_url" => "https://aardvark.prx.org/podcastContainers/12345/relationships/podcastDeliveries",
        "api_parameters" => {},
        "api_response" => {"ok" => true,
                           "err" => false,
@@ -94,7 +94,7 @@ class Apple::PodcastDeliveryTest < ActiveSupport::TestCase
     let(:apple_api) { build(:apple_api) }
 
     it "should format a new set of podcast delivery urls" do
-      assert_equal ["https://api.podcastsconnect.apple.com/v1/podcastDeliveries/1111111111111111111111111"],
+      assert_equal ["https://aardvark.prx.org/podcastDeliveries/1111111111111111111111111"],
         Apple::PodcastDelivery.get_urls_for_container_podcast_deliveries(apple_api,
           podcast_container_deliveries_json)
     end
diff --git a/test/models/apple/publisher_test.rb b/test/models/apple/publisher_test.rb
@@ -14,7 +14,7 @@
   let(:publisher) { apple_publisher }
 
   before do
-    stub_request(:get, "https://api.podcastsconnect.apple.com/v1/countriesAndRegions?limit=200")
+    stub_request(:get, "https://aardvark.prx.org/countriesAndRegions?limit=200")
       .to_return(status: 200, body: json_file(:apple_countries_and_regions), headers: {})
 
     public_feed.save!
diff --git a/test/models/apple/show_test.rb b/test/models/apple/show_test.rb
@@ -13,7 +13,7 @@
   before do
     private_feed.set_default_episodes
 
-    stub_request(:get, "https://api.podcastsconnect.apple.com/v1/countriesAndRegions?limit=200")
+    stub_request(:get, "https://aardvark.prx.org/countriesAndRegions?limit=200")
       .to_return(status: 200, body: json_file(:apple_countries_and_regions), headers: {})
   end
 
diff --git a/test/models/feed/apple_subscription_test.rb b/test/models/feed/apple_subscription_test.rb
@@ -123,7 +123,7 @@
 
     it "can return a list of possible apple shows" do
       body = {data: [{id: "1", attributes: {title: "t1"}}, {id: "2", attributes: {title: "t2"}}], links: {}}.to_json
-      stub_request(:get, "https://api.podcastsconnect.apple.com/v1/shows").to_return(status: 200, body: body)
+      stub_request(:get, "https://aardvark.prx.org/shows").to_return(status: 200, body: body)
       assert_equal apple_feed.apple_show_options, [["1 (t1)", "1"], ["2 (t2)", "2"]]
     end
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -23,6 +23,7 @@
 ENV["ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"] = "andthisisanotheronetoothankyouuu"
 ENV["ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"] = "maybeyouarefeelingsaltyaboutthis"
 ENV["PODPING_AUTH_TOKEN"] = "test_token"
+ENV["APPLE_PODCASTS_CONNECT_API_URL"] = "https://aardvark.prx.org/"
 
 ENV["RAILS_ENV"] ||= "test"
 require_relative "../config/environment"
