devise_oauth2_providable 0.2.3 → 0.2.4

data/app/models/authorization_code.rb

@@ -2,7 +2,6 @@ require 'expirable_token'
 
 class AuthorizationCode < ActiveRecord::Base
   include ExpirableToken
-
   def access_token
     @access_token ||= expired! && user.access_tokens.create(:client => client)
   end

data/lib/devise_oauth2_providable/schema.rb

@@ -12,7 +12,7 @@ module Devise
           t.string :secret
           t.timestamps
         end
-        migration.add_index :clients, :identifier
+        migration.add_index :clients, :identifier, :unique => true
 
         migration.create_table :access_tokens do |t|
           t.belongs_to :user, :client, :refresh_token
@@ -20,7 +20,7 @@ module Devise
           t.datetime :expires_at
           t.timestamps
         end
-        migration.add_index :access_tokens, :token
+        migration.add_index :access_tokens, :token, :unique => true
         migration.add_index :access_tokens, :expires_at
         migration.add_index :access_tokens, :user_id
         migration.add_index :access_tokens, :client_id
@@ -31,7 +31,7 @@ module Devise
           t.datetime :expires_at
           t.timestamps
         end
-        migration.add_index :refresh_tokens, :token
+        migration.add_index :refresh_tokens, :token, :unique => true
         migration.add_index :refresh_tokens, :expires_at
         migration.add_index :refresh_tokens, :user_id
         migration.add_index :refresh_tokens, :client_id
@@ -43,7 +43,7 @@ module Devise
           t.string :redirect_uri
           t.timestamps
         end
-        migration.add_index :authorization_codes, :token
+        migration.add_index :authorization_codes, :token, :unique => true
         migration.add_index :authorization_codes, :expires_at
         migration.add_index :authorization_codes, :user_id
         migration.add_index :authorization_codes, :client_id

data/lib/devise_oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/spec/rails_app/db/schema.rb

@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(:version => 20110511210926) do
 
   add_index "access_tokens", ["client_id"], :name => "index_access_tokens_on_client_id"
   add_index "access_tokens", ["expires_at"], :name => "index_access_tokens_on_expires_at"
-  add_index "access_tokens", ["token"], :name => "index_access_tokens_on_token"
+  add_index "access_tokens", ["token"], :name => "index_access_tokens_on_token", :unique => true
   add_index "access_tokens", ["user_id"], :name => "index_access_tokens_on_user_id"
 
   create_table "authorization_codes", :force => true do |t|
@@ -39,7 +39,7 @@ ActiveRecord::Schema.define(:version => 20110511210926) do
 
   add_index "authorization_codes", ["client_id"], :name => "index_authorization_codes_on_client_id"
   add_index "authorization_codes", ["expires_at"], :name => "index_authorization_codes_on_expires_at"
-  add_index "authorization_codes", ["token"], :name => "index_authorization_codes_on_token"
+  add_index "authorization_codes", ["token"], :name => "index_authorization_codes_on_token", :unique => true
   add_index "authorization_codes", ["user_id"], :name => "index_authorization_codes_on_user_id"
 
   create_table "clients", :force => true do |t|
@@ -52,7 +52,7 @@ ActiveRecord::Schema.define(:version => 20110511210926) do
     t.datetime "updated_at"
   end
 
-  add_index "clients", ["identifier"], :name => "index_clients_on_identifier"
+  add_index "clients", ["identifier"], :name => "index_clients_on_identifier", :unique => true
 
   create_table "refresh_tokens", :force => true do |t|
     t.integer  "user_id"
@@ -65,7 +65,7 @@ ActiveRecord::Schema.define(:version => 20110511210926) do
 
   add_index "refresh_tokens", ["client_id"], :name => "index_refresh_tokens_on_client_id"
   add_index "refresh_tokens", ["expires_at"], :name => "index_refresh_tokens_on_expires_at"
-  add_index "refresh_tokens", ["token"], :name => "index_refresh_tokens_on_token"
+  add_index "refresh_tokens", ["token"], :name => "index_refresh_tokens_on_token", :unique => true
   add_index "refresh_tokens", ["user_id"], :name => "index_refresh_tokens_on_user_id"
 
   create_table "users", :force => true do |t|

data/spec/rails_app/spec/controllers/protected_controller_spec.rb

@@ -15,6 +15,13 @@ describe ProtectedController do
       end
       it { should respond_with :ok }
     end
+    context 'with valid bearer token in query string' do
+      before do
+        get :index, :bearer_token => @token.token, :format => 'json'
+      end
+      it { should respond_with :ok }
+    end
+
     context 'with invalid bearer token in query param' do
       before do
         get :index, :bearer_token => 'invalid', :format => 'json'
@@ -23,10 +30,13 @@ describe ProtectedController do
     end
     context 'with valid bearer token in header and query string' do
       before do
-        @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
-        get :index, :bearer_token => @token.token, :format => 'json'
       end
-      it { should respond_with :unauthorized }
+      it 'raises error' do
+        lambda {
+          @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token.token}"
+          get :index, :bearer_token => @token.token, :format => 'json'
+        }.should raise_error
+      end
     end
   end
 end

data/spec/rails_app/spec/models/access_token_spec.rb

@@ -16,7 +16,7 @@ describe AccessToken do
     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 :token }
+    it { should have_db_index(:token).unique(true) }
     it { should have_db_index :expires_at }
   end
 

data/spec/rails_app/spec/models/authorization_code_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe AuthorizationCode do
+  describe 'basic authorization code instance' do
+    subject do
+      client = Client.create! :name => 'test', :redirect_uri => 'http://localhost:3000', :website => 'http://localhost'
+      AuthorizationCode.create! :client => client
+    end
+    it { should validate_presence_of :token }
+    it { should validate_uniqueness_of :token }
+    it { should belong_to :user }
+    it { should belong_to :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(:token).unique(true) }
+    it { should have_db_index :expires_at }
+  end
+end
+

data/spec/rails_app/spec/models/client_spec.rb

@@ -8,5 +8,6 @@ describe Client do
     it { should validate_presence_of :redirect_uri }
     it { should validate_uniqueness_of :identifier }
     it { should have_many :refresh_tokens }
+    it { should have_db_index(:identifier).unique(true) }
   end
 end

data/spec/rails_app/spec/models/refresh_token_spec.rb

@@ -15,7 +15,7 @@ describe RefreshToken do
     it { should have_many :access_tokens }
     it { should have_db_index :client_id }
     it { should have_db_index :user_id }
-    it { should have_db_index :token }
+    it { should have_db_index(:token).unique(true) }
     it { should have_db_index :expires_at }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_oauth2_providable
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -164,6 +164,7 @@ files:
 - spec/rails_app/spec/controllers/protected_controller_spec.rb
 - spec/rails_app/spec/integration/token_endpoint_spec.rb
 - spec/rails_app/spec/models/access_token_spec.rb
+- spec/rails_app/spec/models/authorization_code_spec.rb
 - spec/rails_app/spec/models/client_spec.rb
 - spec/rails_app/spec/models/refresh_token_spec.rb
 - spec/rails_app/spec/models/user_spec.rb
@@ -253,6 +254,7 @@ test_files:
 - spec/rails_app/spec/controllers/protected_controller_spec.rb
 - spec/rails_app/spec/integration/token_endpoint_spec.rb
 - spec/rails_app/spec/models/access_token_spec.rb
+- spec/rails_app/spec/models/authorization_code_spec.rb
 - spec/rails_app/spec/models/client_spec.rb
 - spec/rails_app/spec/models/refresh_token_spec.rb
 - spec/rails_app/spec/models/user_spec.rb