From 67680f5536adb72ca7bb770aeb55d9d83272b749 Mon Sep 17 00:00:00 2001 From: Akemi Davisson Date: Tue, 9 Feb 2021 11:49:16 -0600 Subject: [PATCH] AUTH-3375 exchangeOrgToken deleted cookie fix --- cmd/cloudflared/token/token.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/cloudflared/token/token.go b/cmd/cloudflared/token/token.go index ed1a90ba..df64f054 100644 --- a/cmd/cloudflared/token/token.go +++ b/cmd/cloudflared/token/token.go @@ -301,7 +301,9 @@ func exchangeOrgToken(appURL *url.URL, orgToken string) (string, error) { resp.Body.Close() var appToken string for _, c := range resp.Cookies() { - if c.Name == tokenHeader { + //if Org token revoked on exchange, getTokensFromEdge instead + validAppToken := c.Name == tokenHeader && time.Now().Before(c.Expires) + if validAppToken { appToken = c.Value break }