app/models/site/client.rb in social_stream-oauth2_server-2.0.3 vs app/models/site/client.rb in social_stream-oauth2_server-2.1.0
- old
+ new
@@ -2,16 +2,17 @@
validates_presence_of :url, :callback_url, :secret
before_validation :set_secret,
on: :create
- after_create :set_admin
+ after_create :set_manager
- scope :administered_by, lambda { |actor|
- joins(actor: :sent_ties).
+ scope :managed_by, lambda { |actor|
+ select("DISTINCT sites.*").
+ joins(actor: :sent_permissions).
merge(Contact.received_by(actor)).
- merge(Tie.related_by(Relation::Admin.instance))
+ merge(Permission.where(action: 'manage', object: nil))
}
%w{ url callback_url secret }.each do |m|
define_method m do
config[m]
@@ -30,9 +31,12 @@
def set_secret
self.secret = SecureRandom.hex(64)
end
- def set_admin
- contact_to!(author).relation_ids = [ Relation::Admin.instance.id ]
+ def set_manager
+ c = sent_contacts.create! receiver_id: author.id,
+ user_author: author
+
+ c.relation_ids = [ ::Relation::Manager.instance.id ]
end
end