Extract cookie config into authn pkg
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
@@ -58,11 +58,11 @@ func SessionDirective(ctx context.Context, obj any, next graphql.Resolver, requi
|
||||
func NewGraphQLHandler(svc *iam.Service, logger *log.Logger, baseURL *baseurl.BaseURL, cookieConfig securecookie.Config) http.Handler {
|
||||
config := schema.Config{
|
||||
Resolvers: &Resolver{
|
||||
authorize: authz.NewAuthorizeFunc(svc, logger),
|
||||
logger: logger,
|
||||
iam: svc,
|
||||
baseURL: baseURL,
|
||||
cookieConfig: cookieConfig,
|
||||
authorize: authz.NewAuthorizeFunc(svc, logger),
|
||||
logger: logger,
|
||||
iam: svc,
|
||||
baseURL: baseURL,
|
||||
sessionCookie: authn.NewCookie(&cookieConfig),
|
||||
},
|
||||
Directives: schema.DirectiveRoot{
|
||||
Session: SessionDirective,
|
||||
|
||||
@@ -19,7 +19,6 @@ package connect_v1
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"go.gearno.de/kit/log"
|
||||
@@ -34,27 +33,14 @@ import (
|
||||
|
||||
type (
|
||||
Resolver struct {
|
||||
authorize authz.AuthorizeFunc
|
||||
logger *log.Logger
|
||||
iam *iam.Service
|
||||
baseURL *baseurl.BaseURL
|
||||
cookieConfig securecookie.Config
|
||||
authorize authz.AuthorizeFunc
|
||||
logger *log.Logger
|
||||
iam *iam.Service
|
||||
baseURL *baseurl.BaseURL
|
||||
sessionCookie *authn.Cookie
|
||||
}
|
||||
)
|
||||
|
||||
func (r *Resolver) sessionCookieConfig(maxAge time.Duration) securecookie.Config {
|
||||
return securecookie.Config{
|
||||
Name: r.cookieConfig.Name,
|
||||
Secret: r.cookieConfig.Secret,
|
||||
Secure: r.cookieConfig.Secure,
|
||||
HTTPOnly: r.cookieConfig.HTTPOnly,
|
||||
SameSite: r.cookieConfig.SameSite,
|
||||
Path: r.cookieConfig.Path,
|
||||
Domain: r.cookieConfig.Domain,
|
||||
MaxAge: int(maxAge.Seconds()),
|
||||
}
|
||||
}
|
||||
|
||||
func NewMux(logger *log.Logger, svc *iam.Service, cookieConfig securecookie.Config, tokenSecret string, baseURL *baseurl.BaseURL) *chi.Mux {
|
||||
r := chi.NewMux()
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import (
|
||||
"go.probo.inc/probo/pkg/iam"
|
||||
"go.probo.inc/probo/pkg/mail"
|
||||
"go.probo.inc/probo/pkg/page"
|
||||
"go.probo.inc/probo/pkg/securecookie"
|
||||
"go.probo.inc/probo/pkg/server/api/authn"
|
||||
"go.probo.inc/probo/pkg/server/api/authz"
|
||||
"go.probo.inc/probo/pkg/server/api/connect/v1/schema"
|
||||
@@ -382,11 +381,7 @@ func (r *mutationResolver) SignIn(ctx context.Context, input types.SignInInput)
|
||||
}
|
||||
|
||||
w := gqlutils.HTTPResponseWriterFromContext(ctx)
|
||||
securecookie.Set(
|
||||
w,
|
||||
r.sessionCookieConfig(time.Until(session.ExpiredAt)),
|
||||
session.ID.String(),
|
||||
)
|
||||
r.sessionCookie.Set(w, session)
|
||||
|
||||
return &types.SignInPayload{
|
||||
Identity: types.NewIdentity(user),
|
||||
@@ -415,11 +410,7 @@ func (r *mutationResolver) SignUp(ctx context.Context, input types.SignUpInput)
|
||||
}
|
||||
|
||||
w := gqlutils.HTTPResponseWriterFromContext(ctx)
|
||||
securecookie.Set(
|
||||
w,
|
||||
r.sessionCookieConfig(time.Until(session.ExpiredAt)),
|
||||
session.ID.String(),
|
||||
)
|
||||
r.sessionCookie.Set(w, session)
|
||||
|
||||
return &types.SignUpPayload{
|
||||
Identity: types.NewIdentity(identity),
|
||||
@@ -481,11 +472,7 @@ func (r *mutationResolver) SignUpFromInvitation(ctx context.Context, input types
|
||||
}
|
||||
|
||||
w := gqlutils.HTTPResponseWriterFromContext(ctx)
|
||||
securecookie.Set(
|
||||
w,
|
||||
r.sessionCookieConfig(time.Until(session.ExpiredAt)),
|
||||
session.ID.String(),
|
||||
)
|
||||
r.sessionCookie.Set(w, session)
|
||||
|
||||
return &types.SignUpFromInvitationPayload{
|
||||
Identity: &types.Identity{
|
||||
|
||||
Reference in New Issue
Block a user