Handle expired confirmation tokens

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index b1f4022928fad8f6bf27a85de8a00ac1a694483c..0619e75a3695696ee3c04ed5ee3fee61cb88a5a8 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -2,7 +2,7 @@ require 'oauth'
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user

-  has_many :tokens, :class_name => "OauthToken"
+  has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all

   has_many :access_tokens
   has_many :oauth2_verifiers
   has_many :oauth_tokens
   has_many :access_tokens
   has_many :oauth2_verifiers
   has_many :oauth_tokens


@@ -16,7 +16,8 @@ class ClientApplication < ActiveRecord::Base
   attr_accessible :name, :url, :support_url, :callback_url,
                   :allow_read_prefs, :allow_write_prefs,
                   :allow_write_diary, :allow_write_api,
   attr_accessible :name, :url, :support_url, :callback_url,
                   :allow_read_prefs, :allow_write_prefs,
                   :allow_write_diary, :allow_write_api,

-                  :allow_read_gpx, :allow_write_gpx
+                  :allow_read_gpx, :allow_write_gpx,
+                  :allow_write_notes

 
   before_validation :generate_keys, :on => :create
 
 
   before_validation :generate_keys, :on => :create
 


@@ -87,7 +88,8 @@ protected
   # have to say up-front what permissions they want and when users sign up they
   # can agree or not agree to each of them.
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,
   # have to say up-front what permissions they want and when users sign up they
   # can agree or not agree to each of them.
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,

-                 :allow_write_api, :allow_read_gpx, :allow_write_gpx ]
+                 :allow_write_api, :allow_read_gpx, :allow_write_gpx,
+                 :allow_write_notes]

 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0,40]
 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0,40]