Enforce Go style rules across codebase
Apply five style rules: convert iota string enums to typed string constants, replace errors.As with errors.AsType, merge three-group imports into two groups, fix multiline parameter/argument formatting, and replace fmt.Sprintf URL construction with net/url. Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
@@ -646,8 +646,7 @@ func (s AuthService) SendMagicLink(ctx context.Context, req *SendMagicLinkReques
|
||||
func (s AuthService) GetMagicLinkEmail(ctx context.Context, tokenString string) (mail.Addr, error) {
|
||||
payload, err := statelesstoken.ValidateToken[MagicLinkData](s.tokenSecret, TokenTypeMagicLink, tokenString)
|
||||
if err != nil {
|
||||
var errExpired *statelesstoken.ErrExpiredToken
|
||||
if errors.As(err, &errExpired) {
|
||||
if _, ok := errors.AsType[*statelesstoken.ErrExpiredToken](err); ok {
|
||||
return mail.Nil, NewExpiredTokenError()
|
||||
}
|
||||
|
||||
@@ -666,8 +665,7 @@ func (s AuthService) OpenSessionWithMagicLink(ctx context.Context, tokenString s
|
||||
|
||||
payload, err := statelesstoken.ValidateToken[MagicLinkData](s.tokenSecret, TokenTypeMagicLink, tokenString)
|
||||
if err != nil {
|
||||
var errExpired *statelesstoken.ErrExpiredToken
|
||||
if errors.As(err, &errExpired) {
|
||||
if _, ok := errors.AsType[*statelesstoken.ErrExpiredToken](err); ok {
|
||||
return nil, nil, nil, NewExpiredTokenError()
|
||||
}
|
||||
|
||||
|
||||
@@ -101,12 +101,11 @@ func (a *Authorizer) authorize(ctx context.Context, tx pg.Tx, params AuthorizePa
|
||||
*params.Session,
|
||||
membership.ID,
|
||||
); err != nil {
|
||||
var (
|
||||
errSessionNotFound *ErrSessionNotFound
|
||||
errSessionExpired *ErrSessionExpired
|
||||
)
|
||||
if _, ok := errors.AsType[*ErrSessionNotFound](err); ok {
|
||||
return NewAssumptionRequiredError(params.Principal, membership.ID)
|
||||
}
|
||||
|
||||
if errors.As(err, &errSessionNotFound) || errors.As(err, &errSessionExpired) {
|
||||
if _, ok := errors.AsType[*ErrSessionExpired](err); ok {
|
||||
return NewAssumptionRequiredError(params.Principal, membership.ID)
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"go.probo.inc/probo/pkg/iam/policy"
|
||||
)
|
||||
|
||||
|
||||
@@ -23,11 +23,10 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
admin "google.golang.org/api/admin/directory/v1"
|
||||
"google.golang.org/api/option"
|
||||
|
||||
scimclient "go.probo.inc/probo/pkg/iam/scim/bridge/client"
|
||||
"go.probo.inc/probo/pkg/iam/scim/bridge/provider"
|
||||
admin "google.golang.org/api/admin/directory/v1"
|
||||
"google.golang.org/api/option"
|
||||
)
|
||||
|
||||
var _ provider.Provider = (*Provider)(nil)
|
||||
|
||||
Reference in New Issue
Block a user