From 64341fdc231022e35c50efaf047c3bc084f0fa7a Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Thu, 9 Dec 2021 16:54:06 +0800 Subject: [PATCH] fix(swagger): remote api_secret field form api_key api --- apps/emqx_management/src/emqx_mgmt_api_app.erl | 8 ++++---- apps/emqx_management/src/emqx_mgmt_auth.erl | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/emqx_management/src/emqx_mgmt_api_app.erl b/apps/emqx_management/src/emqx_mgmt_api_app.erl index fdf48b8c6..b77f1a214 100644 --- a/apps/emqx_management/src/emqx_mgmt_api_app.erl +++ b/apps/emqx_management/src/emqx_mgmt_api_app.erl @@ -36,9 +36,9 @@ schema("/api_key") -> #{ 'operationId' => api_key, get => #{ - description => "Return api_keys list", + description => "Return api_key list", responses => #{ - 200 => hoconsc:ref(app) + 200 => delete([api_secret], fields(app)) } }, post => #{ @@ -56,7 +56,7 @@ schema("/api_key/:name") -> description => "Return the specific api_key", parameters => [hoconsc:ref(name)], responses => #{ - 200 => hoconsc:ref(app) + 200 => delete([api_secret], fields(app)) } }, put => #{ @@ -64,7 +64,7 @@ schema("/api_key/:name") -> parameters => [hoconsc:ref(name)], 'requestBody' => delete([created_at, api_key, api_secret, name], fields(app)), responses => #{ - 200 => hoconsc:ref(app) + 200 => delete([api_secret], fields(app)) } }, delete => #{ diff --git a/apps/emqx_management/src/emqx_mgmt_auth.erl b/apps/emqx_management/src/emqx_mgmt_auth.erl index 0b6a205ea..ae6b0820d 100644 --- a/apps/emqx_management/src/emqx_mgmt_auth.erl +++ b/apps/emqx_management/src/emqx_mgmt_auth.erl @@ -32,14 +32,14 @@ -define(APP, emqx_app). -record(?APP, { - name = <<>> :: binary(), - api_key = <<>> :: binary(), - api_secret_hash = <<>> :: binary(), - enable = true :: boolean(), - desc = <<>> :: binary(), - expired_at = 0 :: integer(), - created_at = 0 :: integer() -}). + name = <<>> :: binary() | '_', + api_key = <<>> :: binary() | '_', + api_secret_hash = <<>> :: binary() | '_', + enable = true :: boolean() | '_', + desc = <<>> :: binary() | '_', + expired_at = 0 :: integer() | '_', + created_at = 0 :: integer() | '_' + }). mnesia(boot) -> ok = mria:create_table(?APP, [