Make the storage service to use for avatars configurable

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 964359e9cd4cec972f596f08eec1b45c71de3fe2..023604801cbf49183279acd55449a587e54c1e50 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,7 +68,7 @@ class User < ApplicationRecord
   has_many :client_applications
   has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken"
 
   has_many :client_applications
   has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken"
 

-  has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :foreign_key => :owner_id
+  has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner

   has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id
   has_many :access_tokens, :class_name => Doorkeeper.config.access_token_model.name, :foreign_key => :resource_owner_id
 
   has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id
   has_many :access_tokens, :class_name => Doorkeeper.config.access_token_model.name, :foreign_key => :resource_owner_id
 


@@ -87,7 +87,7 @@ class User < ApplicationRecord
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
 
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
 

-  has_one_attached :avatar
+  has_one_attached :avatar, :service => Settings.avatar_storage

 
   validates :display_name, :presence => true, :length => 3..255,
                            :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]
 
   validates :display_name, :presence => true, :length => 3..255,
                            :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]


@@ -118,7 +118,6 @@ class User < ApplicationRecord
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check

-  after_save :reset_preferred_languages

 
   def to_param
     display_name
 
   def to_param
     display_name


@@ -179,10 +178,6 @@ class User < ApplicationRecord
     @preferred_languages ||= Locale.list(languages)
   end
 
     @preferred_languages ||= Locale.list(languages)
   end
 

-  def reset_preferred_languages
-    @preferred_languages = nil
-  end
-

   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)
   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)


@@ -288,11 +283,23 @@ class User < ApplicationRecord
   end
 
   ##
   end
 
   ##

-  # return an oauth access token for a specified application
+  # return an oauth 1 access token for a specified application

   def access_token(application_key)
     ClientApplication.find_by(:key => application_key).access_token_for_user(self)
   end
 
   def access_token(application_key)
     ClientApplication.find_by(:key => application_key).access_token_for_user(self)
   end
 

+  ##
+  # return an oauth 2 access token for a specified application
+  def oauth_token(application_id)
+    application = Doorkeeper.config.application_model.find_by(:uid => application_id)
+
+    Doorkeeper.config.access_token_model.find_or_create_for(
+      :application => application,
+      :resource_owner => self,
+      :scopes => application.scopes
+    )
+  end
+

   def fingerprint
     digest = Digest::SHA256.new
     digest.update(email)
   def fingerprint
     digest = Digest::SHA256.new
     digest.update(email)