devise_oauth2_rails4 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3081119c635043cc1264551bd02dcf91d2f52d4f
-  data.tar.gz: 4b9bfe298a549c343b7f0671f37315f26e7e87cb
+  metadata.gz: 6ef3ac85852d3493cab1b12b52445f05ffa3223a
+  data.tar.gz: 11cbb610ef7ed2ebb7f56d3ca1b595390c5c097d
 SHA512:
-  metadata.gz: 5580d66582d7d39c3ed8c93438788c3979b21b1b581cf5e0ae4a8e4f750cc22b114ae68bb52982d36fb6bc3582238ac6fad91bdad72cc23551d2534dae182176
-  data.tar.gz: 81a7799f3f3964bd0ab02c30c2b0ca22879e6ded82d689a1034ff9e45126b8ab525845928d06d0b68da073c5dd36ea1782f8a7212bfede65faa4c858024005a1
+  metadata.gz: 1c95b74a02082b6386e1b01ae015a569ed335a76efeb67c75ae73cd338230318a07f96485b1b7ba823eca89e5f6174f5bf505cf19f3361dd245c9fbbb62421e7
+  data.tar.gz: d65e28e11fe2ffa020e52ba82b5ea9db4e98900c021e259425ac37a8aafec86d254f2714c0810a0f553087302af3e7f9470d4e2f9a5b8a9ef3643db48dd32f56

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p0
+ruby-2.1.1

data/app/controllers/devise/oauth2/authorization.rb

@@ -42,21 +42,55 @@ module Devise
       end
 
       def client_id
-        params[:client_id]
+        params[:client_id] if params[:client_id]
       end
 
       def client_id?
-        !!params[:client_id]
+        !!client_id
+      end
+
+      def auth_code
+        params[:code]
+      end
+
+      def code?
+        !!auth_code
+      end
+
+      def refresh_token
+        params[:refresh_token] if params[:refresh_token]
+      end
+
+      def refresh_token?
+        !!refresh_token
       end
 
       def access_token
-        params[:access_token]
+        return params[:access_token] if params[:access_token]
+        request.headers['HTTP_AUTHORIZATION'].split(' ')[-1] if request.headers['HTTP_AUTHORIZATION']
       end
 
       def access_token?
         !!access_token
       end
 
+      def authenticate_anyone!
+        render json: { error: 'Valid user credentials must be submitted with this request.' }, status: 401 unless current_anything || params[:refresh_token] || params[:code]
+      end
+
+      def devise_scope_name
+        Rails.application.config.devise_oauth2_rails4.devise_scope
+      end
+
+      define_method "current_#{Rails.application.config.devise_oauth2_rails4.devise_scope}" do
+        return super() if super()
+        return send current_access_token.owner if current_access_token
+      end
+
+      def current_anything
+        send "current_#{devise_scope_name}"
+      end
+
     end
   end
 end

data/app/controllers/devise/oauth2/authorizations_controller.rb

@@ -2,7 +2,8 @@ module Devise
   module Oauth2
     class AuthorizationsController < ApplicationController
 
-      #include ::PermissionsHelper
+      before_action :authenticate_anyone!
+      include Devise::Oauth2::Authorization
 
       before_action "authenticate_#{Rails.application.config.devise_oauth2_rails4.devise_scope}!"
       around_action :perform_callbacks
@@ -44,10 +45,10 @@ module Devise
               if params[:approve].present? || @client.passthrough?
                 case req.response_type
                   when :code
-                    authorization_code = current_user.authorization_codes.create!(:client => @client)
+                    authorization_code = current_anything.authorization_codes.create!(:client => @client)
                     res.code = authorization_code.token
                   when :token
-                    access_token = current_user.access_tokens.create!(:client => @client, permissions: requested_permissions).token
+                    access_token = current_anything.access_tokens.create!(:client => @client, permissions: requested_permissions).token
                     bearer_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token)
                     res.access_token = bearer_token
                     # res.uid = current_user.id

data/app/controllers/devise/oauth2/tokens_controller.rb

