Skip to content

[API] GET / SET User Settings #16169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jun 23, 2021
Merged

[API] GET / SET User Settings #16169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9c9f0ee
API: GET/SET User Settings
6543 Jun 16, 2021
2884713
Merge branch 'main' into api_user-settings
6543 Jun 16, 2021
230f01e
linter
6543 Jun 16, 2021
b87550a
Apply suggestions from code review
techknowlogick Jun 16, 2021
2005cc9
Update modules/structs/user.go
6543 Jun 16, 2021
6dbdc85
Merge branch 'master' into api_user-settings
6543 Jun 16, 2021
04fe58e
lint
6543 Jun 16, 2021
69ab63c
Merge branch 'master' into api_user-settings
6543 Jun 17, 2021
2a80654
fix swagger
6543 Jun 17, 2021
a4b40a2
move User2UserSettings to convert
6543 Jun 17, 2021
5ed38ae
as per @zeripath "preferences" -> "settings"
6543 Jun 17, 2021
3009e3f
Merge branch 'master' into api_user-settings
6543 Jun 17, 2021
f692f16
Merge branch 'main' into api_user-settings
6543 Jun 18, 2021
89dcfcf
Merge branch 'main' into api_user-settings
6543 Jun 20, 2021
d89ed56
Merge branch 'main' into api_user-settings
6543 Jun 20, 2021
f8ccc68
Merge branch 'main' into api_user-settings
6543 Jun 23, 2021
16631f3
Merge branch 'main' into api_user-settings
techknowlogick Jun 23, 2021
b179794
Merge branch 'main' into api_user-settings
techknowlogick Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
as per @zeripath "preferences" -> "settings"
  • Loading branch information
@6543
6543 committed Jun 17, 2021
commit 5ed38ae250ce8590d3040bb41c7623fe74954ae8
2 changes: 1 addition & 1 deletion routers/api/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ func Routes() *web.Route {

m.Group("/user", func() {
m.Get("", user.GetAuthenticatedUser)
m.Group("/preferences", func() {
m.Group("/settings", func() {
m.Get("", user.GetUserSettings)
m.Patch("", bind(api.UserSettingsOptions{}), user.UpdateUserSettings)
}, reqToken())
Expand Down
4 changes: 2 additions & 2 deletions routers/api/v1/user/preferences.go → routers/api/v1/user/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

// GetUserSettings returns user settings
func GetUserSettings(ctx *context.APIContext) {
// swagger:operation GET /user/preferences user getUserSettings
// swagger:operation GET /user/settings user getUserSettings
// ---
// summary: Get user settings
// produces:
Expand All @@ -29,7 +29,7 @@ func GetUserSettings(ctx *context.APIContext) {

// UpdateUserSettings returns user settings
func UpdateUserSettings(ctx *context.APIContext) {
// swagger:operation PATCH /user/preferences user updateUserSettings
// swagger:operation PATCH /user/settings user updateUserSettings
// ---
// summary: Update user settings
// parameters:
Expand Down
82 changes: 41 additions & 41 deletions templates/swagger/v1_json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10736,47 +10736,6 @@
}
}
},
"/user/preferences": {
"get": {
"produces": [
"application/json"
],
"tags": [
"user"
],
"summary": "Get user settings",
"operationId": "getUserSettings",
"responses": {
"200": {
"$ref": "#/responses/UserSettings"
}
}
},
"patch": {
"produces": [
"application/json"
],
"tags": [
"user"
],
"summary": "Update user settings",
"operationId": "updateUserSettings",
"parameters": [
{
"name": "body",
"in": "body",
"schema": {
"$ref": "#/definitions/UserSettingsOptions"
}
}
],
"responses": {
"200": {
"$ref": "#/responses/UserSettings"
}
}
}
},
"/user/repos": {
"get": {
"produces": [
Expand Down Expand Up @@ -10842,6 +10801,47 @@
}
}
},
"/user/settings": {
"get": {
"produces": [
"application/json"
],
"tags": [
"user"
],
"summary": "Get user settings",
"operationId": "getUserSettings",
"responses": {
"200": {
"$ref": "#/responses/UserSettings"
}
}
},
"patch": {
"produces": [
"application/json"
],
"tags": [
"user"
],
"summary": "Update user settings",
"operationId": "updateUserSettings",
"parameters": [
{
"name": "body",
"in": "body",
"schema": {
"$ref": "#/definitions/UserSettingsOptions"
}
}
],
"responses": {
"200": {
"$ref": "#/responses/UserSettings"
}
}
}
},
"/user/starred": {
"get": {
"produces": [
Expand Down