Last touches to compatibility. Better auth and exposing the compatibility officer role to UserRoles

auth/permissions.go

@@ -48,7 +48,7 @@ var (
 		ID:          "9",
 		Description: "Allows user to manage tags",
 	}
-	RoleEditModCompatibility = &Role{
+	RoleEditAnyModCompatibility = &Role{
 		ID:          "10",
 		Description: "Allows user to edit any mod's compatibility info",
 	}
@@ -68,7 +68,7 @@ var (
 			RoleEditBootstrapVersions,
 			RoleEditAnnouncements,
 			RoleManageTags,
-			RoleEditModCompatibility,
+			RoleEditAnyModCompatibility,
 		},
 	}
 	GroupModerator = &Group{
@@ -79,7 +79,7 @@ var (
 			RoleApproveVersions,
 			RoleEditAnnouncements,
 			RoleManageTags,
-			RoleEditModCompatibility,
+			RoleEditAnyModCompatibility,
 		},
 	}
 	GroupSMLDev = &Group{
@@ -98,9 +98,9 @@ var (
 	}
 	GroupCompatibilityOfficer = &Group{
 		ID:   "5",
-		Name: "Compatibility Officier",
+		Name: "Compatibility Officer",
 		Roles: []*Role{
-			RoleEditModCompatibility,
+			RoleEditAnyModCompatibility,
 		},
 	}
 )

gql/directive.go

@@ -57,10 +57,24 @@ func canEditMod(ctx context.Context, obj interface{}, next graphql.Resolver, fie
 	return nil, errors.New("user not authorized to perform this action")
 }
 
-func canEditModCompatibility(ctx context.Context, obj interface{}, next graphql.Resolver) (res interface{}, err error) {
+func canEditModCompatibility(ctx context.Context, obj interface{}, next graphql.Resolver, field *string) (res interface{}, err error) {
 	user := ctx.Value(postgres.UserKey{}).(*postgres.User)
 
-	if user.Has(ctx, auth.RoleEditModCompatibility) {
+	if user.Has(ctx, auth.RoleEditAnyModCompatibility) || user.Has(ctx, auth.RoleEditAnyContent) {
+		return next(ctx)
+	}
+
+	if field == nil {
+		return nil, errors.New("user not authorized to perform this action")
+	}
+
+	dbMod := postgres.GetModByID(ctx, getArgument(ctx, *field).(string))
+
+	if dbMod == nil {
+		return nil, errors.New("mod not found")
+	}
+
+	if postgres.UserCanUploadModVersions(ctx, user, dbMod.ID) {
 		return next(ctx)
 	}
 

gql/resolver_users.go

@@ -213,6 +213,10 @@ func (r *userResolver) Roles(ctx context.Context, obj *generated.User) (*generat
 		userRoles.EditBootstrapVersions = true
 	}
 
+	if hasRole, ok := roles[auth.RoleEditAnyModCompatibility]; ok && hasRole {
+		userRoles.EditAnyModCompatibility = true
+	}
+
 	return userRoles, nil
 }
 

schemas/compatibility.graphql

@@ -25,6 +25,6 @@ input CompatibilityInfoInput {
 }
 
 extend type Mutation {
-    updateModCompatibility(modId: ModID!, compatibility: CompatibilityInfoInput!): Boolean! @canEditModCompatibility @isLoggedIn
+    updateModCompatibility(modId: ModID!, compatibility: CompatibilityInfoInput!): Boolean! @canEditModCompatibility(field: "modId") @isLoggedIn
     updateMultipleModCompatibilities(modIDs: [ModID!]!, compatibility: CompatibilityInfoInput!): Boolean! @canEditModCompatibility @isLoggedIn
 }

schemas/directives.graphql

@@ -5,8 +5,8 @@ directive @canEditMod(field: String!) on FIELD_DEFINITION
 directive @canEditVersion(field: String!) on FIELD_DEFINITION
 directive @canEditUser(field: String!, object: Boolean!) on FIELD_DEFINITION
 directive @canEditGuide(field: String!) on FIELD_DEFINITION
+directive @canEditModCompatibility(field: String) on FIELD_DEFINITION
 
-directive @canEditModCompatibility on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 directive @canApproveMods on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 directive @canApproveVersions on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 directive @canEditUsers on FIELD_DEFINITION | INPUT_FIELD_DEFINITION

schemas/user.graphql

@@ -10,6 +10,7 @@ type UserRoles {
     editUsers: Boolean!
     editSMLVersions: Boolean!
     editBootstrapVersions: Boolean!
+    editAnyModCompatibility: Boolean!
 }
 
 type Group {