From bc54a7f87b59ca441e29d16f1006c283bc5ed93e Mon Sep 17 00:00:00 2001 From: Michael Borkenstein Date: Mon, 10 May 2021 12:24:45 -0500 Subject: [PATCH] AUTH-3537: AUDs in JWTs are now always arrays --- token/token.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/token/token.go b/token/token.go index f8fb6c1c..a3aeffa6 100644 --- a/token/token.go +++ b/token/token.go @@ -46,7 +46,7 @@ type signalHandler struct { signals []os.Signal } -type appJWTPayload struct { +type jwtPayload struct { Aud []string `json:"aud"` Email string `json:"email"` Exp int `json:"exp"` @@ -57,17 +57,12 @@ type appJWTPayload struct { Subt string `json:"sub"` } -type orgJWTPayload struct { - appJWTPayload - Aud string `json:"aud"` -} - type transferServiceResponse struct { AppToken string `json:"app_token"` OrgToken string `json:"org_token"` } -func (p appJWTPayload) isExpired() bool { +func (p jwtPayload) isExpired() bool { return int(time.Now().Unix()) > p.Exp } @@ -346,7 +341,7 @@ func GetOrgTokenIfExists(authDomain string) (string, error) { if err != nil { return "", err } - var payload orgJWTPayload + var payload jwtPayload err = json.Unmarshal(token.Payload, &payload) if err != nil { return "", err @@ -368,7 +363,7 @@ func GetAppTokenIfExists(appInfo *AppInfo) (string, error) { if err != nil { return "", err } - var payload appJWTPayload + var payload jwtPayload err = json.Unmarshal(token.Payload, &payload) if err != nil { return "", err