Commit 96c48fba authored by Sietse Ringers's avatar Sietse Ringers
Browse files

refactor: rename AttributeRequest field

parent aaf64db6
...@@ -173,9 +173,9 @@ type DisclosureChoice struct { ...@@ -173,9 +173,9 @@ type DisclosureChoice struct {
// An AttributeRequest asks for an instance of an attribute type, possibly requiring it to have // An AttributeRequest asks for an instance of an attribute type, possibly requiring it to have
// a specified value, in a session request. // a specified value, in a session request.
type AttributeRequest struct { type AttributeRequest struct {
Type AttributeTypeIdentifier `json:"type"` Type AttributeTypeIdentifier `json:"type"`
Value *string `json:"value,omitempty"` Value *string `json:"value,omitempty"`
Required bool `json:"required,omitempty"` NotNull bool `json:"notNull,omitempty"`
} }
var ( var (
...@@ -249,7 +249,7 @@ func (ar *AttributeRequest) UnmarshalJSON(bts []byte) error { ...@@ -249,7 +249,7 @@ func (ar *AttributeRequest) UnmarshalJSON(bts []byte) error {
} }
func (ar *AttributeRequest) MarshalJSON() ([]byte, error) { func (ar *AttributeRequest) MarshalJSON() ([]byte, error) {
if !ar.Required && ar.Value == nil { if !ar.NotNull && ar.Value == nil {
return json.Marshal(ar.Type) return json.Marshal(ar.Type)
} }
return json.Marshal((*jsonAttributeRequest)(ar)) return json.Marshal((*jsonAttributeRequest)(ar))
...@@ -258,7 +258,7 @@ func (ar *AttributeRequest) MarshalJSON() ([]byte, error) { ...@@ -258,7 +258,7 @@ func (ar *AttributeRequest) MarshalJSON() ([]byte, error) {
// Satisfy indicates whether the given attribute type and value satisfies this AttributeRequest. // Satisfy indicates whether the given attribute type and value satisfies this AttributeRequest.
func (ar *AttributeRequest) Satisfy(attr AttributeTypeIdentifier, val *string) bool { func (ar *AttributeRequest) Satisfy(attr AttributeTypeIdentifier, val *string) bool {
return ar.Type == attr && return ar.Type == attr &&
(!ar.Required || val != nil) && (!ar.NotNull || val != nil) &&
(ar.Value == nil || (val != nil && *ar.Value == *val)) (ar.Value == nil || (val != nil && *ar.Value == *val))
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment