Merge branch 'master' into service-accounts

This commit is contained in:
Livio Amstutz 2020-09-10 16:21:40 +02:00
commit 6be292a984
5 changed files with 22 additions and 11 deletions

View file

@ -277,10 +277,16 @@ func timeToJSON(t time.Time) int64 {
return t.Unix()
}
func audienceFromJSON(audience interface{}) []string {
switch aud := audience.(type) {
func audienceFromJSON(i interface{}) []string {
switch aud := i.(type) {
case []string:
return aud
case []interface{}:
audience := make([]string, len(aud))
for i, a := range aud {
audience[i] = a.(string)
}
return audience
case string:
return []string{aud}
}