easy_auth-oauth2 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 188ffef0c79a6b0f8e5230d1891d5292a108d1a6
+  data.tar.gz: ac3e432197a7d1e1837128d45ce98fa6bfc3bc15
+SHA512:
+  metadata.gz: 94d92289bb5422fe66d5f257ebb1e1fca5707d713dcc50474a48eb4415dd230f924bf71b7ec37d4f2eb1dd05f50f1acee9f703af313b861543eef676644e844f
+  data.tar.gz: 22b8bfcd96b60fe858d31a4fd168233d26ac6a93aab9b37fd66a0cf64736fde8dc29fae8ddb1f58f3e9d0e7619f8876078bf9062662883ee830a4e86e48522b0

data/lib/easy_auth/models/identities/oauth2/base.rb

@@ -1,30 +1,21 @@
+require 'easy_auth-oauth_core'
 require 'oauth2'
 
 module EasyAuth::Models::Identities::Oauth2::Base
-  def self.included(base)
-    base.class_eval do
-      extend ClassMethods
-    end
-  end
+  extend ActiveSupport::Concern
+  include EasyAuth::Models::Identities::OauthCore
 
   module ClassMethods
     def authenticate(controller)
-      if controller.params[:code].present? && controller.params[:error].blank?
-        callback_url   = controller.oauth2_callback_url(:provider => provider)
-        code           = controller.params[:code]
-        token          = client.auth_code.get_token(code, token_options(callback_url))
-        user_info      = get_user_info(token)
-        identity       = self.find_or_initialize_by_username user_info['id'].to_s
-        identity.token = token.token
-        account        = controller.current_account
-
-        if identity.new_record?
-          account = EasyAuth.account_model.create(EasyAuth.account_model.identity_username_attribute => identity.username) if account.nil?
-          identity.account = account
-        end
-
-        identity.save!
-        identity
+      super(controller) do
+        callback_url       = controller.oauth2_callback_url(:provider => provider)
+        code               = controller.params[:code]
+        token              = client.auth_code.get_token(code, token_options(callback_url), token_params)
+        account_attributes = get_account_attributes(token)
+        identity           = self.find_or_initialize_by(:uid => retrieve_uid(account_attributes))
+        identity.token     = token.token
+
+        [identity, account_attributes]
       end
     end
 
@@ -32,22 +23,33 @@ module EasyAuth::Models::Identities::Oauth2::Base
       controller.redirect_to authenticate_url(controller.oauth2_callback_url(:provider => provider))
     end
 
+    def can_authenticate?(controller)
+      controller.params[:code].present? && controller.params[:error].blank?
+    end
+
     def get_access_token(identity)
       ::OAuth2::AccessToken.new client, identity.token
     end
 
-    private
+    def version
+      :oauth2
+    end
+
+    def oauth2_scope
+      ''
+    end
 
     def token_options(callback_url)
       { :redirect_uri => callback_url }
     end
 
-    def get_user_info(token)
-      ActiveSupport::JSON.decode(token.get(user_info_url).body)
+    # Needed by some OAuth2 providers the use custom query parameters
+    def token_params
+      {}
     end
 
-    def provider
-      raise NotImplementedError
+    def get_account_attributes(token)
+      ActiveSupport::JSON.decode(token.get(account_attributes_url).body)
     end
 
     def client
@@ -55,10 +57,10 @@ module EasyAuth::Models::Identities::Oauth2::Base
     end
 
     def authenticate_url(callback_url)
-      client.auth_code.authorize_url(:redirect_uri => callback_url, :scope => scope)
+      client.auth_code.authorize_url(:redirect_uri => callback_url, :scope => oauth2_scope)
     end
 
-    def user_info_url
+    def account_attributes_url
       raise NotImplementedError
     end
 
@@ -73,29 +75,5 @@ module EasyAuth::Models::Identities::Oauth2::Base
     def site_url
       raise NotImplementedError
     end
-
-    def scope
-      settings.scope
-    end
-
-    def client_id
-      settings.client_id
-    end
-
-    def secret
-      settings.secret
-    end
-
-    def settings
-      EasyAuth.oauth2[provider]
-    end
-
-    def provider
-      self.to_s.split('::').last.underscore.to_sym
-    end
-  end
-
-  def get_access_token
-    self.class.get_access_token self
   end
 end

data/lib/easy_auth/oauth2.rb

@@ -43,8 +43,8 @@ module EasyAuth
 
   self.oauth2 = {}
 
-  def self.oauth2_client(provider, client_id, secret, scope = '')
-    oauth2[provider] = OpenStruct.new :client_id => client_id, :secret => secret, :scope => scope || ''
+  def self.oauth2_client(provider, client_id, secret)
+    oauth2[provider] = OpenStruct.new :client_id => client_id, :secret => secret
   end
 end
 

data/lib/easy_auth/oauth2/controllers/sessions.rb

@@ -2,15 +2,15 @@ module EasyAuth::Oauth2::Controllers::Sessions
 
   private
 
-  def after_successful_sign_in_with_oauth2(identity)
-    send("after_successful_sign_in_with_oauth2_for_#{params[:provider]}", identity)
+  def after_successful_sign_in_with_oauth2
+    send("after_successful_sign_in_with_oauth2_for_#{params[:provider]}")
   end
 
-  def after_successful_sign_in_url_with_oauth2(identity)
-    send("after_successful_sign_in_url_with_oauth2_for_#{params[:provider]}", identity)
+  def after_successful_sign_in_url_with_oauth2
+    send("after_successful_sign_in_url_with_oauth2_for_#{params[:provider]}")
   end
 
-  def after_failed_sign_in_with_oauth2(identity)
-    send("after_failed_sign_in_with_oauth2_for_#{params[:provider]}", identity)
+  def after_failed_sign_in_with_oauth2
+    send("after_failed_sign_in_with_oauth2_for_#{params[:provider]}")
   end
 end

data/lib/easy_auth/oauth2/version.rb

@@ -1,5 +1,5 @@
 module EasyAuth
   module Oauth2
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -10,136 +9,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_auth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: easy_auth-oauth_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: valid_attribute
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 description: EasyAuth-Oauth2
 email:
 - brian@dockyard.com
@@ -165,32 +162,25 @@ files:
 - README.md
 homepage: https://github.com/dockyard/easy_auth-oauth2
 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'
-      segments:
-      - 0
-      hash: -1473449787249200133
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1473449787249200133
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EasyAuth-Oauth2
 test_files: []