Merge branch 'master' into master

permission/types/util.go

@@ -14,12 +14,12 @@
 
 package types
 
-// ConvertMapStringIntToPermissions converts a map of string-integer pairs and a slice of
-// strings for the roles to an AccountPermissions type.  The integer needs to be greater
-// than zero to set the permission.  For all unmentioned permissions the ZeroBasePermissions
-// is defaulted to.
-// TODO: [ben] re-evaluate the use of int for setting the permission.
-func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]int, roles []string) (*AccountPermissions, error) {
+// ConvertMapStringIntToPermissions converts a map of string-bool pairs and a slice of
+// strings for the roles to an AccountPermissions type. If the value in the
+// permissions map is true for a particular permission string then the permission
+// will be set in the AccountsPermissions. For all unmentioned permissions the
+// ZeroBasePermissions is defaulted to.
+func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]bool, roles []string) (*AccountPermissions, error) {
 	var err error
 	accountPermissions := &AccountPermissions{}
 	accountPermissions.Base, err = convertPermissionsMapStringIntToBasePermissions(permissions)
@@ -30,9 +30,9 @@ func ConvertPermissionsMapAndRolesToAccountPermissions(permissions map[string]in
 	return accountPermissions, nil
 }
 
-// convertPermissionsMapStringIntToBasePermissions converts a map of string-integer pairs to
-// BasePermissions.
-func convertPermissionsMapStringIntToBasePermissions(permissions map[string]int) (BasePermissions, error) {
+// convertPermissionsMapStringIntToBasePermissions converts a map of string-bool
+// pairs to BasePermissions.
+func convertPermissionsMapStringIntToBasePermissions(permissions map[string]bool) (BasePermissions, error) {
 	// initialise basePermissions as ZeroBasePermissions
 	basePermissions := ZeroBasePermissions
 
@@ -42,7 +42,7 @@ func convertPermissionsMapStringIntToBasePermissions(permissions map[string]int)
 			return basePermissions, err
 		}
 		// sets the permissions bitflag and the setbit flag for the permission.
-		basePermissions.Set(permissionsFlag, value > 0)
+		basePermissions.Set(permissionsFlag, value)
 	}
 
 	return basePermissions, nil