From 9d0b720231630d37d0e56d7db6b3739b355a1c67 Mon Sep 17 00:00:00 2001
From: mr <morgane.roques@irt-saintexupery.com>
Date: Fri, 23 Jan 2026 09:40:38 +0100
Subject: [PATCH] new oclib

---
 controllers/oauth2.go                 | 9 +++++----
 go.mod                                | 2 +-
 go.sum                                | 2 ++
 infrastructure/auth_connector/ldap.go | 4 ++--
 main.go                               | 6 ++++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/controllers/oauth2.go b/controllers/oauth2.go
index 9e38efe..26427d5 100644
--- a/controllers/oauth2.go
+++ b/controllers/oauth2.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/models/peer"
 	model "cloud.o-forge.io/core/oc-lib/models/peer"
 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -227,15 +228,15 @@ func (o *OAuthController) extractOrigin(request *http.Request) (string, string,
 	if t != "" {
 		searchStr = strings.Replace(searchStr, t, "", -1)
 	}
-	peer := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).Search(nil, searchStr, false)
-	if peer.Code != 200 || len(peer.Data) == 0 { // TODO: add state of partnership
+	pp := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).Search(nil, searchStr, false)
+	if pp.Code != 200 || len(pp.Data) == 0 { // TODO: add state of partnership
 		return "", "", external
 	}
-	p := peer.Data[0].(*model.Peer)
+	p := pp.Data[0].(*model.Peer)
 	publicKey = p.PublicKey
 	origin = p.Url
 	if origin != "" { // is external
-		if strings.Contains(origin, "localhost") || strings.Contains(origin, "127.0.0.1") || p.State == model.SELF {
+		if p.Relation == peer.SELF {
 			external = false
 		}
 	} else {
diff --git a/go.mod b/go.mod
index 1b5ee74..9b2a2a0 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.23.3
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06
+	cloud.o-forge.io/core/oc-lib v0.0.0-20260122131802-b98728675928
 	github.com/beego/beego/v2 v2.3.1
 	github.com/smartystreets/goconvey v1.7.2
 	go.uber.org/zap v1.27.0
diff --git a/go.sum b/go.sum
index c9218a3..0e94ea0 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250624095852-147c7bc3a1d5 h1:0eV0E3kBZkOyo
 cloud.o-forge.io/core/oc-lib v0.0.0-20250624095852-147c7bc3a1d5/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06 h1:+RSv62uIC7wsmibsp1XTanQMNznNeOGgPpfhb6ZHT4c=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250624102227-e600fedcab06/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260122131802-b98728675928 h1:/JATUIWRD632NX+89nxawYPSCUETwy+v0yp6l6F5HkM=
+cloud.o-forge.io/core/oc-lib v0.0.0-20260122131802-b98728675928/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
diff --git a/infrastructure/auth_connector/ldap.go b/infrastructure/auth_connector/ldap.go
index e32c46a..998c161 100644
--- a/infrastructure/auth_connector/ldap.go
+++ b/infrastructure/auth_connector/ldap.go
@@ -102,8 +102,8 @@ func (cli *Client) Authenticate(ctx context.Context, username string, password s
 	if details == nil {
 		return false, nil
 	}
-	a := details["dn"]
-	if err := cn.Bind(a[0], password); err != nil {
+	fmt.Println(details["dn"])
+	if err := cn.Bind(details["dn"][0], password); err != nil {
 		if err == errInvalidCredentials {
 			return false, nil
 		}
diff --git a/main.go b/main.go
index 87b0fc6..12df0f7 100644
--- a/main.go
+++ b/main.go
@@ -139,12 +139,14 @@ func generateSelfPeer() error {
 		// create a new peer
 		o := oclib.GetConfLoader()
 		peer := &peer.Peer{
-			Url: o.GetStringDefault("HOSTNAME", "http://localhost"),
+			Url:     o.GetStringDefault("HOSTNAME", "http://localhost"),
+			NATSUrl: oclib.GetConfig().NATSUrl,
 			AbstractObject: utils.AbstractObject{
 				Name: o.GetStringDefault("NAME", "local"),
 			},
 			PublicKey:     file,
-			State:         peer.SELF,
+			Relation:      peer.SELF,
+			State:         peer.ONLINE,
 			WalletAddress: "my-wallet",
 		}
 		data := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), "", "", []string{}, nil).StoreOne(peer.Serialize(peer))