Skip to content

Commit 69b03da

Browse files
authored
Merge pull request #1526 from CVEProject/dev
User Registry - Update 8/22
2 parents a918b6a + a4e205e commit 69b03da

38 files changed

Lines changed: 2760 additions & 1597 deletions

api-docs/openapi.json

Lines changed: 462 additions & 496 deletions
Large diffs are not rendered by default.

schemas/registry-org/update-registry-org-response.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
},
3232
"description": "Alternative names or aliases for the organization"
3333
},
34-
"cve_program_org_function": {
35-
"type": "string",
36-
"enum": ["CNA", "ADP", "Root", "Secretariat"],
37-
"description": "The organization's function within the CVE program"
38-
},
3934
"authority": {
4035
"type": "object",
4136
"properties": {
@@ -50,7 +45,7 @@
5045
"required": ["active_roles"]
5146
},
5247
"reports_to": {
53-
"type": ["string", "null"],
48+
"type": "string",
5449
"description": "UUID of the parent organization, if any"
5550
},
5651
"oversees": {

schemas/registry-user/create-registry-user-request.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"title": "CVE Create Registry User Request",
66
"description": "JSON Schema for creating a CVE Registry User",
77
"properties": {
8-
"user_id": {
8+
"username": {
99
"type": "string",
1010
"description": "User's identifier or username"
1111
},
@@ -75,7 +75,7 @@
7575
}
7676
},
7777
"required": [
78-
"user_id",
78+
"username",
7979
"name"
8080
]
8181
}

schemas/registry-user/create-registry-user-response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"type": "string",
1717
"description": "Unique identifier for the user"
1818
},
19-
"user_id": {
19+
"username": {
2020
"type": "string",
2121
"description": "User's identifier or username"
2222
},

schemas/registry-user/get-registry-user-response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "string",
1010
"description": "Unique identifier for the user"
1111
},
12-
"user_id": {
12+
"username": {
1313
"type": "string",
1414
"description": "User's identifier or username"
1515
},

schemas/registry-user/list-registry-users-response.json

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"type": "string",
3939
"description": "Unique identifier for the user"
4040
},
41-
"user_id": {
41+
"username": {
4242
"type": "string",
4343
"description": "User's identifier or username"
4444
},
@@ -64,47 +64,14 @@
6464
},
6565
"required": ["first", "last"]
6666
},
67-
"org_affiliations": {
68-
"type": "array",
69-
"items": {
70-
"type": "string"
71-
},
72-
"description": "UUIDs of organizations the user is affiliated with"
73-
},
74-
"cve_program_org_membership": {
75-
"type": "array",
76-
"items": {
77-
"type": "string"
78-
},
79-
"description": "UUIDs of CVE program organizations the user is a member of"
80-
},
81-
"authority": {
82-
"type": "object",
83-
"properties": {
84-
"active_roles": {
85-
"type": "array",
86-
"items": {
87-
"type": "string",
88-
"enum": ["ADMIN", "PUBLISHER"]
89-
}
90-
}
91-
},
92-
"required": ["active_roles"]
67+
"role": {
68+
"type": "string",
69+
"description": "Unique identifier for the user"
9370
},
9471
"secret": {
9572
"type": "string",
9673
"description": "Hashed secret for user authentication"
9774
},
98-
"last_active": {
99-
"type": ["string", "null"],
100-
"format": "date-time",
101-
"description": "Timestamp of the user's last activity"
102-
},
103-
"deactivation_date": {
104-
"type": ["string", "null"],
105-
"format": "date-time",
106-
"description": "Timestamp of when the user was deactivated, if applicable"
107-
},
10875
"contact_info": {
10976
"type": "object",
11077
"properties": {
@@ -120,9 +87,9 @@
12087
},
12188
"required": ["email"]
12289
},
123-
"in_use": {
124-
"type": "boolean",
125-
"description": "Indicates if the user account is currently active"
90+
"status": {
91+
"type":"string",
92+
"description": "Active or inactive"
12693
},
12794
"created": {
12895
"type": "string",

schemas/registry-user/update-registry-user-request.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"title": "CVE Update Registry User Request",
66
"description": "JSON Schema for updating a CVE Registry User",
77
"properties": {
8-
"user_id": {
8+
"username": {
99
"type": "string",
1010
"description": "User's identifier or username"
1111
},

schemas/registry-user/update-registry-user-response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"type": "string",
1717
"description": "Unique identifier for the user"
1818
},
19-
"user_id": {
19+
"username": {
2020
"type": "string",
2121
"description": "User's identifier or username"
2222
},

0 commit comments

Comments
 (0)