Merge branch 'ia-add-email-to-arkose-verify-request' into 'master'

Add user's email address to Arkose verify requests

See merge request gitlab-org/gitlab!162945



Merged-by: Dzmitry (Dima) Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Approved-by: Dzmitry (Dima) Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Reviewed-by: Dzmitry (Dima) Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>
Co-authored-by: imand3r <ianderson@gitlab.com>

ee/app/services/arkose/token_verification_service.rb

@@ -13,7 +13,12 @@ def initialize(session_token:, user: nil)
     end
 
     def execute
-      parsed_response = Gitlab::HTTP.perform_request(Net::HTTP::Post, arkose_verify_url, body: body).parsed_response
+      parsed_response = Gitlab::HTTP.perform_request(
+        Net::HTTP::Post,
+        arkose_verify_url,
+        headers: { 'Content-Type': 'application/json' },
+        body: body
+      ).parsed_response
 
       @response = ::Arkose::VerifyResponse.new(parsed_response)
 
@@ -42,11 +47,10 @@ def execute
     private
 
     def body
-      {
-        private_key: Settings.arkose_private_api_key,
-        session_token: session_token,
-        log_data: user&.id
-      }.compact
+      data = { private_key: Settings.arkose_private_api_key, session_token: session_token }
+      data.merge!({ email_address: user.email, log_data: user.id.to_s }) if user
+
+      Gitlab::Json.generate(data)
     end
 
     def logger

ee/spec/services/arkose/token_verification_service_spec.rb

@@ -18,7 +18,10 @@ def verify_request_body
       session_token: an_instance_of(String)
     }
 
-    body[:log_data] = an_instance_of(String) if user
+    if user
+      body[:log_data] = an_instance_of(String)
+      body[:email_address] = an_instance_of(String)
+    end
 
     body
   end
@@ -32,7 +35,8 @@ def verify_request_body
       .with(
         body: verify_request_body,
         headers: {
-          'Accept' => '*/*'
+          'Accept' => '*/*',
+          'Content-Type' => 'application/json'
         }
       ).to_return(
         status: 200,

ee/spec/support/shared_examples/features/signup_arkose_challenge_shared_examples.rb

@@ -16,13 +16,14 @@
     request_headers = {
       Accept: '*/*',
       'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent': 'Ruby'
+      'User-Agent': 'Ruby',
+      'Content-Type': 'application/json'
     }
     response_headers = { 'Content-Type' => 'application/json' }
 
     stub_request(:post, "https://verify-api.arkoselabs.com/api/v4/verify/")
       .with(
-        body: "private_key=#{mock_arkose_labs_key}&session_token=#{mock_arkose_labs_token}",
+        body: { private_key: mock_arkose_labs_key, session_token: mock_arkose_labs_token }.to_json,
         headers: request_headers
       ).to_return(status: 200, body: arkose_verification_response.to_json, headers: response_headers)