admin/hspguard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: use config issuer for everything

Browse Source
This commit is contained in:
Amir Adal
2025-05-25 16:24:52 +02:00
parent 07b9b94143
commit 7d0ddd4d77
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/hspguard/api/api.go
View File

@ -55,7 +55,7 @@ func (s *APIServer) Run() error {
}) })
router.Get("/.well-known/jwks.json", oauthHandler.WriteJWKS) router.Get("/.well-known/jwks.json", oauthHandler.WriteJWKS)
router.Get("/.well-known/openid-configuration", oauth.OpenIdConfiguration) router.Get("/.well-known/openid-configuration", oauthHandler.OpenIdConfiguration)
router.Get("/*", func(w http.ResponseWriter, r *http.Request) { router.Get("/*", func(w http.ResponseWriter, r *http.Request) {
path := "./dist" + r.URL.Path path := "./dist" + r.URL.Path

4
internal/auth/routes.go
View File

@ -93,7 +93,7 @@ func (h *AuthHandler) login(w http.ResponseWriter, r *http.Request) {
UserEmail: user.Email, UserEmail: user.Email,
IsAdmin: user.IsAdmin, IsAdmin: user.IsAdmin,
RegisteredClaims: jwt.RegisteredClaims{ RegisteredClaims: jwt.RegisteredClaims{
Issuer: "hspguard", Issuer: h.cfg.Jwt.Issuer,
Subject: user.ID.String(), Subject: user.ID.String(),
IssuedAt: jwt.NewNumericDate(time.Now()), IssuedAt: jwt.NewNumericDate(time.Now()),
ExpiresAt: jwt.NewNumericDate(time.Now().Add(15 * time.Minute)), ExpiresAt: jwt.NewNumericDate(time.Now().Add(15 * time.Minute)),
@ -110,7 +110,7 @@ func (h *AuthHandler) login(w http.ResponseWriter, r *http.Request) {
UserEmail: user.Email, UserEmail: user.Email,
IsAdmin: user.IsAdmin, IsAdmin: user.IsAdmin,
RegisteredClaims: jwt.RegisteredClaims{ RegisteredClaims: jwt.RegisteredClaims{
Issuer: "hspguard", Issuer: h.cfg.Jwt.Issuer,
Subject: user.ID.String(), Subject: user.ID.String(),
IssuedAt: jwt.NewNumericDate(time.Now()), IssuedAt: jwt.NewNumericDate(time.Now()),
ExpiresAt: jwt.NewNumericDate(time.Now().Add(30 * 24 * time.Hour)), ExpiresAt: jwt.NewNumericDate(time.Now().Add(30 * 24 * time.Hour)),

4
internal/oauth/routes.go
View File

@ -64,7 +64,7 @@ func (h *OAuthHandler) WriteJWKS(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(jwks) json.NewEncoder(w).Encode(jwks)
} }
func OpenIdConfiguration(w http.ResponseWriter, r *http.Request) { func (h *OAuthHandler) OpenIdConfiguration(w http.ResponseWriter, r *http.Request) {
type Response struct { type Response struct {
TokenEndpoint string `json:"token_endpoint"` TokenEndpoint string `json:"token_endpoint"`
AuthorizationEndpoint string `json:"authorization_endpoint"` AuthorizationEndpoint string `json:"authorization_endpoint"`
@ -80,7 +80,7 @@ func OpenIdConfiguration(w http.ResponseWriter, r *http.Request) {
TokenEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/api/v1/oauth/token", TokenEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/api/v1/oauth/token",
AuthorizationEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/authorize", AuthorizationEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/authorize",
JwksURI: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/.well-known/jwks.json", JwksURI: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/.well-known/jwks.json",
Issuer: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app", Issuer: h.cfg.Jwt.Issuer,
EndSessionEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/api/v1/oauth/logout", EndSessionEndpoint: "https://cb5f-2a00-10-5b00-c801-e955-5c68-63d0-b777.ngrok-free.app/api/v1/oauth/logout",
}); err != nil { }); err != nil {
web.Error(w, "failed to encode response", http.StatusInternalServerError) web.Error(w, "failed to encode response", http.StatusInternalServerError)