Fix Roles For Quaternions #23

Merged
Quaternions merged 2 commits from roles into staging 2025-03-26 02:44:04 +00:00

@ -28,8 +28,10 @@ var (
type GroupRole int32 type GroupRole int32
var ( var (
// has ScriptWrite // has ScriptWrite
RoleQuat GroupRole = 240 RoleQuat GroupRole = 255
RolesQuat Roles = RolesScriptWrite|RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload RoleItzaname GroupRole = 254
RoleStagingDeveloper GroupRole = 240
RolesAll Roles = RolesScriptWrite|RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload
// has SubmissionPublish // has SubmissionPublish
RoleMapAdmin GroupRole = 128 RoleMapAdmin GroupRole = 128
RolesMapAdmin Roles = RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload RolesMapAdmin Roles = RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload
@ -103,22 +105,22 @@ func (usr UserInfoHandle) GetRoles() (Roles, error) {
SessionID: usr.sessionId, SessionID: usr.sessionId,
}) })
var rolesBitflag = RolesEmpty;
if err != nil { if err != nil {
return rolesBitflag, err return RolesEmpty, err
} }
// map roles into bitflag // map roles into bitflag
rolesBitflag := RolesEmpty;
for _, r := range roles.Roles { for _, r := range roles.Roles {
switch GroupRole(r.Rank){ switch GroupRole(r.Rank){
case RoleQuat: case RoleQuat, RoleItzaname, RoleStagingDeveloper:
rolesBitflag|=RolesQuat; rolesBitflag|=RolesAll
case RoleMapAdmin: case RoleMapAdmin:
rolesBitflag|=RolesMapAdmin; rolesBitflag|=RolesMapAdmin
case RoleMapCouncil: case RoleMapCouncil:
rolesBitflag|=RolesMapCouncil; rolesBitflag|=RolesMapCouncil
case RoleMapAccess: case RoleMapAccess:
rolesBitflag|=RolesMapAccess; rolesBitflag|=RolesMapAccess
} }
} }
return rolesBitflag, nil return rolesBitflag, nil