token tests

internal/gtsmodel/token.go

@@ -27,8 +27,8 @@ type Token struct {
 	UpdatedAt           time.Time `validate:"-" bun:"type:timestamp,nullzero,notnull,default:current_timestamp"` // when was item last updated
 	ClientID            string    `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"`                // ID of the client who owns this token
 	UserID              string    `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"`                // ID of the user who owns this token
-	RedirectURI         string    `validate:"required,url" bun:",nullzero,notnull"`                              // Oauth redirect URI for this token
+	RedirectURI         string    `validate:"required,uri" bun:",nullzero,notnull"`                              // Oauth redirect URI for this token
-	Scope               string    `validate:"omitempty,url" bun:",nullzero,notnull,default:'read'"`              // Oauth scope
+	Scope               string    `validate:"omitempty" bun:",nullzero,notnull,default:'read'"`                  // Oauth scope
 	Code                string    `validate:"-" bun:",pk,nullzero,notnull,default:''"`                           // Code, if present
 	CodeChallenge       string    `validate:"-" bun:",nullzero"`                                                 // Code challenge, if code present
 	CodeChallengeMethod string    `validate:"-" bun:",nullzero"`                                                 // Code challenge method, if code present

internal/validate/token_test.go

@@ -0,0 +1,99 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package validate_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/validate"
+)
+
+func happyToken() *gtsmodel.Token {
+	return &gtsmodel.Token{
+		ID:          "01FE91RJR88PSEEE30EV35QR8N",
+		CreatedAt:   time.Now(),
+		UpdatedAt:   time.Now(),
+		ClientID:    "01FEEDMF6C0QD589MRK7919Z0R",
+		UserID:      "01FEK0BFJKYXB4Y51RBQ7P5P79",
+		RedirectURI: "oauth2redirect://com.keylesspalace.tusky/",
+		Scope:       "read write follow",
+	}
+}
+
+type TokenValidateTestSuite struct {
+	suite.Suite
+}
+
+func (suite *TokenValidateTestSuite) TestValidateTokenHappyPath() {
+	// no problem here
+	a := happyToken()
+	err := validate.Struct(*a)
+	suite.NoError(err)
+}
+
+func (suite *TokenValidateTestSuite) TestValidateTokenBadID() {
+	a := happyToken()
+
+	a.ID = ""
+	err := validate.Struct(*a)
+	suite.EqualError(err, "Key: 'Token.ID' Error:Field validation for 'ID' failed on the 'required' tag")
+
+	a.ID = "01FE96W293ZPRG9FQQP48HK8N001FE96W32AT24VYBGM12WN3GKB"
+	err = validate.Struct(*a)
+	suite.EqualError(err, "Key: 'Token.ID' Error:Field validation for 'ID' failed on the 'ulid' tag")
+}
+
+func (suite *TokenValidateTestSuite) TestValidateTokenNoCreatedAt() {
+	a := happyToken()
+
+	a.CreatedAt = time.Time{}
+	err := validate.Struct(*a)
+	suite.NoError(err)
+}
+
+func (suite *TokenValidateTestSuite) TestValidateTokenRedirectURI() {
+	a := happyToken()
+
+	a.RedirectURI = "invalid-uri"
+	err := validate.Struct(*a)
+	suite.EqualError(err, "Key: 'Token.RedirectURI' Error:Field validation for 'RedirectURI' failed on the 'uri' tag")
+
+	a.RedirectURI = ""
+	err = validate.Struct(*a)
+	suite.EqualError(err, "Key: 'Token.RedirectURI' Error:Field validation for 'RedirectURI' failed on the 'required' tag")
+
+	a.RedirectURI = "urn:ietf:wg:oauth:2.0:oob"
+	err = validate.Struct(*a)
+	suite.NoError(err)
+}
+
+func (suite *TokenValidateTestSuite) TestValidateTokenScope() {
+	a := happyToken()
+
+	a.Scope = ""
+	err := validate.Struct(*a)
+	suite.NoError(err)
+}
+
+func TestTokenValidateTestSuite(t *testing.T) {
+	suite.Run(t, new(TokenValidateTestSuite))
+}