IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

add support for hidden api keys, used in hosting scenarios

Browse Source
This commit is contained in:
Sam 2014-11-20 15:38:20 +11:00
parent a9cda0f947
commit 6b10c4dc54
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/api_controller.rb
View File

@ -1,7 +1,7 @@
class Admin::ApiController < Admin::AdminController
def index
render_serialized(ApiKey.all.to_a, ApiKeySerializer)
render_serialized(ApiKey.where(hidden: false).to_a, ApiKeySerializer)
end
def regenerate_key

2
app/models/api_key.rb
View File

@ -12,7 +12,7 @@ class ApiKey < ActiveRecord::Base
end
def self.create_master_key
api_key = ApiKey.find_by(user_id: nil)
api_key = ApiKey.find_by(user_id: nil, hidden: false)
if api_key.blank?
api_key = ApiKey.create(key: SecureRandom.hex(32), created_by: Discourse.system_user)
end

7
db/migrate/20141120043401_add_hidden_to_api_keys.rb Normal file
View File

@ -0,0 +1,7 @@
class AddHiddenToApiKeys < ActiveRecord::Migration
def change
change_table :api_keys do |t|
t.boolean :hidden, null: false, default: false
end
end
end