easy_auth-oauth 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bef3a7129c4beab51adf4acabc57daccc5de46ed
+  data.tar.gz: 237cd95ec4bf89f0ded4b476ae93eca28b105da8
+SHA512:
+  metadata.gz: 2481a9d72060516a986b6220e0a4c5ea473a4b32bd6f7a66f4fdadbdc75eb66b7edca02029130653b7df0eb80dd3850f0370d89d247887f6c68fba5044761230
+  data.tar.gz: 91fbc925f577f1152da16c8b1a448f3403dd579fd05a5feafd205bd1916d62644436fc188e85d8453e23a548c3c27ff5e85e68ca58777901c534e7c4a09a5f66

data/README.md

@@ -14,13 +14,8 @@ In your Gemfile add the following:
 gem 'easy_auth-oauth'
 ```
 
-After running Bundler you'll need to install the migrations
-
-```ruby
-rake easy_auth-oauth:install:migrations
-```
-
-Then run your migrations.
+Then follow the general installation instructions for
+[EasyAuth](https://github.com/dockyard/easy_auth#installation)
 
 ## Authors ##
 

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

@@ -1,32 +1,32 @@
+require 'easy_auth-oauth_core'
 require 'oauth'
 
 module EasyAuth::Models::Identities::Oauth::Base
-  def self.included(base)
-    base.class_eval do
-      serialize :token, Hash
-      extend ClassMethods
-    end
+  extend ActiveSupport::Concern
+  include EasyAuth::Models::Identities::OauthCore
+
+  included do
+    serialize :token, Hash
   end
 
   module ClassMethods
     def authenticate(controller)
-      oauth_token         = controller.params[:oauth_token]
-      oauth_verifier      = controller.params[:oauth_verifier]
-      access_token_secret = controller.session.delete('access_token_secret')
-      request_token       = OAuth::RequestToken.new(client, oauth_token, access_token_secret)
-      token               = request_token.get_access_token(:oauth_verifier => oauth_verifier)
-      username            = retrieve_username(token)
-      identity            = self.find_or_initialize_by_username username.to_s
-      identity.token      = {:token => token.token, :secret => token.secret}
-      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
+      super(controller) do
+        oauth_token         = controller.params[:oauth_token]
+        oauth_verifier      = controller.params[:oauth_verifier]
+        access_token_secret = controller.session.delete('access_token_secret')
+        request_token       = OAuth::RequestToken.new(client, oauth_token, access_token_secret)
+        token               = request_token.get_access_token(:oauth_verifier => oauth_verifier)
+        account_attributes     = get_account_attributes(token)
+        identity            = self.find_or_initialize_by(uid: retrieve_uid(account_attributes))
+        identity.token      = {:token => token.token, :secret => token.secret}
+
+        [identity, account_attributes]
       end
+    end
 
-      identity.save!
-      identity
+    def can_authenticate?(controller)
+      controller.params[:oauth_token].present? && controller.params[:oauth_verifier].present?
     end
 
     def new_session(controller)
@@ -37,22 +37,16 @@ module EasyAuth::Models::Identities::Oauth::Base
       ::OAuth::AccessToken.new client, identity.token[:token], identity.token[:secret]
     end
 
-    private
-
-    def token_options(callback_url)
-      { :redirect_uri => callback_url }
-    end
-
     def client_options
       { :site => site_url, :authorize_path => authorize_path }
     end
 
-    def provider
-      raise NotImplementedError
+    def get_account_attributes(token)
+      token.params
     end
 
-    def retrieve_username(token)
-      raise NotImplementedError
+    def version
+      :oauth
     end
 
     def client
@@ -72,29 +66,5 @@ module EasyAuth::Models::Identities::Oauth::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.oauth[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/oauth.rb

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

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

@@ -2,15 +2,15 @@ module EasyAuth::Oauth::Controllers::Sessions
 
   private
 
-  def after_successful_sign_in_with_oauth(identity)
-    send("after_successful_sign_in_with_oauth_for_#{params[:provider]}", identity)
+  def after_successful_sign_in_with_oauth
+    send("after_successful_sign_in_with_oauth_for_#{params[:provider]}")
   end
 
-  def after_successful_sign_in_url_with_oauth(identity)
-    send("after_successful_sign_in_url_with_oauth_for_#{params[:provider]}", identity)
+  def after_successful_sign_in_url_with_oauth
+    send("after_successful_sign_in_url_with_oauth_for_#{params[:provider]}")
   end
 
-  def after_failed_sign_in_with_oauth(identity)
-    send("after_failed_sign_in_with_oauth_for_#{params[:provider]}", identity)
+  def after_failed_sign_in_with_oauth
+    send("after_failed_sign_in_with_oauth_for_#{params[:provider]}")
   end
 end

data/lib/easy_auth/oauth/version.rb

@@ -1,5 +1,5 @@
 module EasyAuth
   module Oauth
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth-oauth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -10,28 +9,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 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: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,71 +56,62 @@ dependencies:
 - !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
@@ -119,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,17 +126,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bourne
   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'
 description: EasyAuth-Oauth
@@ -165,32 +162,25 @@ files:
 - README.md
 homepage: https://github.com/dockyard/easy_auth-oauth
 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: 4126111251491885690
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4126111251491885690
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EasyAuth-Oauth
 test_files: []