omniauth-instagram 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9bf0c06d40769ec45532ee39c410951683c1fad
-  data.tar.gz: 5c179d33d74d2c739db55cb2002cc73e35a20b48
+  metadata.gz: 66c58d6d5a04adbdfc0ddb85432626ed42bef9e1
+  data.tar.gz: 9913d1a1aac2d851bd08be2c713e6de990aa1675
 SHA512:
-  metadata.gz: 9615c813649177d15d1abe5547bcc69c5fe25ce0497d915f76ffe0d99fedec09be2b2d758b25767affa4c9b4e529dff9ba6fe076b88af8e496914e013b216555
-  data.tar.gz: bd2d9819e0a00efadb09feeef76100e8a9cb6bb150f89ac0cf153812df8873490f6af7968dde4809f5cb29f295bb59e191fe8597158ee9e959d6b12861b7d347
+  metadata.gz: 227e92fcf91d58145fad7a87b2f8d95f51f87e46da4596de47f178233e60bf3dfd9ed6476018a71681fc60ae0ff9aced046e0ef4305630758584076dbe411db6
+  data.tar.gz: c1d5b0cf0e0a69f80f96f34f4367b329f412376aaa7c753dff68801b5810ba0614848d4caf9635bbc60abe8a3a0b512e73fc66ad3775b87069fd38fcc42b5382

data/README.md

@@ -10,6 +10,8 @@ on the [Instagram Developer website](http://instagram.com/developer/).
       provider :instagram, ENV['INSTAGRAM_ID'], ENV['INSTAGRAM_SECRET']
     end
 
+P.S: Instagram has started enforcing signed requests for its API. If you have enabled `Enforce signed requests` in your app then, you can pass `enforce_signed_requests: true` in the above configuration. More info: https://instagram.com/developer/secure-api-requests/
+
 ## License
 
 Copyright (c) 2011 Mihai Anca and Intridea, Inc.

data/lib/omniauth-instagram/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Instagram
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/instagram.rb

@@ -9,9 +9,15 @@ module OmniAuth
         :token_url => 'https://api.instagram.com/oauth/access_token'
       }
 
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
       def request_phase
         options[:scope] ||= 'basic'
         options[:response_type] ||= 'code'
+        options[:enforce_signed_requests] ||= false
+        options[:extra_data] ||= false
         super
       end
 
@@ -21,21 +27,59 @@ module OmniAuth
         {
           'nickname' => raw_info['username'],
           'name'     => raw_info['full_name'],
+          'email'    => raw_info['email'],
           'image'    => raw_info['profile_picture'],
           'bio'      => raw_info['bio'],
           'website'  => raw_info['website'],
         }
       end
 
+      extra do
+        hash = {}
+        hash['raw_info'] = raw_info
+        hash
+      end
+
       def raw_info
-        @data ||= access_token.params["user"]
-        unless @data
+        if options[:extra_data]
+          endpoint = "/users/self"
+          params = {}
           access_token.options[:mode] = :query
           access_token.options[:param_name] = "access_token"
-          @data ||= access_token.get('/v1/users/self').parsed['data'] || {}
+          params["sig"] = generate_sig(endpoint, {"access_token" => access_token.token}) if options[:enforce_signed_requests]
+          @data ||= access_token.get("/v1#{endpoint}", { params: params }).parsed['data'] || {}
+        else
+          @data ||= access_token.params["user"]
         end
         @data
       end
+
+      # You can pass +scope+ params to the auth request, if you need to set them dynamically.
+      # You can also set these options in the OmniAuth config :authorize_params option.
+      #
+      # For example: /auth/instagram?scope=likes+photos
+      def authorize_params
+        super.tap do |params|
+          %w[scope].each do |v|
+            params[v.to_sym] = request.params[v] if request.params[v]
+            if params[v.to_sym]
+              params[v.to_sym] = Array(params[v.to_sym]).join(' ')
+            end
+          end
+        end
+      end
+
+      def generate_sig(endpoint, params)
+        require 'openssl'
+        require 'base64'
+        sig = endpoint
+        secret = options[:client_secret]
+        params.sort.map do |key, val|
+          sig += '|%s=%s' % [key, val]
+        end
+        digest = OpenSSL::Digest.new('sha256')
+        return OpenSSL::HMAC.hexdigest(digest, secret, sig)
+      end
     end
   end
 end

data/omniauth-instagram.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Instagram::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 1'
+  gem.add_dependency 'omniauth-oauth2', '~> 1'
   gem.add_development_dependency 'rspec', '~> 2.12'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-instagram
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mihai Anca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: OmniAuth strategy for Instagram.
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Instagram.