diff --git a/auth/rest/router.go b/auth/rest/router.go index 93f6d109f..e846cc618 100644 --- a/auth/rest/router.go +++ b/auth/rest/router.go @@ -6,8 +6,10 @@ import ( "net/http" "github.com/crusttech/crust/auth/repository" - "github.com/crusttech/crust/auth/types" "github.com/crusttech/crust/internal/auth" + "github.com/crusttech/crust/internal/payload" + "github.com/crusttech/crust/internal/payload/outgoing" + "github.com/go-chi/chi" "github.com/titpetric/factory/resputil" @@ -17,8 +19,8 @@ import ( type ( checkResponse struct { - JWT string `json:"jwt"` - User *types.User `json:"user"` + JWT string `json:"jwt"` + User *outgoing.User `json:"user"` } ) @@ -48,7 +50,7 @@ func MountRoutes(oidcConfig *config.OIDC, jwtAuth jwtEncodeCookieSetter) func(ch if user, err := service.DefaultUser.With(ctx).FindByID(identity.Identity()); err == nil { resputil.JSON(w, checkResponse{ JWT: c.Value, - User: user, + User: payload.User(user), }) return diff --git a/internal/payload/outgoing.go b/internal/payload/outgoing.go index 20355dc84..b34e7fdca 100644 --- a/internal/payload/outgoing.go +++ b/internal/payload/outgoing.go @@ -105,6 +105,7 @@ func User(user *auth.User) *outgoing.User { Name: user.Name, Handle: user.Handle, Username: user.Username, + Email: user.Email, } } diff --git a/internal/payload/outgoing/user.go b/internal/payload/outgoing/user.go index 52470c24a..e21a14a1b 100644 --- a/internal/payload/outgoing/user.go +++ b/internal/payload/outgoing/user.go @@ -9,6 +9,7 @@ type ( // Channel to part (nil) for ALL channels ID string `json:"ID"` Name string `json:"name"` + Email string `json:"email"` Username string `json:"username"` Handle string `json:"handle"` Connections uint `json:"connections"`