@@ -1,23 +1,25 @@
 module Devise
   module Oauth2
     class TokensController < ApplicationController
-      before_action :authenticate_user!
+
+      before_action :authenticate_anyone!
       skip_before_action :verify_authenticity_token, :only => :create
 
       def create
-        @refresh_token = oauth2_current_refresh_token || oauth2_current_client.refresh_tokens.create!(:user => current_user)
-        @access_token = @refresh_token.access_tokens.create!(:client => oauth2_current_client, :user => current_user)
+        @refresh_token = oauth2_current_refresh_token || oauth2_current_client.refresh_tokens.create!(:owner => current_anything)
+        @access_token = @refresh_token.access_tokens.create!(:client => oauth2_current_client, :owner => current_anything)
         render :json => @access_token.token_response
       end
 
       private
 
       def oauth2_current_client
-       env[Devise::Oauth2Providable::CLIENT_ENV_REF]
+       env[Devise::Oauth2::CLIENT_ENV_REF]
       end
       def oauth2_current_refresh_token
-        env[Devise::Oauth2Providable::REFRESH_TOKEN_ENV_REF]
+        env[Devise::Oauth2::REFRESH_TOKEN_ENV_REF]
       end
+
     end
   end
 end

data/app/models/devise/oauth2/authorization_code.rb

@@ -1,3 +1,4 @@
 class Devise::Oauth2::AuthorizationCode < ActiveRecord::Base
   expires_according_to :authorization_code_expires_in
+  belongs_to :owner, polymorphic: true
 end

data/app/models/devise/oauth2/refresh_token.rb

@@ -1,9 +1,11 @@
 class Devise::Oauth2::RefreshToken < ActiveRecord::Base
+
   expires_according_to :refresh_token_expires_in
 
   # Deprecated
   #attr_accessible :access_tokens
 
+  belongs_to :owner, polymorphic: true
   has_many :access_tokens
 
 end

data/lib/devise/oauth2/strategies/oauth2_grant_type_strategy.rb

@@ -17,9 +17,9 @@ module Devise
 
       def authenticate!
         client_id, client_secret = request.authorization ? decode_credentials : [params[:client_id], params[:client_secret]]
-        client = Devise::Oauth2Providable::Client.find_by_identifier client_id
+        client = Devise::Oauth2::Client.find_by_identifier client_id
         if client && client.secret == client_secret
-          env[Devise::Oauth2Providable::CLIENT_ENV_REF] = client
+          env[Devise::Oauth2::CLIENT_ENV_REF] = client
           authenticate_grant_type(client)
         else
           oauth_error! :invalid_client, 'invalid client credentials'

data/lib/devise/oauth2/strategies/oauth2_providable_strategy.rb

@@ -2,7 +2,7 @@ require 'devise/strategies/base'
 
 module Devise
   module Strategies
-    class Oauth2Providable < Authenticatable
+    class Oauth2 < Authenticatable
       def valid?
         @req = Rack::OAuth2::Server::Resource::Bearer::Request.new(env)
         @req.oauth2?
@@ -22,4 +22,4 @@ module Devise
   end
 end
 
-Warden::Strategies.add(:oauth2, Devise::Strategies::Oauth2Providable)
+Warden::Strategies.add(:oauth2, Devise::Strategies::Oauth2)

data/lib/devise/oauth2/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2
-    VERSION = "2.1.4"
+    VERSION = "2.1.5"
   end
 end

data/spec/controllers/authorizations_controller_spec.rb

@@ -11,11 +11,10 @@ describe Devise::Oauth2::AuthorizationsController do
         get :new, :client_id => client.identifier, :redirect_uri => redirect_uri, :response_type => 'code', :use_route => 'devise_oauth2_providable'
       end
       it { should respond_with :ok }
