Merge pull request 'features/jwt-adustments' (#17) from features/jwt-adustments into main
Reviewed-on: #17
This commit is contained in:
commit
150c54c4bd
@ -3,5 +3,6 @@ package domain
|
||||
type EnvConfig struct {
|
||||
AdminToken string
|
||||
JwtSecret string
|
||||
ApiUri string
|
||||
DisableMigrationsOnStartUp bool
|
||||
}
|
||||
|
@ -84,7 +84,7 @@ func (h *Handler) AuthLogin(c echo.Context) error {
|
||||
return h.InternalServerErrorResponse(c, err.Error())
|
||||
}
|
||||
|
||||
token, err := h.generateJwt(username)
|
||||
token, err := h.generateJwt(username, h.Config.ApiUri)
|
||||
if err != nil {
|
||||
return h.InternalServerErrorResponse(c, err.Error())
|
||||
}
|
||||
|
@ -56,14 +56,16 @@ func (j JwtToken) hasScope(scope string) error {
|
||||
return errors.New(ErrJwtScopeMissing)
|
||||
}
|
||||
|
||||
func (h *Handler) generateJwt(username string) (string, error) {
|
||||
func (h *Handler) generateJwt(username, issuer string) (string, error) {
|
||||
secret := []byte(h.Config.JwtSecret)
|
||||
|
||||
// Anyone who wants to decrypt the key needs to use the same method
|
||||
token := jwt.New(jwt.SigningMethodHS256)
|
||||
claims := token.Claims.(jwt.MapClaims)
|
||||
claims["exp"] = time.Now().Add(10 * time.Minute)
|
||||
claims["authorized"] = true
|
||||
claims["username"] = username
|
||||
claims["iss"] = issuer
|
||||
|
||||
var scopes []string
|
||||
scopes = append(scopes, domain.ScopeRecipeRead)
|
||||
|
@ -16,7 +16,7 @@ func NewEnvConfig() domain.EnvConfig {
|
||||
log.Println(err)
|
||||
}
|
||||
|
||||
disableMigrations, err := strconv.ParseBool(os.Getenv("DisableMigrationsOnStartup"))
|
||||
disableMigrations, err := strconv.ParseBool(os.Getenv("DisableMigrationsOnStartup"))
|
||||
if err != nil {
|
||||
disableMigrations = false
|
||||
}
|
||||
@ -24,6 +24,7 @@ func NewEnvConfig() domain.EnvConfig {
|
||||
return domain.EnvConfig{
|
||||
AdminToken: os.Getenv("AdminToken"),
|
||||
JwtSecret: os.Getenv("JwtSecret"),
|
||||
ApiUri: os.Getenv("ApiUri"),
|
||||
DisableMigrationsOnStartUp: disableMigrations,
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user