omniauth-mailchimp 1.0.3 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 303f2bd67e7d7dd1e7739c71f9ddbf284e1a6ac3
+  data.tar.gz: 1f22d804c9b64b73534a938657e3dfd04e53b802
+SHA512:
+  metadata.gz: 491518089dca7ff6ba33bc2e5859f996b402bde052b23862ba4f918ca3d64b6f94f5b7cc85953b05a60fca972b9e651ae440df9a39ed6df6ccd352fbc4940b57
+  data.tar.gz: e981b9b25ce55b3b2fb60e79b1ec744205cb342c8ed0a20ca59105991b1703ecd3780e2fbe4b35e85ca1353c0627daea1ac20642aeee5d2abcabfccd5165a00e

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+uG��GV��%�jAM��w����|��[���2~������K�� �(E.���`PK��%������������ފ/�]�
+e^نS����ɶ�:U���
FW�]4;"R|�?��J1#����v�\>��U�CL��':?�;קy	:^�傕7i�O

data.tar.gz.sig

@@ -0,0 +1,2 @@
+.��$�L��B?���]hF=��� �`֨�r?�B������׀8%2�,_J'=�F7����7�
+l��익3����W^�l����]�s$H���I��0oǟm(w����i��_��.N������)��������x���"�+��>v�[@:�	��B�dJ�M'V:.j������ʙ�gd0��>k�
#��%X�!�xe<h�ۊ�5���m��j�g+���/t(T����2	(�'
:�	�29�5

data/Gemfile

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

data/README.md

@@ -1,8 +1,8 @@
-#Mailchimp Strategie
+# Mailchimp Strategy
 
 MailChimp OAuth2 strategy for OmniAuth 1.0
 
-#License
+# License
 
 Copyright (c) 2011 Florian Mhun
 
@@ -10,4 +10,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
+A2NvbTAeFw0xNzAzMjIxMjM2MzhaFw0xODAzMjIxMjM2MzhaMEMxFTATBgNVBAMM
+DHN0ZXZlbi5rYXJhczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
+LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwNvd+9hD
+d3hCLR8yi7YicZKkIo9GjdgESgp5L1fa6HaUTsawprL/wsoJuTQPOdC6m+gNqQj4
+CZsIeOSecj/jrF+aMy2MzD2eA6oNz3f1RkKbRz36QFSZmcFzveVXa1H2dsV8SQEB
+2aG6AkfmO9SlcLAaO+e+19l8K3WEr0gCUtALT3OtbII5jFQfpGxcqfzZK+rPYco8
+JOuDs5+fnFm5flMYbu5pdwPLKlYvhnkom6fRAjKFnU/AwLQ3xOpPR7x7bC481j/I
+g3BpKsFq1+8DnykqG9npo5T0XT0H7XsI2oZYbgjjEPC91+Lsgdol9xfzA+NyjBNo
+3nT6nCJBBjGt7wIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+HQ4EFgQU83CQrdgzuAmlxpCXBoi0Q0blOogwIQYDVR0RBBowGIEWc3RldmVuLmth
+cmFzQGdtYWlsLmNvbTAhBgNVHRIEGjAYgRZzdGV2ZW4ua2FyYXNAZ21haWwuY29t
+MA0GCSqGSIb3DQEBBQUAA4IBAQAEJBEF4TjjSz52HQFmfxpjChstFytzEuSDuvSr
+N0oXBrtxuV7gwKSfmPer8Oo4psOEA7qbtzuTjaHkVN6nIh5s5/Cey8kmrJO/ybrt
+2VDYNlIA/gohUpdg7Tt82YW1fhAS46hoiDIUxNJAP22I23vEom4ZZzePo/5RJJ8/
+d6I+0fQQAVuBhadvMMnAwu7QQFkZdP2fhlnouvE3OunCGqJggd3ltNzjPyi528YR
+r8TqG91/X7jeMHROZDeQrcMHOaiCTdEfQkJG408v2715v8spl4AxywNMBltrK4ju
+M6Qptda9mbBOF3gdr/aui0aKIpXp/b+samKv4LbOhEX8af5C
+-----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.3"
+    VERSION = "1.2.0"
   end
-end
+end

data/lib/omniauth/strategies/mailchimp.rb

@@ -4,31 +4,40 @@ 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"]
       }
 
       info do
