cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: move CAOS_OIDC_DEV to const (and ensure TestValidateIssuer runs (even on machines with env set))

Browse source
This commit is contained in:
Livio Amstutz 2020-10-07 08:49:23 +02:00
parent b311610d06
commit d6203fb0d5
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/op/config.go
View file

@ -7,6 +7,8 @@ import (
"strings" "strings"
) )
const OidcDevMode = "CAOS_OIDC_DEV"
type Configuration interface { type Configuration interface {
Issuer() string Issuer() string
AuthorizationEndpoint() Endpoint AuthorizationEndpoint() Endpoint
@ -42,7 +44,7 @@ func ValidateIssuer(issuer string) error {
} }
func devLocalAllowed(url *url.URL) bool { func devLocalAllowed(url *url.URL) bool {
_, b := os.LookupEnv("CAOS_OIDC_DEV") _, b := os.LookupEnv(OidcDevMode)
if !b { if !b {
return b return b
} }

4
pkg/op/config_test.go
View file

@ -60,6 +60,8 @@ func TestValidateIssuer(t *testing.T) {
true, true,
}, },
} }
//ensure env is not set
os.Unsetenv(OidcDevMode)
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if err := ValidateIssuer(tt.args.issuer); (err != nil) != tt.wantErr { if err := ValidateIssuer(tt.args.issuer); (err != nil) != tt.wantErr {
@ -84,7 +86,7 @@ func TestValidateIssuerDevLocalAllowed(t *testing.T) {
false, false,
}, },
} }
os.Setenv("CAOS_OIDC_DEV", "") os.Setenv(OidcDevMode, "true")
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if err := ValidateIssuer(tt.args.issuer); (err != nil) != tt.wantErr { if err := ValidateIssuer(tt.args.issuer); (err != nil) != tt.wantErr {