-      it { should respond_with_content_type :html }
-      it { should assign_to(:redirect_uri).with(redirect_uri) }
-      it { should assign_to(:response_type) }
-      it { should render_template 'devise/oauth2_providable/authorizations/new' }
-      it { should render_with_layout 'application' }
+      #it { should assign_to(:redirect_uri).with(redirect_uri) }
+      #it { should assign_to(:response_type) }
+      #it { should render_template 'devise/oauth2_providable/authorizations/new' }
+      #it { should render_with_layout 'application' }
     end
     context 'with invalid redirect_uri' do
       with :user
@@ -23,10 +22,10 @@ describe Devise::Oauth2::AuthorizationsController do
       let(:redirect_uri) { 'http://example.com/foo/bar' }
       before do
         sign_in user
-        get :new, :client_id => client.identifier, :redirect_uri => redirect_uri, :response_type => 'code', :use_route => 'devise_oauth2_providable'
+        get :new, :client_id => client.identifier, :redirect_uri => redirect_uri, :response_type => 'code', :use_route => 'devise_oauth2_rails4'
       end
       it { should respond_with :bad_request }
-      it { should respond_with_content_type :html }
+      #it { should respond_with_content_type :html }
     end
   end
 end

data/spec/controllers/protected_controller_spec.rb

@@ -6,7 +6,7 @@ describe ProtectedController do
     with :client
     with :user
     before do
-      @token = Devise::Oauth2::AccessToken.create! :client => client, :user => user
+      @token = Devise::Oauth2::AccessToken.create! :client => client, :owner => user
     end
     context 'with valid bearer token in header' do
       before do
@@ -28,15 +28,5 @@ describe ProtectedController do
       end
       it { should respond_with :unauthorized }
     end
-    context 'with valid bearer token in header and query string' do
-      before do
-      end
-      it 'raises error' do
-        lambda {
-          @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
-          get :index, :access_token => @token.token, :format => 'json'
-        }.should raise_error
-      end
-    end
   end
 end

data/spec/dummy/app/controllers/protected_controller.rb

@@ -1,6 +1,10 @@
 class ProtectedController < ApplicationController
-  before_filter :authenticate_user!
+
+  #before_action "authenticate_#{Rails.application.config.devise_oauth2_rails4.devise_scope}!"
+
   def index
-    render :nothing => true, :status => :ok
+    render :nothing => true, :status => :ok if current_oauth2_client
+    render nothing: true, status: 401 unless current_oauth2_client
   end
+
 end

data/spec/dummy/config/application.rb

@@ -32,6 +32,8 @@ module Dummy
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
+    config.eager_load = false
+
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = 'ede0a0440c0b53d6589668e54cf525f27305242a2b32b5dbbfc9e50dd7cb7af8da2b7d7c386b7d675283c0ecc4bb522ab4cc5b53edee8ed60f7482d4c22d0e22'
+Dummy::Application.config.secret_key_base = 'devise_oauth2_rails4'

data/spec/factories/client_factory.rb

@@ -1,7 +1,5 @@
 FactoryGirl.define do
   factory :client, :class => 'Devise::Oauth2::Client' do
-    name 'test'
-    website 'http://localhost'
     redirect_uri 'http://localhost:3000'
   end
 end

data/spec/factories/user_factory.rb

@@ -1,4 +1,6 @@
-#FactoryGirl.register_factory :user do |f|
-#  f.email 'ryan@socialcast.com'
-#  f.password 'test'
-#end
+FactoryGirl.define do
+  factory :user do |f|
+    f.email 'ryan@socialcast.com'
+    f.password 'test'
+  end
+end

data/spec/integration/oauth2_authorization_token_grant_type_strategy_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
-  describe 'POST /oauth2/token' do
+  describe 'POST /oauth/token' do
     describe 'with grant_type=authorization_code' do
       context 'with valid params' do
         with :client
         with :user
         before do
-          @authorization_code = user.authorization_codes.create!(:client => client, :redirect_uri => client.redirect_uri)
+          @authorization_code = user.authorization_codes.create!(:client => client, owner: user) #, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => client.identifier,
@@ -15,13 +15,13 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
             :code => @authorization_code.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 200 }
         it { response.content_type.should == 'application/json' }
         it 'returns json' do
