add support for hidden api keys, used in hosting scenarios
This commit is contained in:
parent
a9cda0f947
commit
6b10c4dc54
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue