From 2a6e88440e83670cb4eff71f85231da920b5b78b Mon Sep 17 00:00:00 2001
From: Arnaud Ceccaldi <arnaud.ceccaldi@deliveroo.co.uk>
Date: Thu, 10 Mar 2022 19:19:01 +0000
Subject: [PATCH] Use newer LwA APIs to retrieve user info

---
 lib/omniauth/amazon/version.rb          |  2 +-
 lib/omniauth/strategies/amazon.rb       | 12 +++---
 spec/omniauth/strategies/amazon_spec.rb | 56 ++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/lib/omniauth/amazon/version.rb b/lib/omniauth/amazon/version.rb
index ba6a0d1..f5d9876 100644
--- a/lib/omniauth/amazon/version.rb
+++ b/lib/omniauth/amazon/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
   module Amazon
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end
diff --git a/lib/omniauth/strategies/amazon.rb b/lib/omniauth/strategies/amazon.rb
index 2af651b..bca30ee 100644
--- a/lib/omniauth/strategies/amazon.rb
+++ b/lib/omniauth/strategies/amazon.rb
@@ -7,7 +7,7 @@ class Amazon < OmniAuth::Strategies::OAuth2
       option :name, 'amazon'
 
       option :client_options, {
-        :site => 'https://www.amazon.com/',
+        :site => 'https://api.amazon.com/',
         :authorize_url => 'https://www.amazon.com/ap/oa',
         :token_url => 'https://api.amazon.com/auth/o2/token'
       }
@@ -30,18 +30,18 @@ def build_access_token
         client.auth_code.get_token(verifier, token_params)
       end
 
-      uid { raw_info['Profile']['CustomerId'] }
+      uid { raw_info['user_id'] }
 
       info do
         {
-          'email' => raw_info['Profile']['PrimaryEmail'],
-          'name' => raw_info['Profile']['Name']
+          'email' => raw_info['email'],
+          'name' => raw_info['name']
         }
       end
 
       extra do
         {
-          'postal_code' => raw_info['Profile']['PostalCode']
+          'postal_code' => raw_info['postal_code']
         }
       end
 
@@ -53,7 +53,7 @@ def raw_info
         #
         #@raw_info ||= access_token.get('/ap/user/profile').parsed
 
-        url = "/ap/user/profile"
+        url = "/user/profile"
         params = {:params => { :access_token => access_token.token}}
         @raw_info ||= access_token.client.request(:get, url, params).parsed
       end
diff --git a/spec/omniauth/strategies/amazon_spec.rb b/spec/omniauth/strategies/amazon_spec.rb
index a2a518e..7f2e993 100644
--- a/spec/omniauth/strategies/amazon_spec.rb
+++ b/spec/omniauth/strategies/amazon_spec.rb
@@ -9,7 +9,7 @@
 
   describe '#client' do
     it 'should have the correct Amazon site' do
-      expect(subject.client.site).to eq("https://www.amazon.com/")
+      expect(subject.client.site).to eq("https://api.amazon.com/")
     end
 
     it 'should have the correct authorization url' do
@@ -36,4 +36,58 @@
        expect(subject.callback_url).to eq('https://example.com/sub_uri/auth/amazon/callback')
     end
   end
+
+  describe '#raw_info' do
+    let(:user_id) { 'amzn1.account.AHECIGNDVJG5QR6DRQFX5ZQVAOAA' }
+    let(:user_name) { 'Philip Walsh' }
+    let(:email) { 'pipwalshlx@gmail.com' }
+    let(:response_body) { { "user_id" => user_id, "name" => user_name, "email" => email } }
+    let(:response) { double(parsed: response_body) }
+
+    let(:access_token) { 'some-token' }
+    let(:client) { double(request: response) }
+
+    before do
+      allow_any_instance_of(OmniAuth::Strategies::Amazon).to receive(:access_token).and_return(
+        double(options: {}, token: access_token, client: client)
+      )
+    end
+
+    it 'calls the right Login with Amazon endpoint' do
+      expect(client).to receive(:request).with(:get, "/user/profile", {
+        params: { access_token: access_token }
+      })
+      expect(subject.raw_info).to eq(response_body)
+    end
+
+    context '#uid' do
+      before do
+        allow_any_instance_of(OmniAuth::Strategies::Amazon).to receive(:raw_info).and_return(response_body)
+      end
+
+      it 'extracts the Amazon user ID correctly' do
+        expect(subject.uid).to eq(user_id)
+      end
+    end
+
+    context '#info' do
+      before do
+        allow_any_instance_of(OmniAuth::Strategies::Amazon).to receive(:raw_info).and_return(response_body)
+      end
+
+      it 'extracts the Amazon user ID correctly' do
+        expect(subject.info).to eq({'email' => email, 'name' => user_name})
+      end
+    end
+
+    context '#extra' do
+      before do
+        allow_any_instance_of(OmniAuth::Strategies::Amazon).to receive(:raw_info).and_return(response_body)
+      end
+
+      it 'extracts the Amazon user ID correctly' do
+        expect(subject.extra).to eq({'postal_code' => nil})
+      end
+    end
+  end
 end