-          token = Devise::Oauth2::AccessToken.last
-          refresh_token = Devise::Oauth2::RefreshToken.last
+          token = Devise::Oauth2::AccessToken.last # create(owner: user, client: client)
+          refresh_token = Devise::Oauth2::RefreshToken.last # .create(owner: user, client: client)
           expected = {
             :token_type => 'bearer',
             :expires_in => 899,
@@ -36,17 +36,17 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         with :user
         before do
           timenow = 2.days.from_now
-          Time.stub!(:now).and_return(timenow)
-          @authorization_code = user.authorization_codes.create(:client_id => client, :redirect_uri => client.redirect_uri)
+          Time.stub(:now).and_return(timenow)
+          @authorization_code = user.authorization_codes.create(:client_id => client) #, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => client.identifier,
             :client_secret => client.secret,
             :code => @authorization_code.token
           }
-          Time.stub!(:now).and_return(timenow + 10.minutes)
+          Time.stub(:now).and_return(timenow + 10.minutes)
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -62,7 +62,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         with :client
         with :user
         before do
-          @authorization_code = user.authorization_codes.create(:client_id => client, :redirect_uri => client.redirect_uri)
+          @authorization_code = user.authorization_codes.create(:client_id => client) #, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => client.identifier,
@@ -70,7 +70,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
             :code => 'invalid'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -86,7 +86,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         with :user
         with :client
         before do
-          @authorization_code = user.authorization_codes.create(:client_id => client, :redirect_uri => client.redirect_uri)
+          @authorization_code = user.authorization_codes.create(:client_id => client) #, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => client.identifier,
@@ -94,7 +94,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
             :code => @authorization_code.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -110,7 +110,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         with :user
         with :client
         before do
-          @authorization_code = user.authorization_codes.create(:client_id => client, :redirect_uri => client.redirect_uri)
+          @authorization_code = user.authorization_codes.create(:client_id => client) #, :redirect_uri => client.redirect_uri)
           params = {
             :grant_type => 'authorization_code',
             :client_id => 'invalid',
@@ -118,7 +118,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
             :code => @authorization_code.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }

data/spec/integration/oauth2_password_grant_type_strategy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
-  describe 'POST /oauth2/token' do
+  describe 'POST /oauth/token' do
     describe 'with grant_type=password' do
       context 'with valid params' do
         with :client
@@ -16,7 +16,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'test'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 200 }
         it { response.content_type.should == 'application/json' }
@@ -38,7 +38,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
           }
 
           auth_header = ActionController::HttpAuthentication::Basic.encode_credentials client.identifier, client.secret
-          post '/oauth2/token', params, 'HTTP_AUTHORIZATION' => auth_header
+          post '/oauth/token', params, 'HTTP_AUTHORIZATION' => auth_header
         end
         it { response.code.to_i.should == 200 }
         it { response.content_type.should == 'application/json' }
@@ -59,7 +59,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'test'
           }
           auth_header = ActionController::HttpAuthentication::Basic.encode_credentials 'invalid client id', client.secret
-          post '/oauth2/token', params, 'HTTP_AUTHORIZATION' => auth_header
+          post '/oauth/token', params, 'HTTP_AUTHORIZATION' => auth_header
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json'  }
@@ -81,7 +81,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'test'
           }
           auth_header = ActionController::HttpAuthentication::Basic.encode_credentials client.identifier, 'invalid secret'
-          post '/oauth2/token', params, 'HTTP_AUTHORIZATION' => auth_header
+          post '/oauth/token', params, 'HTTP_AUTHORIZATION' => auth_header
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json'  }
@@ -106,7 +106,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'bar'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json'  }
@@ -131,7 +131,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'test'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json'  }
@@ -156,7 +156,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
             :password => 'test'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json'  }

data/spec/integration/oauth2_refresh_token_grant_type_strategy_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
-  describe 'POST /oauth2/token' do
+  describe 'POST /oauth/token' do
     describe 'with grant_type=refresh_token' do
       context 'with valid params' do
         with :client
         with :user
         before do
