make argument of verify_id_token more explicit

Author: yskkin

lib/line/bot/client.rb

@@ -148,18 +148,20 @@ def revoke_channel_access_token_jwt(access_token)
       # Verify ID token
       #
       # @param id_token [String] ID token
-      # @param options [Hash] Optional request body
+      # @param nonce [String] Expected nonce value. Use the nonce value provided in the authorization request. Omit if the nonce value was not specified in the authorization request.
+      # @param user_id [String] Expected user ID.
       #
       # @return [Net::HTTPResponse]
-      def verify_id_token(id_token, options = {})
+      def verify_id_token(id_token, nonce: nil, user_id: nil)
         channel_id_required
 
         endpoint_path = '/oauth2/v2.1/verify'
-        payload = URI.encode_www_form(
+        payload = URI.encode_www_form({
           client_id: channel_id,
           id_token: id_token,
-          **options
-        )
+          nonce: nonce,
+          user_id: user_id
+        }.compact)
         headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
         post(oauth_endpoint, endpoint_path, payload, headers)
       end

spec/line/bot/client_channel_token_spec.rb

@@ -32,6 +32,21 @@
 }
 EOS
 
+VERIFY_ID_TOKEN_CONTENT = <<"EOS"
+{
+    "iss": "https://access.line.me",
+    "sub": "U1234567890abcdef1234567890abcdef",
+    "aud": "1234567890",
+    "exp": 1504169092,
+    "iat": 1504263657,
+    "nonce": "0987654asdf",
+    "amr": ["pwd"],
+    "name": "Taro Line",
+    "picture": "https://sample_line.me/aBcdefg123456",
+    "email": "[email protected]"
+}
+EOS
+
 describe Line::Bot::Client do
   def dummy_config
     {
@@ -115,12 +130,14 @@ def generate_client
 
   it 'verifies ID token' do
     uri_template = Addressable::Template.new Line::Bot::API::DEFAULT_OAUTH_ENDPOINT + '/oauth2/v2.1/verify'
-    stub_request(:post, uri_template).to_return { |request| {body: '', status: 200} }
+    stub_request(:post, uri_template)
+      .with(body: { client_id: 'channel id', id_token: 'dummy_id_token', nonce: 'dummy_nonce'})
+      .to_return { |request| {body: VERIFY_ID_TOKEN_CONTENT, status: 200} }
 
     client = generate_client
 
     response = client.verify_id_token('dummy_id_token', nonce: 'dummy_nonce')
 
-    expect(response).to be_a(Net::HTTPOK)
+    expect(response).to be_a(Net::HTTPOK).and(have_attributes(body: VERIFY_ID_TOKEN_CONTENT))
   end
 end