rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix indentation after errors.AsType refactor

Browse Source 
Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
Émile Ré
2026-05-20 11:53:50 +04:00
parent f5703d390b
commit 3b20f466c3
4 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/server/api/authn/api_key_middleware.go
View File

@@ -62,31 +62,31 @@ func NewAPIKeyMiddleware(svc *iam.Service, tokenSecret string) func(next http.Ha
return
}
apiKey, err := svc.APIKeyService.GetAPIKey(ctx, keyID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrPersonalAPIKeyNotFound](err); ok {
next.ServeHTTP(w, r)
return
apiKey, err := svc.APIKeyService.GetAPIKey(ctx, keyID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrPersonalAPIKeyNotFound](err); ok {
next.ServeHTTP(w, r)
return
}
if _, ok := errors.AsType[*iam.ErrPersonalAPIKeyExpired](err); ok {
next.ServeHTTP(w, r)
return
}
panic(fmt.Errorf("cannot get personal API key: %w", err))
}
if _, ok := errors.AsType[*iam.ErrPersonalAPIKeyExpired](err); ok {
next.ServeHTTP(w, r)
return
identity, err := svc.AccountService.GetIdentity(ctx, apiKey.IdentityID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrIdentityNotFound](err); ok {
next.ServeHTTP(w, r)
return
}
panic(fmt.Errorf("cannot get identity: %w", err))
}
panic(fmt.Errorf("cannot get personal API key: %w", err))
}
identity, err := svc.AccountService.GetIdentity(ctx, apiKey.IdentityID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrIdentityNotFound](err); ok {
next.ServeHTTP(w, r)
return
}
panic(fmt.Errorf("cannot get identity: %w", err))
}
ctx = ContextWithAPIKey(ctx, apiKey)
ctx = ContextWithIdentity(ctx, identity)

50
pkg/server/api/authn/session_middleware.go
View File

@@ -65,37 +65,37 @@ func NewSessionMiddleware(svc *iam.Service, cookieConfig securecookie.Config) fu
return
}
session, err := svc.SessionService.GetSession(ctx, sessionID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrSessionNotFound](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
session, err := svc.SessionService.GetSession(ctx, sessionID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrSessionNotFound](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
return
return
}
if _, ok := errors.AsType[*iam.ErrSessionExpired](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
return
}
panic(fmt.Errorf("cannot get session: %w", err))
}
if _, ok := errors.AsType[*iam.ErrSessionExpired](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
identity, err := svc.AccountService.GetIdentity(ctx, session.IdentityID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrIdentityNotFound](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
return
return
}
panic(fmt.Errorf("cannot get identity: %w", err))
}
panic(fmt.Errorf("cannot get session: %w", err))
}
identity, err := svc.AccountService.GetIdentity(ctx, session.IdentityID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrIdentityNotFound](err); ok {
securecookie.Clear(w, cookieConfig)
next.ServeHTTP(w, r)
return
}
panic(fmt.Errorf("cannot get identity: %w", err))
}
userAgent := r.UserAgent()
// TODO: will work well when no layer 7 proxy is in front of the server
var ipAddress net.IP

24
pkg/server/api/trust/v1/auth_resolvers.go
View File

@@ -79,13 +79,13 @@ func (r *mutationResolver) VerifyMagicLink(ctx context.Context, input types.Veri
identity, session, continueURL, err = r.iam.AuthService.OpenSessionWithMagicLink(ctx, input.Token)
if err != nil {
if _, ok := errors.AsType[*iam.ErrExpiredToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrExpiredToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrInvalidToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrInvalidToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
r.logger.ErrorCtx(ctx, "cannot open session with magic link", log.Error(err))
@@ -101,13 +101,13 @@ func (r *mutationResolver) VerifyMagicLink(ctx context.Context, input types.Veri
identity, session, continueURL, err = r.iam.AuthService.OpenSessionWithMagicLink(ctx, input.Token)
if err != nil {
if _, ok := errors.AsType[*iam.ErrExpiredToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrExpiredToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrInvalidToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
if _, ok := errors.AsType[*iam.ErrInvalidToken](err); ok {
return nil, gqlutils.Invalid(ctx, err)
}
r.logger.ErrorCtx(ctx, "cannot open session with magic link", log.Error(err))