Updating Network Auth Client tests

Author: superchilled

lib/vonage/network_authentication.rb

@@ -6,7 +6,7 @@ class NetworkAuthentication < AbstractAuthentication
     def update(object, data)
       return unless object.is_a?(Net::HTTPRequest)
 
-      token = self.public_send(data[:auth_flow]).token(data).access_token
+      token = self.public_send(data[:auth_flow]).token(data)
 
       object['Authorization'] = 'Bearer ' + token
     end

lib/vonage/network_authentication/client.rb

@@ -5,27 +5,25 @@ module Vonage
   class NetworkAuthentication::Client < Namespace
     extend T::Sig
 
-    # include NetworkAuthentication::TokenRequest
-
     self.authentication = BearerToken
 
     self.host = :vonage_host
 
     self.request_headers['Content-Type'] = 'application/x-www-form-urlencoded'
 
-    def token(**params)
+    def token(oidc_auth_code:, redirect_uri:, **params)
       request(
         '/oauth2/token',
         params: {
           grant_type: 'authorization_code',
-          code: params[:oidc_auth_code],
-          redirect_uri: params[:redirect_uri]
+          code: oidc_auth_code,
+          redirect_uri: redirect_uri
         },
         type: Post
       )
     end
 
-    def self.generate_oidc_uri(purpose:, api_scope:, login_hint:, redirect_uri:, state: nil)
+    def generate_oidc_uri(purpose:, api_scope:, login_hint:, redirect_uri:, state: nil)
       scope = "openid+dpv:#{purpose}##{api_scope}"
       uri = "https://oidc.idp.vonage.com/oauth2/auth?" +
         "client_id=#{@config.application_id}" +

lib/vonage/network_authentication/server.rb

@@ -5,8 +5,6 @@ module Vonage
   class NetworkAuthentication::Server < Namespace
     extend T::Sig
 
-    include TokenRequest
-
     self.authentication = BearerToken
 
     self.host = :vonage_host

lib/vonage/network_authentication/token_request.rb

@@ -10,25 +10,86 @@ def token_uri
     "https://api-eu.vonage.com/oauth2/token"
   end
 
-  def test_token_method
-    grant_type = 'authorization_code'
-    code = '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537'
-    redirect_uri = 'https://example.com/callback'
+  def example_oidc_auth_code
+    '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537'
+  end
+
+  def example_redirect_uri
+    'https://example.com/callback'
+  end
+
+  def example_purpose
+    'FraudPreventionAndDetection'
+  end
+
+  def example_api_scope
+    'number-verification-verify-read'
+  end
 
+  def example_login_hint
+    '+447700900000'
+  end
+
+  def example_redirect_uri
+    'https://example.com/callback'
+  end
+
+  def test_token_method
     request_params = {
-      grant_type: grant_type,
-      code: code,
-      redirect_uri: redirect_uri
+      grant_type: 'authorization_code',
+      code: example_oidc_auth_code,
+      redirect_uri: example_redirect_uri
     }
 
     stub_request(:post, token_uri).with(request(body: request_params, headers: headers)).to_return(response)
 
-    response = client.token(
-      grant_type: grant_type,
-      oidc_auth_code: code,
-      redirect_uri: redirect_uri
+    assert_kind_of Vonage::Response, client.token(oidc_auth_code: example_oidc_auth_code, redirect_uri: example_redirect_uri)
+  end
+
+  def test_token_method_without_oidc_auth_code
+    assert_raises(ArgumentError) { client.token(redirect_uri: example_redirect_uri) }
+  end
+
+  def test_token_method_without_redirect_uri
+    assert_raises(ArgumentError) { client.token(oidc_auth_code: example_oidc_auth_code) }
+  end
+
+  def test_generate_oidc_uri_method
+    uri = client.generate_oidc_uri(
+      purpose: example_purpose,
+      api_scope: example_api_scope,
+      login_hint: example_login_hint,
+      redirect_uri: example_redirect_uri
+    )
+
+    assert_equal "https://oidc.idp.vonage.com/oauth2/auth?client_id=#{application_id}&response_type=code&scope=openid+dpv:#{example_purpose}##{example_api_scope}&login_hint=#{example_login_hint}&redirect_uri=#{example_redirect_uri}", uri
+  end
+
+  def test_generate_oidc_uri_method_with_optional_params
+    uri = client.generate_oidc_uri(
+      purpose: example_purpose,
+      api_scope: example_api_scope,
+      login_hint: example_login_hint,
+      redirect_uri: example_redirect_uri,
+      state: '12345'
     )
 
-    assert_kind_of Vonage::Response, response
+    assert_equal "https://oidc.idp.vonage.com/oauth2/auth?client_id=#{application_id}&response_type=code&scope=openid+dpv:#{example_purpose}##{example_api_scope}&login_hint=#{example_login_hint}&redirect_uri=#{example_redirect_uri}&state=12345", uri
+  end
+
+  def test_generate_oidc_uri_method_without_purpose
+    assert_raises(ArgumentError) { client.generate_oidc_uri(api_scope: example_api_scope, login_hint: example_login_hint, redirect_uri: example_redirect_uri) }
+  end
+
+  def test_generate_oidc_uri_method_without_api_scope
+    assert_raises(ArgumentError) { client.generate_oidc_uri(purpose: example_purpose, login_hint: example_login_hint, redirect_uri: example_redirect_uri) }
+  end
+
+  def test_generate_oidc_uri_method_without_login_hint
+    assert_raises(ArgumentError) { client.generate_oidc_uri(purpose: example_purpose, api_scope: example_api_scope, redirect_uri: example_redirect_uri) }
+  end
+
+  def test_generate_oidc_uri_method_without_redirect_uri
+    assert_raises(ArgumentError) { client.generate_oidc_uri(purpose: example_purpose, api_scope: example_api_scope, login_hint: example_login_hint) }
   end
 end