simplified deletion

example/server/storage/storage.go

@@ -385,14 +385,9 @@ func (s *Storage) RevokeToken(ctx context.Context, tokenIDOrToken string, userID
 	if refreshToken.ApplicationID != clientID {
 		return oidc.ErrInvalidClient().WithDescription("token was not issued for this client")
 	}
-	// if it is a refresh token, you will have to remove the access token as well
 	delete(s.refreshTokens, refreshToken.ID)
-	for _, accessToken := range s.tokens {
+	// if it is a refresh token, you will have to remove the access token as well
-		if accessToken.RefreshTokenID == refreshToken.ID {
+	delete(s.tokens, refreshToken.AccessToken)
-			delete(s.tokens, accessToken.ID)
-			return nil
-		}
-	}
 	return nil
 }
 
@@ -594,6 +589,7 @@ func (s *Storage) createRefreshToken(accessToken *Token, amr []string, authTime
 		Audience:      accessToken.Audience,
 		Expiration:    time.Now().Add(5 * time.Hour),
 		Scopes:        accessToken.Scopes,
+		AccessToken:   accessToken.ID,
 	}
 	s.refreshTokens[token.ID] = token
 	return token.Token, nil
@@ -607,14 +603,10 @@ func (s *Storage) renewRefreshToken(currentRefreshToken string) (string, string,
 	if !ok {
 		return "", "", fmt.Errorf("invalid refresh token")
 	}
-	// deletes the refresh token and all access tokens which were issued based on this refresh token
+	// deletes the refresh token
 	delete(s.refreshTokens, currentRefreshToken)
-	for _, token := range s.tokens {
+	// delete the access token which was issued based on this refresh token
-		if token.RefreshTokenID == currentRefreshToken {
+	delete(s.tokens, refreshToken.AccessToken)
-			delete(s.tokens, token.ID)
-			break
-		}
-	}
 	// creates a new refresh token based on the current one
 	token := uuid.NewString()
 	refreshToken.Token = token

example/server/storage/token.go

@@ -22,4 +22,5 @@ type RefreshToken struct {
 	ApplicationID string
 	Expiration    time.Time
 	Scopes        []string
+	AccessToken   string // Token.ID
 }