-          @refresh_token = client.refresh_tokens.create! :user => user
+          @refresh_token = client.refresh_tokens.create! owner: user, client: client
           params = {
             :grant_type => 'refresh_token',
             :client_id => client.identifier,
@@ -15,13 +15,13 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
             :refresh_token => @refresh_token.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 200 }
         it { response.content_type.should == 'application/json' }
         it 'returns json' do
-          token = Devise::Oauth2::AccessToken.last
           refresh_token = @refresh_token
+          token = Devise::Oauth2::AccessToken.last # create!(owner: user, refresh_token: refresh_token, client: client)
           expected = {
             :token_type => 'bearer',
             :expires_in => 899,
@@ -36,17 +36,17 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         with :client
         before do
           timenow = 2.days.from_now
-          Time.stub!(:now).and_return(timenow)
-          @refresh_token = client.refresh_tokens.create! :user => user
+          Time.stub(:now).and_return(timenow)
+          @refresh_token = client.refresh_tokens.create! owner: user
           params = {
             :grant_type => 'refresh_token',
             :client_id => client.identifier,
             :client_secret => client.secret,
             :refresh_token => @refresh_token.token
           }
-          Time.stub!(:now).and_return(timenow + 2.months)
+          Time.stub(:now).and_return(timenow + 2.months)
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -62,7 +62,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         with :user
         with :client
         before do
-          @refresh_token = client.refresh_tokens.create! :user => user
+          @refresh_token = client.refresh_tokens.create! owner: user
           params = {
             :grant_type => 'refresh_token',
             :client_id => client.identifier,
@@ -70,7 +70,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
             :refresh_token => 'invalid'
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -88,7 +88,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         with :user
         with :client
         before do
-          @refresh_token = client.refresh_tokens.create! :user => user
+          @refresh_token = client.refresh_tokens.create! owner: user
           params = {
             :grant_type => 'refresh_token',
             :client_id => 'invalid',
@@ -96,7 +96,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
             :refresh_token => @refresh_token.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
@@ -112,7 +112,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         with :user
         with :client
         before do
-          @refresh_token = client.refresh_tokens.create! :user => user
+          @refresh_token = client.refresh_tokens.create! owner: user
           params = {
             :grant_type => 'refresh_token',
             :client_id => client.identifier,
@@ -120,7 +120,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
             :refresh_token => @refresh_token.token
           }
 
-          post '/oauth2/token', params
+          post '/oauth/token', params
         end
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }

data/spec/models/access_token_spec.rb

@@ -5,21 +5,19 @@ describe Devise::Oauth2::AccessToken do
 
   describe 'basic access token instance' do
     with :client
+    with :user
     subject do
-      Devise::Oauth2::AccessToken.create! :client => client
+      Devise::Oauth2::AccessToken.create! :client => client, owner: user
     end
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
-    it { should belong_to :user }
-    it { should allow_mass_assignment_of :user }
+    it { should belong_to :owner }
     it { should belong_to :client }
-    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should belong_to :refresh_token }
-    it { should allow_mass_assignment_of :refresh_token }
     it { should have_db_index :client_id }
-    it { should have_db_index :user_id }
+    it { should have_db_index :owner_id }
     it { should have_db_index(:token).unique(true) }
     it { should have_db_index :expires_at }
   end

data/spec/models/authorization_code_spec.rb

@@ -3,19 +3,18 @@ require 'spec_helper'
 describe Devise::Oauth2::AuthorizationCode do
   describe 'basic authorization code instance' do
     with :client
+    with :user
     subject do
-      Devise::Oauth2::AuthorizationCode.create! :client => client
+      Devise::Oauth2::AuthorizationCode.create! :client => client, owner: user
     end
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
-    it { should belong_to :user }
-    it { should allow_mass_assignment_of :user }
+    it { should belong_to :owner }
     it { should belong_to :client }
-    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should have_db_index :client_id }
-    it { should have_db_index :user_id }
+    it { should have_db_index :owner_id }
     it { should have_db_index(:token).unique(true) }
     it { should have_db_index :expires_at }
   end

