doorkeeper 0.1.1 → 0.2.0

data/app/models/access_token.rb

@@ -1,7 +1,7 @@
 class AccessToken < ActiveRecord::Base
   include Doorkeeper::OAuth::RandomString
 
-  self.table_name = "oauth_access_tokens"
+  set_table_name :oauth_access_tokens
 
   belongs_to :application
 
@@ -9,9 +9,16 @@ class AccessToken < ActiveRecord::Base
 
   validates :application_id, :resource_owner_id, :token, :presence => true
 
+  attr_accessor :use_refresh_token
+
   before_validation :generate_token, :on => :create
+  before_validation :generate_refresh_token, :on => :create, :if => :use_refresh_token?
+
+  def self.authorized_for(application_id, resource_owner_id)
+    accessible.where(:application_id => application_id, :resource_owner_id => resource_owner_id).first
+  end
 
-  def revoke!
+  def revoke
     update_attribute :revoked_at, DateTime.now
   end
 
@@ -20,15 +27,36 @@ class AccessToken < ActiveRecord::Base
   end
 
   def expired?
-    self.expires_at.present? && DateTime.now > self.expires_at
+    expires_in.present? && Time.now > expired_time
   end
 
   def accessible?
     !expired? && !revoked?
   end
 
+  def scopes
+    scope_string = self[:scopes] || ""
+    scope_string.split(" ").map(&:to_sym)
+  end
+
+  def scopes_string
+    self[:scopes]
+  end
+
+  def use_refresh_token?
+    self.use_refresh_token
+  end
+
   private
 
+  def expired_time
+    self.created_at + expires_in.seconds
+  end
+
+  def generate_refresh_token
+    self.refresh_token = unique_random_string_for(:refresh_token)
+  end
+
   def generate_token
     self.token = unique_random_string_for(:token)
   end

data/app/models/access_token.rbc

@@ -78,7 +78,7 @@ x
 11
 AccessToken
 i
-189
+209
 5
 66
 5
@@ -97,16 +97,11 @@ i
 5
 7
 5
-64
-13
-18
-2
 47
 49
 6
 1
 15
-15
 5
 7
 7
@@ -200,72 +195,97 @@ i
 7
 26
 65
-67
+5
 49
 27
+4
+15
+99
+7
+28
+7
+29
+65
+67
+49
+30
 0
 49
-28
+31
 4
 15
 99
 7
-29
+32
 7
-30
+33
 65
 67
 49
-27
+30
 0
 49
-28
+31
 4
 15
 99
 7
-31
+34
 7
-32
+35
 65
 67
 49
-27
+30
 0
 49
-28
+31
 4
 15
 99
 7
-33
+36
 7
-34
+37
 65
 67
 49
-27
+30
 0
 49
-28
+31
 4
 15
 5
 48
-35
+38
+15
+99
+7
+39
+7
+40
+65
+67
+49
+30
+0
+49
+31
+4
 15
 99
 7
 21
 7
-36
+41
 65
 67
 49
-27
+30
 0
 49
-28
+31
 4
 11
 I
@@ -278,7 +298,7 @@ I
 0
 n
 p
-37
+42
 x
 10
 Doorkeeper
@@ -292,12 +312,12 @@ RandomString
 x
 7
 include
-s
+x
 19
 oauth_access_tokens
 x
-11
-table_name=
+14
+set_table_name
 x
 11
 application
@@ -353,15 +373,123 @@ x
 17
 before_validation
 x
-7
-revoke!
+14
+authorized_for
 M
 1
 n
 n
 x
+14
+authorized_for
+i
+35
+5
+48
+0
+44
+43
+1
+80
+49
+2
+1
+13
 7
-revoke!
+3
+20
+0
+49
+4
+2
+15
+13
+7
+5
+20
+1
+49
+4
+2
+15
+49
+6
+1
+49
+7
+0
+11
+I
+7
+I
+2
+I
+2
+I
+2
+n
+p
+8
+x
+10
+accessible
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+14
+application_id
+x
+3
+[]=
+x
+17
+resource_owner_id
+x
+5
+where
+x
+5
+first
+p
+5
+I
+-1
+I
+e
+I
+0
+I
+f
+I
+23
+x
+66
+/Users/felipeelias/Applicake/doorkeeper/app/models/access_token.rb
+p
+2
+x
+14
+application_id
+x
+17
+resource_owner_id
+x
+13
+attach_method
+x
+6
+revoke
+M
+1
+n
+n
+x
+6
+revoke
 i
 14
 5
@@ -407,11 +535,11 @@ p
 I
 -1
 I
-e
+12
 I
 0
 I
-f
+13
 I
 e
 x
@@ -467,11 +595,11 @@ p
 I
 -1
 I
-12
+16
 I
 0
 I
-13
+17
 I
 8
 x
@@ -490,17 +618,16 @@ x
 8
 expired?
 i
-24
+22
 5
-49
-0
+48
 0
 49
 1
 0
 13
 9
-23
+21
 15
 45
 2
@@ -509,11 +636,10 @@ i
 4
 0
 5
-49
-0
-0
-85
+48
 5
+85
+6
 11
 I
 2
@@ -525,21 +651,24 @@ I
 0
 n
 p
-6
+7
 x
 10
-expires_at
+expires_in
 x
 8
 present?
 x
-8
-DateTime
+4
+Time
 n
 x
 3
 now
 x
+12
+expired_time
+x
 1
 >
 p
@@ -547,13 +676,13 @@ p
 I
 -1
 I
-16
+1a
 I
 0
 I
-17
+1b
 I
-18
+16
 x
 66
 /Users/felipeelias/Applicake/doorkeeper/app/models/access_token.rb
@@ -620,11 +749,11 @@ p
 I
 -1
 I
-1a
+1e
 I
 0
 I
-1b
+1f
 I
 1b
 x
@@ -635,6 +764,71 @@ p
 x
 7
 private
+x
+12
+expired_time
+M
+1
+n
+n
+x
+12
+expired_time
+i
+13
+5
+49
+0
+0
+5
+48
+1
+49
+2
+0
+81
+3
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+10
+created_at
+x
+10
+expires_in
+x
+7
+seconds
+x
+1
++
+p
+5
+I
+-1
+I
+24
+I
+0
+I
+25
+I
+d
+x
+66
+/Users/felipeelias/Applicake/doorkeeper/app/models/access_token.rb
+p
+0
 M
 1
 n
@@ -686,15 +880,15 @@ p
 I
 -1
 I
-20
+28
 I
 0
 I
-23
+2b
 I
 1
 I
-21
+29
 I
 11
 x
@@ -703,7 +897,7 @@ x
 p
 0
 p
-27
+29
 I
 2
 I
@@ -711,53 +905,57 @@ I
 I
 f
 I
-23
-I
-10
-I
 4
 I
-1c
+17
 I
 6
 I
-24
+1f
 I
 8
 I
-40
+3b
 I
 a
 I
-5b
+56
 I
 c
 I
-73
+6e
 I
 e
 I
-81
+79
 I
 12
 I
-8f
+87
 I
 16
 I
-9d
+95
 I
 1a
 I
-ab
+a3
 I
 1e
 I
-af
+b1
 I
-20
+22
+I
+b5
+I
+24
+I
+c3
+I
+28
 I
-bd
+d1
 x
 66
 /Users/felipeelias/Applicake/doorkeeper/app/models/access_token.rb