X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f5e7711b2b8b7f4d191b8fb47078cddd9c0c6727..b588c254853ab654a685669c36b21e05154b6571:/services/api/app/models/authorized_key.rb diff --git a/services/api/app/models/authorized_key.rb b/services/api/app/models/authorized_key.rb index e931fe77ba..afb33e60f8 100644 --- a/services/api/app/models/authorized_key.rb +++ b/services/api/app/models/authorized_key.rb @@ -2,20 +2,20 @@ class AuthorizedKey < ArvadosModel include AssignUuid include KindAndEtag include CommonApiTemplate - before_create :permission_to_set_authorized_user - before_update :permission_to_set_authorized_user + before_create :permission_to_set_authorized_user_uuid + before_update :permission_to_set_authorized_user_uuid - belongs_to :authorized_user, :foreign_key => :authorized_user, :class_name => 'User', :primary_key => :uuid + belongs_to :authorized_user, :foreign_key => :authorized_user_uuid, :class_name => 'User', :primary_key => :uuid - api_accessible :superuser, :extend => :common do |t| + api_accessible :user, extend: :common do |t| t.add :name t.add :key_type - t.add :authorized_user + t.add :authorized_user_uuid t.add :public_key t.add :expires_at end - def permission_to_set_authorized_user + def permission_to_set_authorized_user_uuid # Anonymous users cannot do anything here return false if !current_user @@ -23,7 +23,7 @@ class AuthorizedKey < ArvadosModel return true if current_user.is_admin # All users can attach keys to their own accounts - return true if current_user.uuid == authorized_user + return true if current_user.uuid == authorized_user_uuid # Default = deny. false