diff --git a/pkg/service/security.go b/pkg/service/security.go index 8bc2efb..2896aca 100644 --- a/pkg/service/security.go +++ b/pkg/service/security.go @@ -17,10 +17,12 @@ var ( // Submissions roles bitflag type Roles int32 var ( + RolesSubmissionUpload Roles = 1<<6 + RolesSubmissionReview Roles = 1<<5 RolesSubmissionRelease Roles = 1<<4 RolesScriptWrite Roles = 1<<3 - RolesMapUpload Roles = 1<<2 - RolesMapReview Roles = 1<<1 + RolesMapfixUpload Roles = 1<<2 + RolesMapfixReview Roles = 1<<1 RolesMapDownload Roles = 1<<0 RolesEmpty Roles = 0 ) @@ -32,13 +34,13 @@ var ( RoleQuat GroupRole = 255 RoleItzaname GroupRole = 254 RoleStagingDeveloper GroupRole = 240 - RolesAll Roles = RolesScriptWrite|RolesSubmissionRelease|RolesMapUpload|RolesMapReview|RolesMapDownload + RolesAll Roles = ^RolesEmpty // has SubmissionUpload RoleMapAdmin GroupRole = 128 - RolesMapAdmin Roles = RolesSubmissionRelease|RolesMapUpload|RolesMapReview|RolesMapDownload - // has SubmissionReview + RolesMapAdmin Roles = RolesSubmissionRelease|RolesSubmissionUpload|RolesSubmissionReview|RolesMapCouncil + // has MapfixReview RoleMapCouncil GroupRole = 64 - RolesMapCouncil Roles = RolesMapReview|RolesMapUpload|RolesMapDownload + RolesMapCouncil Roles = RolesMapfixReview|RolesMapfixUpload|RolesMapAccess // access to downloading maps RoleMapAccess GroupRole = 32 RolesMapAccess Roles = RolesMapDownload @@ -129,10 +131,10 @@ func (usr UserInfoHandle) GetRoles() (Roles, error) { // RoleThumbnail func (usr UserInfoHandle) HasRoleMapfixUpload() (bool, error) { - return usr.hasRoles(RolesMapUpload) + return usr.hasRoles(RolesMapfixUpload) } func (usr UserInfoHandle) HasRoleMapfixReview() (bool, error) { - return usr.hasRoles(RolesMapReview) + return usr.hasRoles(RolesMapfixReview) } func (usr UserInfoHandle) HasRoleMapDownload() (bool, error) { return usr.hasRoles(RolesMapDownload) @@ -141,10 +143,10 @@ func (usr UserInfoHandle) HasRoleSubmissionRelease() (bool, error) { return usr.hasRoles(RolesSubmissionRelease) } func (usr UserInfoHandle) HasRoleSubmissionUpload() (bool, error) { - return usr.hasRoles(RolesMapUpload) + return usr.hasRoles(RolesSubmissionUpload) } func (usr UserInfoHandle) HasRoleSubmissionReview() (bool, error) { - return usr.hasRoles(RolesMapReview) + return usr.hasRoles(RolesSubmissionReview) } func (usr UserInfoHandle) HasRoleScriptWrite() (bool, error) { return usr.hasRoles(RolesScriptWrite)