Merge pull request #15 from gettyimages/update-auth-hostname

Make auth requests with new hostname
gettyimages · May 22, 2023 · 48d323e · 48d323e
2 parents aca9a61 + d0ce98b
commit 48d323e
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,3 +4,4 @@ gem 'rake'
 gem 'json'
 gem 'test-unit'
 gem 'webmock'
+gem 'rexml'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,6 +10,7 @@ GEM
     power_assert (1.1.6)
     public_suffix (4.0.6)
     rake (13.0.1)
+    rexml (3.2.5)
     safe_yaml (1.0.5)
     test-unit (3.3.5)
       power_assert
@@ -27,8 +28,9 @@ PLATFORMS
 DEPENDENCIES
   json
   rake
+  rexml
   test-unit
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.22
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ GID := $(shell id -g)
 
 build:
 	bundle config set --local path 'vendor/bundle'
-	bundle install --path vendor/bundle
+	bundle install 
 	bundle exec rake
 	gem build gettyimages-api.gemspec
 

diff --git a/README.md b/README.md
@@ -167,7 +167,7 @@ _Source code is only needed if you would like to contribute to the project. Othe
 
 ### Requirements
 
-- Ruby version >= 2.5
+- Ruby version >= 3.0
 - [Bundler](http://bundler.io)
 
 Install bundler and all dependencies

diff --git a/lib/Credentials.rb b/lib/Credentials.rb
@@ -21,7 +21,7 @@ def initialize(args)
 	end
 
 	def get_uri(path)
-		return URI.parse "#{Api_Host::API_BASE_URL}#{path}"
+		return URI.parse "#{Api_Host::AUTH_BASE_URL}#{path}"
 	end
 
 	def token_has_expired()

diff --git a/lib/HttpHelper.rb b/lib/HttpHelper.rb
@@ -7,6 +7,8 @@
 class Api_Host
 	API_HOST = "api.gettyimages.com"
 	API_BASE_URL = "https://#{API_HOST}"
+	AUTH_HOST = "authentication.gettyimages.com"
+	AUTH_BASE_URL = "https://#{AUTH_HOST}"
 end
 
 class HttpHelper

diff --git a/unit_tests/CustomParamHeaderTests.rb b/unit_tests/CustomParamHeaderTests.rb
@@ -5,7 +5,7 @@
 
 class CustomParamHeaderTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/CustomRequestsTests.rb b/unit_tests/CustomRequestsTests.rb
@@ -5,7 +5,7 @@
 
 class CustomRequestsTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/DownloadImagesTests.rb b/unit_tests/DownloadImagesTests.rb
@@ -5,7 +5,7 @@
 
 class DownloadImagesTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/DownloadVideosTests.rb b/unit_tests/DownloadVideosTests.rb
@@ -5,7 +5,7 @@
 
 class DownloadVideosTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/ImagesTests.rb b/unit_tests/ImagesTests.rb
@@ -5,7 +5,7 @@
 
 class ImagesTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchImagesCreativeTests.rb b/unit_tests/SearchImagesCreativeTests.rb
@@ -5,7 +5,7 @@
 
 class SearchImagesCreativeTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchImagesEditorialTests.rb b/unit_tests/SearchImagesEditorialTests.rb
@@ -5,7 +5,7 @@
 
 class SearchImagesEditorialTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchImagesTests.rb b/unit_tests/SearchImagesTests.rb
@@ -6,7 +6,7 @@
 
 class SearchImagesTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchVideosCreativeTests.rb b/unit_tests/SearchVideosCreativeTests.rb
@@ -5,7 +5,7 @@
 
 class SearchVideosCreativeTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchVideosEditorialTests.rb b/unit_tests/SearchVideosEditorialTests.rb
@@ -5,7 +5,7 @@
 
 class SearchVideosEditorialTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/SearchVideosTests.rb b/unit_tests/SearchVideosTests.rb
@@ -5,7 +5,7 @@
 
 class SearchVideosTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end
 

diff --git a/unit_tests/VideosTests.rb b/unit_tests/VideosTests.rb
@@ -5,7 +5,7 @@
 
 class VideosTests < Test::Unit::TestCase
     def setup
-        stub_request(:post, "https://api.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
+        stub_request(:post, "https://authentication.gettyimages.com/oauth2/token").with(body: {"client_id"=>"api key", "client_secret"=>"api secret", "grant_type"=>"client_credentials"})
         .to_return(status: 200, body: '{"access_token": "client_credentials_access_token", "token_types": "Bearer", "expires_in": "1800"}')
     end