DA-4596: remove custom expiry logic added to avoid frequent oauth0 calls

Signed-off-by: Ajinkya Nahar <[email protected]>

Author: Ajinkya Nahar

auth0/jwks.go

@@ -44,13 +44,13 @@ func (a *ClientProvider) createAuthJwks(cert string) error {
 
 func (a *ClientProvider) getPemCert(token *jwt.Token, refreshJwks bool) (string, error) {
 	cert := ""
-	cert, expired, err := a.getCachedJwks()
+	cert, err := a.getCachedJwks()
 	if err != nil {
 		return cert, err
 	}
 
-	// check if the cache expired as well is not invoked via refresh token cron
-	if refreshJwks || expired {
+	// check if the refresh jwks cache flag coming from the refresh cron is set to true
+	if refreshJwks {
 		_, resp, err := a.httpClient.Request(fmt.Sprintf("%s/oauth/.well-known/jwks.json", a.AuthURL), "GET", nil, nil, nil)
 		if err != nil {
 			return cert, err
@@ -82,8 +82,7 @@ func (a *ClientProvider) getPemCert(token *jwt.Token, refreshJwks bool) (string,
 	return cert, nil
 }
 
-func (a *ClientProvider) getCachedJwks() (string, bool, error) {
-	expired := true
+func (a *ClientProvider) getCachedJwks() (string, error) {
 	res, err := a.esClient.Search(strings.TrimSpace(auth0JwksCache+a.Environment), searchJwksQuery)
 	if err != nil {
 		go func() {
@@ -92,27 +91,23 @@ func (a *ClientProvider) getCachedJwks() (string, bool, error) {
 			fmt.Println("Err: send to slack: ", err)
 		}()
 
-		return "", expired, err
+		return "", err
 	}
 
 	var e ESJwksSchema
 	err = json.Unmarshal(res, &e)
 	if err != nil {
 		log.Println("repository: GetOauthJwks: could not unmarshal the data", err)
-		return "", expired, err
+		return "", err
 	}
 
 	if len(e.Hits.Hits) > 0 {
 		data := e.Hits.Hits[0]
-		// compare current time v/s existing cached time + 30 mins
-		if data.Source.CreatedAt.Add(30*time.Minute).Unix() > time.Now().UTC().Unix() {
-			expired = false
-		}
 
-		return data.Source.Jwks, expired, nil
+		return data.Source.Jwks, nil
 	}
 
-	return "", expired, errors.New("GetJwks: could not find the associated jwks")
+	return "", errors.New("GetJwks: could not find the associated jwks")
 }
 
 var searchJwksQuery = map[string]interface{}{