Skip to content

Commit 1aadeab

Browse files
committed
fix: authorization username and password
1 parent 9ac1042 commit 1aadeab

File tree

4 files changed

+55
-20
lines changed

4 files changed

+55
-20
lines changed

backend/schema/common.json

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,32 @@
3737
}
3838
]
3939
},
40+
"access_directive": {
41+
"description": "Access Directive",
42+
"type": "string",
43+
"enum": [
44+
"allow",
45+
"deny"
46+
],
47+
"example": "allow"
48+
},
49+
"authorization_username": {
50+
"description": "Username",
51+
"type": "string",
52+
"minLength": 1,
53+
"example": "admin"
54+
},
55+
"authorization_password": {
56+
"description": "Password",
57+
"type": "string",
58+
"example": "pass"
59+
},
60+
"authorization_hint": {
61+
"description": "Password Hint",
62+
"type": "string",
63+
"minLength": 1,
64+
"example": "p***"
65+
},
4066
"created_on": {
4167
"description": "Date and time of creation",
4268
"readOnly": true,
@@ -170,11 +196,10 @@
170196
"additionalProperties": false,
171197
"properties": {
172198
"username": {
173-
"type": "string",
174-
"minLength": 1
199+
"$ref": "#/properties/authorization_username"
175200
},
176201
"password": {
177-
"type": "string"
202+
"$ref": "#/properties/authorization_password"
178203
}
179204
},
180205
"example": {

backend/schema/components/access-list-object.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"$ref": "../common.json#/properties/access_list_id"
124124
},
125125
"address": {
126-
"$ref": "../common.json#/properties/access_address"
126+
"$ref": "../common.json#/properties/address"
127127
},
128128
"directive": {
129129
"$ref": "../common.json#/properties/access_directive"

backend/schema/paths/nginx/access-lists/get.json

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"operationId": "getAccessLists",
33
"summary": "Get all access lists",
4-
"tags": ["access-lists"],
4+
"tags": [
5+
"access-lists"
6+
],
57
"security": [
68
{
79
"bearerAuth": [
@@ -30,19 +32,21 @@
3032
"description": "200 response",
3133
"content": {
3234
"application/json": {
33-
"example": {
34-
"id": 1,
35-
"created_on": "2024-10-08T22:15:40.000Z",
36-
"modified_on": "2024-10-08T22:15:40.000Z",
37-
"owner_user_id": 1,
38-
"name": "test1234",
39-
"meta": {},
40-
"satisfy_any": true,
41-
"pass_auth": false,
42-
"proxy_host_count": 0
43-
},
35+
"example": [
36+
{
37+
"id": 1,
38+
"created_on": "2024-10-08T22:15:40.000Z",
39+
"modified_on": "2024-10-08T22:15:40.000Z",
40+
"owner_user_id": 1,
41+
"name": "test1234",
42+
"meta": {},
43+
"satisfy_any": true,
44+
"pass_auth": false,
45+
"proxy_host_count": 0
46+
}
47+
],
4448
"schema": {
45-
"$ref": "../../../components/access-list-object.json"
49+
"$ref": "../../../components/access-list-list.json"
4650
}
4751
}
4852
}

backend/schema/paths/nginx/access-lists/listID/put.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
22
"operationId": "updateAccessList",
33
"summary": "Update a Access List",
4-
"tags": ["access-lists"],
4+
"tags": [
5+
"access-lists"
6+
],
57
"security": [
68
{
7-
"bearerAuth": ["access_lists.manage"]
9+
"bearerAuth": [
10+
"access_lists.manage"
11+
]
812
}
913
],
1014
"parameters": [
@@ -93,7 +97,9 @@
9397
"name": "Administrator",
9498
"nickname": "some guy",
9599
"avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm",
96-
"roles": ["admin"]
100+
"roles": [
101+
"admin"
102+
]
97103
},
98104
"items": [
99105
{

0 commit comments

Comments
 (0)