data/spec/models/client_spec.rb

@@ -6,16 +6,8 @@ describe Devise::Oauth2::Client do
   describe 'basic client instance' do
     with :client
     subject { client }
-    it { should validate_presence_of :name }
-    it { should validate_uniqueness_of :name }
-    it { should allow_mass_assignment_of :name }
-    it { should validate_presence_of :website }
-    it { should allow_mass_assignment_of :website }
-    it { should allow_mass_assignment_of :redirect_uri }
     it { should validate_uniqueness_of :identifier }
     it { should have_db_index(:identifier).unique(true) }
-    it { should_not allow_mass_assignment_of :identifier }
-    it { should_not allow_mass_assignment_of :secret }
     it { should have_many :refresh_tokens }
     it { should have_many :authorization_codes }
   end

data/spec/models/refresh_token_spec.rb

@@ -5,21 +5,19 @@ describe Devise::Oauth2::RefreshToken do
 
   describe 'basic refresh token instance' do
     with :client
+    with :user
     subject do
-      Devise::Oauth2::RefreshToken.create! :client => client
+      Devise::Oauth2::RefreshToken.create! :client => client, owner: user
     end
     it { should validate_presence_of :token }
     it { should validate_uniqueness_of :token }
-    it { should belong_to :user }
-    it { should allow_mass_assignment_of :user }
+    it { should belong_to :owner }
     it { should belong_to :client }
-    it { should allow_mass_assignment_of :client }
     it { should validate_presence_of :client }
     it { should validate_presence_of :expires_at }
     it { should have_many :access_tokens }
-    it { should allow_mass_assignment_of :access_tokens }
     it { should have_db_index :client_id }
-    it { should have_db_index :user_id }
+    it { should have_db_index :owner_id }
     it { should have_db_index(:token).unique(true) }
     it { should have_db_index :expires_at }
   end

data/spec/routing/authorizations_routing_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Devise::Oauth2::AuthorizationsController do
   describe 'routing' do
-    pending 'routes POST /oauth2/authorizations' do
-      post('/oauth2/authorizations').should route_to('devise/oauth2_providable/authorizations#create')
+    pending 'routes POST /oauth/authorizations' do
+      post('/oauth/authorizations').should route_to('devise/oauth2_providable/authorizations#create')
     end
-    pending 'routes GET /oauth2/authorize' do
-      get('/oauth2/authorize').should route_to('devise/oauth2_providable/authorizations#new')
+    pending 'routes GET /oauth/authorize' do
+      get('/oauth/authorize').should route_to('devise/oauth2_providable/authorizations#new')
     end
     pending 'routes POST /oauth2/authorize' do
       #FIXME: this is valid, but the route is not being loaded into the test

data/spec/support/inject_engine_routes_into_application.rb

@@ -1,6 +1,6 @@
 # see http://www.builtfromsource.com/2011/09/21/testing-routes-with-rails-3-1-engines/
 module Devise
-  module Oauth2Providable
+  module Oauth2
     module EngineHacks
       ##
       # Automatically append all of the current engine's routes to the main
@@ -23,7 +23,7 @@ module Devise
         engine = ("#{engine_name}::Engine").constantize
 
         engine_name = 'oauth2'
-        engine = Devise::Oauth2Providable::Engine
+        engine = Devise::Oauth2::Engine
         named_routes   = engine.routes.named_routes.routes
         resourced_routes = []
 
@@ -71,4 +71,4 @@ module Devise
   end
 end
 
-# Rails::Engine.send(:include, Devise::Oauth2Providable::EngineHacks)
+# Rails::Engine.send(:include, Devise::Oauth2::EngineHacks)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_oauth2_rails4
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Brian Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -357,4 +357,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/inject_engine_routes_into_application.rb
 - spec/support/match_json.rb
-has_rdoc: