Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
accountserver
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai3
accountserver
Commits
fecc334c
Commit
fecc334c
authored
Jun 09, 2019
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace enable/disable_resource with a new set_resource_status API
parent
8466ed04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
14 deletions
+31
-14
actions_resource.go
actions_resource.go
+13
-12
server/server.go
server/server.go
+1
-2
types.go
types.go
+17
-0
No files found.
actions_resource.go
View file @
fecc334c
...
...
@@ -68,24 +68,25 @@ func setResourceStatus(rctx *RequestContext, status string) error {
return
nil
}
//
DisableResourceRequest disables a resource belonging to the user.
type
DisableResourceRequest
struct
{
ResourceRequestBase
}
//
SetResourceStatusRequest modifies the status of a resource
// belonging to the user (admin-only).
type
SetResourceStatusRequest
struct
{
AdminResourceRequestBase
// Serve the request.
func
(
r
*
DisableResourceRequest
)
Serve
(
rctx
*
RequestContext
)
(
interface
{},
error
)
{
return
nil
,
setResourceStatus
(
rctx
,
ResourceStatusInactive
)
Status
string
`json:"status"`
}
// EnableResourceRequest enables a resource belonging to the user (admin-only).
type
EnableResourceRequest
struct
{
AdminResourceRequestBase
// Validate the request.
func
(
r
*
SetResourceStatusRequest
)
Validate
(
rctx
*
RequestContext
)
error
{
if
!
isValidStatusByResourceType
(
rctx
.
Resource
.
Type
,
r
.
Status
)
{
return
errors
.
New
(
"invalid or unknown status"
)
}
return
nil
}
// Serve the request.
func
(
r
*
EnableResource
Request
)
Serve
(
rctx
*
RequestContext
)
(
interface
{},
error
)
{
return
nil
,
setResourceStatus
(
rctx
,
ResourceStatusActive
)
func
(
r
*
SetResourceStatus
Request
)
Serve
(
rctx
*
RequestContext
)
(
interface
{},
error
)
{
return
nil
,
setResourceStatus
(
rctx
,
r
.
Status
)
}
// ResetResourcePasswordRequest will reset the password associated
...
...
server/server.go
View file @
fecc334c
...
...
@@ -59,8 +59,7 @@ func New(service *as.AccountService, backend as.Backend) *APIServer {
s
.
Register
(
"/api/user/delete_app_specific_password"
,
&
as
.
DeleteApplicationSpecificPasswordRequest
{})
s
.
Register
(
"/api/resource/get"
,
&
as
.
GetResourceRequest
{})
s
.
Register
(
"/api/resource/search"
,
&
as
.
SearchResourceRequest
{})
s
.
Register
(
"/api/resource/enable"
,
&
as
.
EnableResourceRequest
{})
s
.
Register
(
"/api/resource/disable"
,
&
as
.
DisableResourceRequest
{})
s
.
Register
(
"/api/resource/set_status"
,
&
as
.
SetResourceStatusRequest
{})
s
.
Register
(
"/api/resource/create"
,
&
as
.
CreateResourcesRequest
{})
s
.
Register
(
"/api/resource/move"
,
&
as
.
MoveResourceRequest
{})
s
.
Register
(
"/api/resource/reset_password"
,
&
as
.
ResetPasswordRequest
{})
...
...
types.go
View file @
fecc334c
...
...
@@ -392,6 +392,23 @@ const (
ResourceStatusArchived
=
"archived"
)
// Returns true if the given status is valid for the given resource type.
func
isValidStatusByResourceType
(
rtype
,
rstatus
string
)
bool
{
switch
rtype
{
case
ResourceTypeEmail
,
ResourceTypeMailingList
:
switch
rstatus
{
case
ResourceStatusActive
,
ResourceStatusInactive
,
ResourceStatusReadonly
:
return
true
}
case
ResourceTypeWebsite
,
ResourceTypeDomain
,
ResourceTypeDAV
,
ResourceTypeDatabase
:
switch
rstatus
{
case
ResourceStatusActive
,
ResourceStatusInactive
,
ResourceStatusReadonly
,
ResourceStatusArchived
:
return
true
}
}
return
false
}
// ResourceID is an opaque ID that uniquely identifies a resource in
// the backend database. These should normally not be visible to users.
type
ResourceID
string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment