fix tests

BRMatt · Oct 14, 2011 · 8c75f9b · 8c75f9b
1 parent 5317652
commit 8c75f9b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/app/models/devise/oauth2_providable/client.rb b/app/models/devise/oauth2_providable/client.rb
@@ -1,6 +1,7 @@
 class Devise::Oauth2Providable::Client < ActiveRecord::Base
   has_many :access_tokens
   has_many :refresh_tokens
+  has_many :authorization_codes
 
   before_validation :init_identifier, :on => :create, :unless => :identifier?
   before_validation :init_secret, :on => :create, :unless => :secret?

diff --git a/lib/devise/oauth2_providable/model.rb b/lib/devise/oauth2_providable/model.rb
@@ -5,8 +5,8 @@ module Models
     module Oauth2Providable
       extend ActiveSupport::Concern
       included do
-        has_many :access_tokens
-        has_many :authorization_codes
+        has_many :access_tokens, :class_name => 'Devise::Oauth2Providable::AccessToken'
+        has_many :authorization_codes, :class_name => 'Devise::Oauth2Providable::AuthorizationCode'
       end
     end
   end

diff --git a/lib/devise/oauth2_providable/strategies/oauth2_authorization_code_grant_type_strategy.rb b/lib/devise/oauth2_providable/strategies/oauth2_authorization_code_grant_type_strategy.rb
@@ -8,7 +8,7 @@ def grant_type
       end
 
       def authenticate!
-        if client && code = AuthorizationCode.valid.find_by_token(params[:code])
+        if client && code = client.authorization_codes.valid.find_by_token(params[:code])
           success! code.user
         elsif !halted?
           oauth_error! :invalid_grant, 'invalid authorization code request'

diff --git a/spec/integration/oauth2_refresh_token_grant_type_strategy_spec.rb b/spec/integration/oauth2_refresh_token_grant_type_strategy_spec.rb
@@ -6,7 +6,7 @@
       context 'with valid params' do
         before do
           @user = User.create! :email => 'ryan@socialcast.com', :password => 'test'
-          @client = Client.create! :name => 'example', :redirect_uri => 'http://localhost', :website => 'http://localhost'
+          @client = Devise::Oauth2Providable::Client.create! :name => 'example', :redirect_uri => 'http://localhost', :website => 'http://localhost'
           @refresh_token = @client.refresh_tokens.create! :user => @user
           params = {
             :grant_type => 'refresh_token',
@@ -20,7 +20,7 @@
         it { response.code.to_i.should == 200 }
         it { response.content_type.should == 'application/json' }
         it 'returns json' do
-          token = AccessToken.last
+          token = Devise::Oauth2Providable::AccessToken.last
           refresh_token = @refresh_token
           expected = {
             :token_type => 'bearer',
@@ -34,7 +34,7 @@
       context 'with invalid refresh_token' do
         before do
           @user = User.create! :email => 'ryan@socialcast.com', :password => 'test'
-          @client = Client.create! :name => 'example', :redirect_uri => 'http://localhost', :website => 'http://localhost'
+          @client = Devise::Oauth2Providable::Client.create! :name => 'example', :redirect_uri => 'http://localhost', :website => 'http://localhost'
           @refresh_token = @client.refresh_tokens.create! :user => @user
           params = {
             :grant_type => 'refresh_token',
@@ -48,7 +48,7 @@
         it { response.code.to_i.should == 400 }
         it { response.content_type.should == 'application/json' }
         it 'returns json' do
-          token = AccessToken.last
+          token = Devise::Oauth2Providable::AccessToken.last
           refresh_token = @refresh_token
           expected = {
             :error => 'invalid_grant',

diff --git a/spec/models/client_spec.rb b/spec/models/client_spec.rb
@@ -17,5 +17,6 @@
     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
 end