Skip to content

Commit

Permalink
Add nil check on root message to each handwritten validation
Browse files Browse the repository at this point in the history
  • Loading branch information
josephschorr committed Dec 20, 2021
1 parent 6f78067 commit 3dedc2a
Showing 1 changed file with 37 additions and 25 deletions.
62 changes: 37 additions & 25 deletions proto/authzed/api/v1/00_handwritten_validation.go
Expand Up @@ -3,20 +3,25 @@
package v1

func (m *CheckPermissionRequest) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" {
return ObjectReferenceValidationError{
field: "ObjectId",
reason: "alphanumeric value is required",
}
}
if m.GetSubject() != nil {
return m.GetSubject().HandwrittenValidate()
}

return nil
return m.GetSubject().HandwrittenValidate()
}

func (m *ExpandPermissionTreeRequest) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" {
return ObjectReferenceValidationError{
field: "ObjectId",
Expand All @@ -28,27 +33,33 @@ func (m *ExpandPermissionTreeRequest) HandwrittenValidate() error {
}

func (m *Precondition) HandwrittenValidate() error {
if m.GetFilter() != nil {
return m.GetFilter().HandwrittenValidate()
if m == nil {
return nil
}

return nil
return m.GetFilter().HandwrittenValidate()
}

func (m *RelationshipFilter) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetOptionalResourceId() == "*" {
return RelationshipFilterValidationError{
field: "OptionalResourceId",
reason: "alphanumeric value is required",
}
}
if m.GetOptionalSubjectFilter() != nil {
return m.GetOptionalSubjectFilter().HandwrittenValidate()
}
return nil

return m.GetOptionalSubjectFilter().HandwrittenValidate()
}

func (m *SubjectFilter) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetOptionalSubjectId() == "*" && m.GetOptionalRelation() != nil && m.GetOptionalRelation().GetRelation() != "" {
return SubjectFilterValidationError{
field: "OptionalRelation",
Expand All @@ -59,10 +70,7 @@ func (m *SubjectFilter) HandwrittenValidate() error {
}

func (m *RelationshipUpdate) HandwrittenValidate() error {
if m.GetRelationship() != nil {
return m.GetRelationship().HandwrittenValidate()
}
return nil
return m.GetRelationship().HandwrittenValidate()
}

func (m *SubjectReference) HandwrittenValidate() error {
Expand All @@ -76,21 +84,25 @@ func (m *SubjectReference) HandwrittenValidate() error {
}

func (m *Relationship) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" {
return ObjectReferenceValidationError{
field: "ObjectId",
reason: "alphanumeric value is required",
}
}

if m.GetSubject() != nil {
return m.GetSubject().HandwrittenValidate()
}

return nil
return m.GetSubject().HandwrittenValidate()
}

func (m *DeleteRelationshipsRequest) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetOptionalPreconditions() != nil {
for _, precondition := range m.GetOptionalPreconditions() {
err := precondition.HandwrittenValidate()
Expand All @@ -100,14 +112,14 @@ func (m *DeleteRelationshipsRequest) HandwrittenValidate() error {
}
}

if m.GetRelationshipFilter() != nil {
return m.GetRelationshipFilter().HandwrittenValidate()
}

return nil
return m.GetRelationshipFilter().HandwrittenValidate()
}

func (m *WriteRelationshipsRequest) HandwrittenValidate() error {
if m == nil {
return nil
}

if m.GetOptionalPreconditions() != nil {
for _, precondition := range m.GetOptionalPreconditions() {
err := precondition.HandwrittenValidate()
Expand Down

0 comments on commit 3dedc2a

Please sign in to comment.