always store oauth2 token on refresh, retry auth in zoombot

Author: zoom-ua

base/oauth.go

@@ -261,13 +261,11 @@ func GetOAuthClient(
 		if err != nil {
 			return nil, fmt.Errorf("unable to renew token: %s", err)
 		}
-		if newToken.AccessToken != token.AccessToken {
-			err = storage.PutToken(tokenIdentifier, newToken)
-			if err != nil {
-				return nil, fmt.Errorf("unable to update token: %s", err)
-			}
-			token = newToken
+		err = storage.PutToken(tokenIdentifier, newToken)
+		if err != nil {
+			return nil, fmt.Errorf("unable to update token: %s", err)
 		}
+		token = newToken
 	}
 
 	return config.Client(context.Background(), token), nil

meetbot/meetbot/handler.go

@@ -79,7 +79,8 @@ func (h *Handler) meetHandler(msg chat1.MsgSummary) error {
 		h.Errorf("unable to get service %v, deleting credentials and retrying", err)
 		return retry()
 	default:
-		if strings.Contains(err.Error(), "oauth2: cannot fetch token") {
+		if strings.Contains(err.Error(), "cannot fetch token") ||
+			strings.Contains(err.Error(), "invalid_grant") {
 			h.Errorf("unable to get service %v, deleting credentials and retrying", err)
 			return retry()
 		}

zoombot/zoombot/handler.go

@@ -86,11 +86,13 @@ func (h *Handler) zoomHandler(msg chat1.MsgSummary, attempts int) error {
 		return nil
 	case ZoomAPIError:
 		if err.Code == invalidTokenCode {
+			h.Errorf("invalidTokenCode %v, deleting credentials and retrying", err)
 			return retry()
 		}
 		return err
 	default:
-		if strings.Contains(err.Error(), "oauth2: cannot fetch token") {
+		if strings.Contains(err.Error(), "cannot fetch token") ||
+			strings.Contains(err.Error(), "invalid_grant") {
 			h.Errorf("unable to get service %v, deleting credentials and retrying", err)
 			return retry()
 		}