Updating network authentication server auth

Author: superchilled

lib/vonage/network_authentication/server.rb

@@ -11,13 +11,14 @@ class NetworkAuthentication::Server < Namespace
 
     self.request_headers['Content-Type'] = 'application/x-www-form-urlencoded'
 
-    def generate_token(**params)
-      auth_request_id = bc_authorize(**params).auth_request_id
+    def token(purpose:, api_scope:, login_hint:, **params)
+      auth_req_id = bc_authorize(
+        purpose: purpose,
+        api_scope: api_scope,
+        login_hint: login_hint
+      ).auth_req_id
 
-      token(
-        grant_type: 'urn:openid:params:grant-type:ciba',
-        auth_req_id: auth_request_id
-      ).access_token
+      request_access_token(auth_req_id: auth_req_id).access_token
     end
 
     def bc_authorize(purpose:, api_scope:, login_hint:)
@@ -31,5 +32,16 @@ def bc_authorize(purpose:, api_scope:, login_hint:)
         type: Post
       )
     end
+
+    def request_access_token(auth_req_id:)
+      request(
+        "/oauth2/token",
+        params: {
+          grant_type: 'urn:openid:params:grant-type:ciba',
+          auth_req_id: auth_req_id
+        },
+        type: Post
+      )
+    end
   end
 end

test/vonage/network_authentication/client_test.rb

@@ -14,10 +14,6 @@ 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

test/vonage/network_authentication/server_test.rb

@@ -0,0 +1,89 @@
+# typed: false
+require_relative '../test'
+
+class Vonage::NetworkAuthentication::ServerTest < Vonage::Test
+  def server
+    Vonage::NetworkAuthentication::Server.new(config)
+  end
+
+  def token_uri
+    "https://api-eu.vonage.com/oauth2/token"
+  end
+
+  def bc_authorize_uri
+    "https://api-eu.vonage.com/oauth2/bc-authorize"
+  end
+
+  def example_purpose
+    'FraudPreventionAndDetection'
+  end
+
+  def example_api_scope
+    'check-sim-swap'
+  end
+
+  def example_login_hint
+    '+447700900000'
+  end
+
+  def test_bc_authorize_method
+    request_params = {
+      scope: "openid+dpv:#{example_purpose}##{example_api_scope}",
+      login_hint: example_login_hint
+    }
+
+    stub_request(:post, bc_authorize_uri).with(request(body: request_params, headers: headers)).to_return(network_authentication_oicd_response)
+
+    response = server.bc_authorize(purpose: example_purpose, api_scope: example_api_scope, login_hint: example_login_hint)
+
+    assert_kind_of Vonage::Response, response
+    assert_equal network_authentication_auth_request_id, response.auth_req_id
+  end
+
+  def test_bc_authorize_method_without_purpose
+    assert_raises(ArgumentError) { server.bc_authorize(api_scope: example_api_scope, login_hint: example_login_hint) }
+  end
+
+  def test_bc_authorize_method_without_api_scope
+    assert_raises(ArgumentError) { server.bc_authorize(purpose: example_purpose, login_hint: example_login_hint) }
+  end
+
+  def test_bc_authorize_method_without_login_hint
+    assert_raises(ArgumentError) { server.bc_authorize(purpose: example_purpose, api_scope: example_api_scope) }
+  end
+
+  def test_request_access_token_method
+    request_params = {
+      grant_type: 'urn:openid:params:grant-type:ciba',
+      auth_req_id: network_authentication_auth_request_id
+    }
+
+    stub_request(:post, token_uri).with(request(body: request_params, headers: headers)).to_return(network_authentication_token_response)
+
+    response = server.request_access_token(auth_req_id: network_authentication_auth_request_id)
+
+    assert_kind_of Vonage::Response, response
+    assert_equal sample_webhook_token, response.access_token
+  end
+
+  def test_request_access_token_method_without_auth_req_id
+    assert_raises(ArgumentError) { server.request_access_token }
+  end
+
+  def test_token_method
+    bc_authorize_request_params = {
+      scope: "openid+dpv:#{example_purpose}##{example_api_scope}",
+      login_hint: example_login_hint
+    }
+
+    request_access_token_request_params = {
+      grant_type: 'urn:openid:params:grant-type:ciba',
+      auth_req_id: network_authentication_auth_request_id
+    }
+
+    stub_request(:post, bc_authorize_uri).with(request(body: bc_authorize_request_params, headers: headers)).to_return(network_authentication_oicd_response)
+    stub_request(:post, token_uri).with(request(body: request_access_token_request_params, headers: headers)).to_return(network_authentication_token_response)
+
+    assert_equal sample_webhook_token, server.token(purpose: example_purpose, api_scope: example_api_scope, login_hint: example_login_hint)
+  end
+end

test/vonage/test.rb

@@ -358,12 +358,22 @@ def meetings_rooms_list_response_multiple
       }
     end
 
+    def network_authentication_auth_request_id
+      'b1963d15-537f-459a-be89-e00fc310b82b'
+    end
+
     def network_authentication_token_response
       { 
         body: '{"access_token":"' + sample_webhook_token + '", "token_type":"Bearer", "expires_in":3600}', 
         headers: response_headers }
     end
 
+    def network_authentication_oicd_response
+      { 
+        body: '{"auth_req_id":"' + network_authentication_auth_request_id + '", "expires_in":120, "interval": "2"}', 
+        headers: response_headers }
+    end
+
     def response
       { body: '{"key":"value"}', headers: response_headers }
     end