diff options
| author |  tsmethurst <tobi.smethurst@klarrio.com> | 2021-09-03 10:30:40 +0200 |
|---|---|---|
| committer | tsmethurst <tobi.smethurst@klarrio.com> | 2021-09-03 10:30:40 +0200 |
| commit | a1166768149ef9d6c948c73b07190008e3207999 (patch) | |
| tree | ef1810c6507c148efc802747b3fdbb06ee35186b /internal/gtsmodel | |
| parent | readme typo (diff) | |
| download | gotosocial-a1166768149ef9d6c948c73b07190008e3207999.tar.xz | |
Review changes
Diffstat (limited to 'internal/gtsmodel')
| -rw-r--r-- | internal/gtsmodel/application.go | 4 | ||||
| -rw-r--r-- | internal/gtsmodel/token.go | 2 | ||||
| -rw-r--r-- | internal/gtsmodel/user.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/internal/gtsmodel/application.go b/internal/gtsmodel/application.go index 27ea61000..7ec71ec2e 100644 --- a/internal/gtsmodel/application.go +++ b/internal/gtsmodel/application.go @@ -29,7 +29,7 @@ type Application struct { Name string `validate:"required" bun:",nullzero,notnull"` // name of the application given when it was created (eg., 'tusky') Website string `validate:"omitempty,url" bun:",nullzero"` // website for the application given when it was created (eg., 'https://tusky.app') RedirectURI string `validate:"required,uri" bun:",nullzero,notnull"` // redirect uri requested by the application for oauth2 flow - ClientID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // id of the associated oauth client entity in the db + ClientID string `validate:"required,ulid" bun:"type:CHAR(26),nullzero,notnull"` // id of the associated oauth client entity in the db ClientSecret string `validate:"required,uuid" bun:",nullzero,notnull"` // secret of the associated oauth client entity in the db - Scopes string `validate:"-" bun:",nullzero,notnull,default:'read'"` // scopes requested when this app was created + Scopes string `validate:"required" bun:",nullzero,notnull"` // scopes requested when this app was created } diff --git a/internal/gtsmodel/token.go b/internal/gtsmodel/token.go index 4188ea9eb..5fa96e915 100644 --- a/internal/gtsmodel/token.go +++ b/internal/gtsmodel/token.go @@ -28,7 +28,7 @@ type Token struct { 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,uri" bun:",nullzero,notnull"` // Oauth redirect URI for this token - Scope string `validate:"omitempty" bun:",nullzero,notnull,default:'read'"` // Oauth scope + Scope string `validate:"required" bun:",nullzero,notnull"` // 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 diff --git a/internal/gtsmodel/user.go b/internal/gtsmodel/user.go index 70f328619..28156cfdd 100644 --- a/internal/gtsmodel/user.go +++ b/internal/gtsmodel/user.go @@ -38,7 +38,7 @@ type User struct { CurrentSignInIP net.IP `validate:"-" bun:",nullzero"` // What's the most recent IP of this user LastSignInAt time.Time `validate:"-" bun:"type:timestamp,nullzero"` // When did this user last sign in? LastSignInIP net.IP `validate:"-" bun:",nullzero"` // What's the previous IP of this user? - SignInCount int `validate:"-" bun:",nullzero,notnull,default:0"` // How many times has this user signed in? + SignInCount int `validate:"min=0" bun:",nullzero,notnull,default:0"` // How many times has this user signed in? InviteID string `validate:"omitempty,ulid" bun:"type:CHAR(26),nullzero"` // id of the user who invited this user (who let this joker in?) ChosenLanguages []string `validate:"-" bun:",nullzero"` // What languages does this user want to see? FilteredLanguages []string `validate:"-" bun:",nullzero"` // What languages does this user not want to see? |