omniauth-mailchimp 1.0.2 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 544dd5971eedf28fd9e257e3b3bac533b4a9a727
+  data.tar.gz: 620bb8a25753342ceb24df626ec60119a1346782
+SHA512:
+  metadata.gz: 5cb7974b8a5ce6afe75c6be9c176399daec9adaaf949f5b577ff54d732275a17ffba17f54dd55e2a7c99ebf0c466dea8235d0f348f27b93e542bb5007b80670c
+  data.tar.gz: 1230ed1244f78c5028f8b21a46c79e45b3bb31557d5732999f37e91d2073c87987f628b8c1c9b36f8eee3679f0a1c3c66834cf008b777bba593792ed641378b6

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+��o\λ���[:�;�[J�XAV�鋉�������a�/q�l%��5��������x_��Ց0n�B��Ӭ��K���g�x��]c��O�N������fr͋ծ��xC����i?�*��v캄�;-�#CL��ahǷ9b r�

data.tar.gz.sig

@@ -0,0 +1 @@
+oM!��p@=C	/�Q���N�I

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 group :example do
   gem 'sinatra'
-end
+end

data/README.md

@@ -1,8 +1,55 @@
-#Mailchimp Strategie
+# Mailchimp Strategy
 
-MailChimp OAuth2 strategy for OmniAuth 1.0
+MailChimp OAuth2 strategy for OmniAuth 2.0 using the v2 Mailchimp API.
 
-#License
+Tested using Ruby 2.4.
+Should support Ruby 2.1 and later.
+
+# Mailchimp OAuth documentation
+
+http://developer.mailchimp.com/documentation/mailchimp/guides/how-to-use-oauth2/
+
+# Auth Hash
+
+JSON as per https://us9.api.mailchimp.com/schema/3.0/Root.json
+
+```ruby
+{"account_id"=>String,
+ "login_id"=>String,
+ "account_name"=>String,
+ "email"=>String,
+ "first_name"=>String,
+ "last_name"=>String,
+ "username"=>String,
+ "avatar_url"=>String,
+ "role"=>String,
+ "member_since"=>String,
+ "pricing_plan_type"=>String,
+ "first_payment"=>String,
+ "account_timezone"=>String,
+ "account_industry"=>String,
+ "contact"=>
+  {"company"=>String,
+   "addr1"=>String,
+   "addr2"=>String,
+   "city"=>String,
+   "state"=>String,
+   "zip"=>String,
+   "country"=>String},
+ "pro_enabled"=>Boolean,
+ "last_login"=>String,
+ "total_subscribers"=>Integer,
+ "industry_stats"=>
+  {"open_rate"=>Float, "bounce_rate"=>Float, "click_rate"=>Float},
+ "_links"=>
+  [{"rel"=>String,
+    "href"=>String,
+    "method"=>String,
+    "targetSchema"=>String,
+    "schema"=>String?}]}
+```
+
+# License
 
 Copyright (c) 2011 Florian Mhun
 
@@ -10,4 +57,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -4,4 +4,4 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec

data/certs/stevenkaras.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRUwEwYDVQQDDAxzdGV2
+ZW4ua2FyYXMxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
+A2NvbTAeFw0yMTA1MjUyMjMwMDNaFw0yMjA1MjUyMjMwMDNaMEMxFTATBgNVBAMM
+DHN0ZXZlbi5rYXJhczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
+LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMVh82wj
+nLLI1fIIx+/Ar5lIzNpgHKTgy9T8WkdsoEGtDoPZGd+oixM+fzjL5xh/n31SnfIJ
++4Ab6UErPk1J8s89rQXY1rF9fVThbceCXr7c6H79fY08jE/+EHzt46FrzHdvZh81
+nAFixB81fOUDsgkicEnstuEpVU/Xf+Qo5M4Ftx1GOcMMmPlXwUyGkLpcIjo0LaQF
+98RUxePM+Iv5w7Dz0RD6htF8fXVOcdz0w5v8mVWHS3f8J5AbHm6FvhnA2YX+Gmxd
+/OJ9ogxOZs9eCwtmmU3aENyTDxNWcpPYQn/+cY/GiTBJ14t43qQR9f2OqQ5lqw5s
+5+KaiMkChGLbRwIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+HQ4EFgQU2jbdNTr9gZCYXPkKo/wmUEYWo6owIQYDVR0RBBowGIEWc3RldmVuLmth
+cmFzQGdtYWlsLmNvbTAhBgNVHRIEGjAYgRZzdGV2ZW4ua2FyYXNAZ21haWwuY29t
+MA0GCSqGSIb3DQEBBQUAA4IBAQCfpKLN//T6kENq3Bm0HXjArFwU6nTThljbRJop
+fIfjCNfWTvsoxUNcFF/W+w0vzv4cUL6/lA5hdN+l3aA/XvJcWXzKMPOY1QxUah66
+y99hRXBAMT+cru4EIivqwy/3uQuyJLEPjPk6pDdWJlJdYoJlatV00DT+zo8frgWE
+HuXbChi66jg+iyYFcsKAlTTepTLrX7sRjV+oxM52NdcpaJa3KO0EcdnsFAGiQygX
+YOJ5FP8MTTgAbIipzg/NzOFvoWUGd0oa7FOag01VUlj6tBeV427tAPSSwJDzcogi
+x/EpOXmMyWOBObwpiNLfziWtE/gu7lPlA2Up1boQptblCqCx
+-----END CERTIFICATE-----

data/examples/config.ru

@@ -20,7 +20,7 @@ end
 get '/auth/:provider/callback' do
   content_type 'text/plain'
 	token = request.env['omniauth.auth']['credentials']['token']
-  dc = request.env['omniauth.auth']['extra']['user_hash']['dc']
+  dc = request.env['omniauth.auth']['extra']['metadata']['dc']
   "Standard API key is #{token}-#{dc}".inspect rescue "No data"
 end
 
@@ -33,4 +33,4 @@ use Rack::Session::Cookie, :secret => ENV['RACK_COOKIE_SECRET']
 
 use OmniAuth::Builder do
   provider :mailchimp, ENV["MC_KEY"], ENV["MC_SECRET"]
-end
+end

data/lib/omniauth/mailchimp/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Mailchimp
-    VERSION = "1.0.2"
+    VERSION = "2.3.0"
   end
-end
+end

data/lib/omniauth/strategies/mailchimp.rb

@@ -4,40 +4,63 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class Mailchimp < OmniAuth::Strategies::OAuth2
-      
+
       option :name, "mailchimp"
-      
+
       option :client_options, {
         :site => "https://login.mailchimp.com",
         :authorize_url => '/oauth2/authorize',
         :token_url => '/oauth2/token'
       }
 
+      def request_phase
+        req = Rack::Request.new(@env)
+        options.update(req.params)
+        super
+      end
+
       uid {
-        raw_info["user_id"]
+        raw_info["account_id"]
       }
 
       info do
-        { 
-          :first_name => raw_info["contact"]["fname"],
-          :last_name => raw_info["contact"]["lname"],
-          :email => raw_info["contact"]["email"] 
+        {
+          :first_name => raw_info["first_name"],
+          :last_name => raw_info["last_name"],
+          :nickname => user_data["accountname"],
+          :email => user_data.fetch("login", {})["email"] || raw_info["email"],
+          :image => raw_info["avatar_url"],
         }
       end
-      
-      extra do 
-        { 
+
+      extra do
+        {
           :metadata => user_data,
-          :raw_info => raw_info
+          :raw_info => raw_info,
+          :api_token_with_dc => "#{@access_token.token}-#{user_data['dc']}",
         }
       end
 
+      def callback_url
+        if options.full_host
+          options.full_host + script_name + callback_path + query_string
+        else
+          super
+        end
+      end
+
       def raw_info
         @raw_info ||= begin
-          data = user_data
-          endpoint = data["api_endpoint"]
-          apikey = "#{@access_token.token}-#{data['dc']}"
-          @access_token.get("#{endpoint}/1.3/?method=getAccountDetails&apikey=#{apikey}").parsed
+          endpoint = user_data["api_endpoint"]
+          response = @access_token.get("#{endpoint}/3.0/").parsed
+          if response["error"]
+            case response["code"]
+            when 109
+              fail!(:invalid_credentials, response["error"])
+            end
+          else
+            response
+          end
         end
       end
 

data/omniauth-mailchimp.gemspec

@@ -2,13 +2,13 @@
 require File.expand_path('../lib/omniauth/mailchimp/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'omniauth', '> 1.9.1', '< 3'
 
-  gem.authors = ["Florian Mhun"]
-  gem.email = ["florian.mhun@gmail.com"]
-  gem.description = %q{MailChimp OAuth2 strategy for OmniAuth 1.0}
-  gem.summary = %q{MailChimp OAuth2 strategy for OmniAuth 1.0.}
-  gem.homepage = "http://floomoon.org/project/omniauth-mailchimp"
+  gem.authors = ["Steven Karas", "Florian Mhun"]
+  gem.email = ["steven.karas@gmail.com", "florian.mhun@gmail.com"]
+  gem.description = %q{MailChimp OAuth2 strategy for OmniAuth 2.0}
+  gem.summary = %q{MailChimp OAuth2 strategy for OmniAuth 2.0.}
+  gem.homepage = "https://github.com/stevenkaras/omniauth-mailchimp"
 
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files = `git ls-files`.split("\n")
@@ -20,5 +20,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'omniauth-oauth2'
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
-  gem.add_development_dependency 'rake'
-end
+  gem.add_development_dependency 'rake', '< 11.0'
+
+  gem.cert_chain  = ['certs/stevenkaras.pem']
+  gem.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
+
+end

data/spec/omniauth/strategies/mailchimp_spec.rb

@@ -4,20 +4,34 @@ require 'omniauth-mailchimp'
 describe OmniAuth::Strategies::Mailchimp do
   before :each do
     @request = double('Request')
-    @request.stub(:params) { {} }
   end
   
   subject do
     OmniAuth::Strategies::Mailchimp.new(nil, @options || {}).tap do |strategy|
       strategy.stub(:request) { @request }
+      strategy.stub(:script_name) { "" }
     end
   end
 
   it_should_behave_like 'an oauth2 strategy'
 
-  describe '#client' do
-    it 'has correct MailChimp site' do
-      subject.client.site.should eq('https://login.mailchimp.com')
+	describe '#client' do
+    it 'has correct Mailchimp api site' do
+      subject.options.client_options.site.should eq('https://login.mailchimp.com')
+    end
+
+    it 'has correct access token path' do
+      subject.options.client_options.token_url.should eq('/oauth2/token')
+    end
+
+    it 'has correct authorize url' do
+      subject.options.client_options.authorize_url.should eq('/oauth2/authorize')
+    end
+  end
+
+	describe '#callback_path' do
+    it 'should have the correct callback path' do
+      subject.callback_path.should eq('/auth/mailchimp/callback')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'bundler/setup'
 require 'rspec'
+require 'omniauth'
+
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|
+  OmniAuth.config.test_mode = true
 end

data/spec/support/shared_examples.rb

@@ -15,8 +15,8 @@ shared_examples 'an oauth2 strategy' do
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
-      @options = { :authorize_options => [:scope, :foo], :scope => 'http://bar', :foo => 'baz' }
-      subject.authorize_params['scope'].should eq('http://bar')
+      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('bar')
       subject.authorize_params['foo'].should eq('baz')
     end
   end

metadata

@@ -1,72 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailchimp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
+- Steven Karas
 - Florian Mhun
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRUwEwYDVQQDDAxzdGV2
+  ZW4ua2FyYXMxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0yMTA1MjUyMjMwMDNaFw0yMjA1MjUyMjMwMDNaMEMxFTATBgNVBAMM
+  DHN0ZXZlbi5rYXJhczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMVh82wj
+  nLLI1fIIx+/Ar5lIzNpgHKTgy9T8WkdsoEGtDoPZGd+oixM+fzjL5xh/n31SnfIJ
+  +4Ab6UErPk1J8s89rQXY1rF9fVThbceCXr7c6H79fY08jE/+EHzt46FrzHdvZh81
+  nAFixB81fOUDsgkicEnstuEpVU/Xf+Qo5M4Ftx1GOcMMmPlXwUyGkLpcIjo0LaQF
+  98RUxePM+Iv5w7Dz0RD6htF8fXVOcdz0w5v8mVWHS3f8J5AbHm6FvhnA2YX+Gmxd
+  /OJ9ogxOZs9eCwtmmU3aENyTDxNWcpPYQn/+cY/GiTBJ14t43qQR9f2OqQ5lqw5s
+  5+KaiMkChGLbRwIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQU2jbdNTr9gZCYXPkKo/wmUEYWo6owIQYDVR0RBBowGIEWc3RldmVuLmth
+  cmFzQGdtYWlsLmNvbTAhBgNVHRIEGjAYgRZzdGV2ZW4ua2FyYXNAZ21haWwuY29t
+  MA0GCSqGSIb3DQEBBQUAA4IBAQCfpKLN//T6kENq3Bm0HXjArFwU6nTThljbRJop
+  fIfjCNfWTvsoxUNcFF/W+w0vzv4cUL6/lA5hdN+l3aA/XvJcWXzKMPOY1QxUah66
+  y99hRXBAMT+cru4EIivqwy/3uQuyJLEPjPk6pDdWJlJdYoJlatV00DT+zo8frgWE
+  HuXbChi66jg+iyYFcsKAlTTepTLrX7sRjV+oxM52NdcpaJa3KO0EcdnsFAGiQygX
+  YOJ5FP8MTTgAbIipzg/NzOFvoWUGd0oa7FOag01VUlj6tBeV427tAPSSwJDzcogi
+  x/EpOXmMyWOBObwpiNLfziWtE/gu7lPlA2Up1boQptblCqCx
+  -----END CERTIFICATE-----
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70224140065360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.9.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70224140065360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70224140063440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224140063440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224140062920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70224140062920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70224140062500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
-  version_requirements: *70224140062500
-description: MailChimp OAuth2 strategy for OmniAuth 1.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+description: MailChimp OAuth2 strategy for OmniAuth 2.0
 email:
+- steven.karas@gmail.com
 - florian.mhun@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- certs/stevenkaras.pem
 - examples/config.ru
 - lib/omniauth-mailchimp.rb
 - lib/omniauth/mailchimp.rb
@@ -77,30 +119,29 @@ files:
 - spec/omniauth/strategies/mailchimp_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-homepage: http://floomoon.org/project/omniauth-mailchimp
+homepage: https://github.com/stevenkaras/omniauth-mailchimp
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.10
-signing_key: 
-specification_version: 3
-summary: MailChimp OAuth2 strategy for OmniAuth 1.0.
+rubyforge_project:
+rubygems_version: 2.6.14.4
+signing_key:
+specification_version: 4
+summary: MailChimp OAuth2 strategy for OmniAuth 2.0.
 test_files:
 - spec/omniauth/.DS_Store
 - spec/omniauth/strategies/mailchimp_spec.rb