-        { 
-          :first_name => raw_info["contact"]["fname"],
-          :last_name => raw_info["contact"]["lname"],
-          :email => raw_info["contact"]["email"] 
+        contact = raw_info["contact"] || {}
+
+        {
+          :first_name => contact["fname"],
+          :last_name => contact["lname"],
+          :email => contact["email"]
         }
       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
 
@@ -37,7 +46,15 @@ module OmniAuth
           data = user_data
           endpoint = data["api_endpoint"]
           apikey = "#{@access_token.token}-#{data['dc']}"
-          @access_token.get("#{endpoint}/1.3/?method=getAccountDetails&apikey=#{apikey}").parsed
+          response = @access_token.get("#{endpoint}/2.0/helper/account-details?apikey=#{apikey}").parsed
+          if response["error"]
+            case response["code"]
+            when 109
+              fail!(:invalid_credentials, response["error"])
+            end
+          else
+            response
+          end
         end
       end
 

data/omniauth-mailchimp.gemspec

@@ -4,11 +4,11 @@ require File.expand_path('../lib/omniauth/mailchimp/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth', '~> 1.0'
 
-  gem.authors = ["Florian Mhun"]
-  gem.email = ["florian.mhun@gmail.com"]
+  gem.authors = ["Steven Karas", "Florian Mhun"]
+  gem.email = ["steven.karas@gmail.com", "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.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

metadata

@@ -1,72 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailchimp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
+- Steven Karas
 - Florian Mhun
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRUwEwYDVQQDDAxzdGV2
+  ZW4ua2FyYXMxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0xNzAzMjIxMjM2MzhaFw0xODAzMjIxMjM2MzhaMEMxFTATBgNVBAMM
+  DHN0ZXZlbi5rYXJhczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwNvd+9hD
+  d3hCLR8yi7YicZKkIo9GjdgESgp5L1fa6HaUTsawprL/wsoJuTQPOdC6m+gNqQj4
+  CZsIeOSecj/jrF+aMy2MzD2eA6oNz3f1RkKbRz36QFSZmcFzveVXa1H2dsV8SQEB
+  2aG6AkfmO9SlcLAaO+e+19l8K3WEr0gCUtALT3OtbII5jFQfpGxcqfzZK+rPYco8
+  JOuDs5+fnFm5flMYbu5pdwPLKlYvhnkom6fRAjKFnU/AwLQ3xOpPR7x7bC481j/I
+  g3BpKsFq1+8DnykqG9npo5T0XT0H7XsI2oZYbgjjEPC91+Lsgdol9xfzA+NyjBNo
+  3nT6nCJBBjGt7wIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQU83CQrdgzuAmlxpCXBoi0Q0blOogwIQYDVR0RBBowGIEWc3RldmVuLmth
+  cmFzQGdtYWlsLmNvbTAhBgNVHRIEGjAYgRZzdGV2ZW4ua2FyYXNAZ21haWwuY29t
+  MA0GCSqGSIb3DQEBBQUAA4IBAQAEJBEF4TjjSz52HQFmfxpjChstFytzEuSDuvSr
+  N0oXBrtxuV7gwKSfmPer8Oo4psOEA7qbtzuTjaHkVN6nIh5s5/Cey8kmrJO/ybrt
+  2VDYNlIA/gohUpdg7Tt82YW1fhAS46hoiDIUxNJAP22I23vEom4ZZzePo/5RJJ8/
+  d6I+0fQQAVuBhadvMMnAwu7QQFkZdP2fhlnouvE3OunCGqJggd3ltNzjPyi528YR
+  r8TqG91/X7jeMHROZDeQrcMHOaiCTdEfQkJG408v2715v8spl4AxywNMBltrK4ju
+  M6Qptda9mbBOF3gdr/aui0aKIpXp/b+samKv4LbOhEX8af5C
+  -----END CERTIFICATE-----
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70173533935740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173533935740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70173533932860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173533932860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70173533903520 !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: *70173533903520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70173533903100 !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: *70173533903100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 description: MailChimp OAuth2 strategy for OmniAuth 1.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,29 +113,28 @@ 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: []
+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.17
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MailChimp OAuth2 strategy for OmniAuth 1.0.
 test_files:
 - spec/omniauth/.DS_Store

metadata.gz.sig

@@ -0,0 +1,3 @@
+��V���P"k/W��._4����y��\�ڭ���ب�
+���=i�S�Ϩ�s�HMسa�*.��%Ej�3�Z
+.�w4{��0�+&9�+*���-��;�����:�%�7O���q���6^8y�|��4#�}"ɹ3��o��
ˍ+��U9!P��o��.�a~wS�'u$:hK9/��)C��of���