From 34890235ba8c2d856e3a121fdf59fe9d627e8596 Mon Sep 17 00:00:00 2001
From: Ken Watanabe <51844896+dorakemon@users.noreply.github.com>
Date: Sun, 8 Mar 2026 00:59:25 +0900
Subject: [PATCH] Merge commit from fork

---
 backend/internal/service/oidc_service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/internal/service/oidc_service.go b/backend/internal/service/oidc_service.go
index 1d04c8d1..9d0b7ff0 100644
--- a/backend/internal/service/oidc_service.go
+++ b/backend/internal/service/oidc_service.go
@@ -404,7 +404,7 @@ func (s *OidcService) createTokenFromAuthorizationCode(ctx context.Context, inpu
 		}
 	}
 
-	if authorizationCodeMetaData.ClientID != input.ClientID && authorizationCodeMetaData.ExpiresAt.ToTime().Before(time.Now()) {
+	if authorizationCodeMetaData.ClientID != input.ClientID || authorizationCodeMetaData.ExpiresAt.ToTime().Before(time.Now()) {
 		return CreatedTokens{}, &common.OidcInvalidAuthorizationCodeError{}
 	}