From 3b689e4723cfe06a08f1b9e1c93621369e2e297f Mon Sep 17 00:00:00 2001
From: vanilia <vanilia.cahya23@gmail.com>
Date: Wed, 3 Dec 2025 12:04:50 +0700
Subject: [PATCH] solve conflict

---
 internal/infra/sync-consumer-cfg/tycovar.go                | 4 ++--
 internal/interface/main-handler/authentication/handler.go  | 2 +-
 internal/use-case/main-use-case/soapi/middleware-runner.go | 2 +-
 internal/use-case/simgos-sync-plugin/new/soapi/plugin.go   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/infra/sync-consumer-cfg/tycovar.go b/internal/infra/sync-consumer-cfg/tycovar.go
index d2146c2b..5f245599 100644
--- a/internal/infra/sync-consumer-cfg/tycovar.go
+++ b/internal/infra/sync-consumer-cfg/tycovar.go
@@ -1,8 +1,8 @@
 package synccfg
 
-var O SyncConsumerUrlCfg = SyncConsumerUrlCfg{} // old
+var O SyncUrlCfg = SyncUrlCfg{} // new
 
-type SyncConsumerUrlCfg struct {
+type SyncUrlCfg struct {
 	Prefix     string `yaml:"prefix"`
 	TargetHost string `yaml:"targetHost"`
 	Enable     bool   `yaml:"enable"`
diff --git a/internal/interface/main-handler/authentication/handler.go b/internal/interface/main-handler/authentication/handler.go
index ffaf145b..4bf5134b 100644
--- a/internal/interface/main-handler/authentication/handler.go
+++ b/internal/interface/main-handler/authentication/handler.go
@@ -81,7 +81,7 @@ func GuardMW(next http.Handler) http.Handler {
 		credential.UserName = r.Header.Get("X-Sync-UserName")
 		if credential.Source != "" || credential.SecretKey != "" || credential.UserName != "" {
 			// validate secretKey and source
-			if credential.SecretKey != is.O.SecretKey || credential.Source != is.O.OldSource {
+			if credential.SecretKey != is.O.SecretKey || credential.Source != is.O.Source {
 				rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": "invalid consumer credential"}, nil)
 				return
 			}
diff --git a/internal/use-case/main-use-case/soapi/middleware-runner.go b/internal/use-case/main-use-case/soapi/middleware-runner.go
index ffc49745..fbe18503 100644
--- a/internal/use-case/main-use-case/soapi/middleware-runner.go
+++ b/internal/use-case/main-use-case/soapi/middleware-runner.go
@@ -3,7 +3,7 @@ package soapi
 import (
 	e "simrs-vx/internal/domain/main-entities/soapi"
 	esync "simrs-vx/internal/domain/sync-entities/log"
-	sync "simrs-vx/internal/infra/sync-cfg"
+	sync "simrs-vx/internal/infra/sync-consumer-cfg"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
 
diff --git a/internal/use-case/simgos-sync-plugin/new/soapi/plugin.go b/internal/use-case/simgos-sync-plugin/new/soapi/plugin.go
index 469384b7..8cc40723 100644
--- a/internal/use-case/simgos-sync-plugin/new/soapi/plugin.go
+++ b/internal/use-case/simgos-sync-plugin/new/soapi/plugin.go
@@ -2,7 +2,7 @@ package soapi
 
 import (
 	"fmt"
-	sync "simrs-vx/internal/infra/sync-cfg"
+	sync "simrs-vx/internal/infra/sync-consumer-cfg"
 	helper "simrs-vx/internal/use-case/simgos-sync-plugin/new"
 
 	e "simrs-vx/internal/domain/main-entities/soapi"