From 430c5e4bef7eef1323e6ba48cfef12f9eaf6d158 Mon Sep 17 00:00:00 2001
From: gaetanbrl <gaetan.bruel@jdev.fr>
Date: Tue, 24 Dec 2024 12:02:20 +0100
Subject: [PATCH] ldap, console : new  orgUniqueId #4374 #4372
 https://github.com/georchestra/georchestra-gateway/issues/159

Add organizationId object

Fix olcAttribute type uniqueOrganizationId

Console - new form field - uniqueOrganizationId

Custom proconnect tag for docker image

ldap management - add new uniqueOrganizationId

up attribute and add siret c2c info

new uniqueOrganizationId field in orgDao
---
 Makefile                                           |  2 +-
 .../ws/editorgdetails/EditOrgDetailsFormBean.java  |  1 +
 .../EditOrgDetailsFormController.java              |  2 ++
 .../webapp/WEB-INF/i18n/application.properties     |  1 +
 .../webapp/WEB-INF/i18n/application_fr.properties  |  1 +
 .../webapp/WEB-INF/views/createAccountForm.jsp     |  4 ++++
 .../main/webapp/manager/app/assets/lang/en.json    |  1 +
 .../main/webapp/manager/app/assets/lang/fr.json    |  1 +
 .../webapp/manager/app/components/orgs/orgs.es6    |  2 +-
 .../webapp/manager/app/templates/orgForm.tpl.html  |  7 +++++++
 .../src/main/java/org/georchestra/ds/orgs/Org.java | 10 ++++++++++
 .../main/java/org/georchestra/ds/orgs/OrgExt.java  |  1 +
 .../main/java/org/georchestra/ds/orgs/OrgsDao.java |  2 ++
 .../java/org/georchestra/ds/orgs/OrgsDaoImpl.java  |  8 ++++++++
 ldap/docker-root/georchestra.ldif                  |  1 +
 ldap/docker-root/georchestraSchema.ldif            | 14 ++++++++++----
 16 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3876ba4d7e..4438974a32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Docker related targets
 
 GEOSERVER_EXTENSION_PROFILES=wps-download,app-schema,control-flow,csw,inspire,libjpeg-turbo,monitor,pyramid,wps,css,jp2k,authkey,mapstore2,mbstyle,web-resource,sldservice,geopkg-output
-BTAG=latest
+BTAG=proconnect
 
 docker-pull-jetty:
 	docker pull jetty:9-jre11
diff --git a/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormBean.java b/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormBean.java
index 4858facfa6..66242452b0 100644
--- a/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormBean.java
+++ b/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormBean.java
@@ -12,4 +12,5 @@
     private String url;
     private String orgType;
     private String mail;
+    private String uniqueOrganizationId;
 }
diff --git a/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormController.java b/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormController.java
index af8ceed65d..fb79c3b33a 100644
--- a/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormController.java
+++ b/console/src/main/java/org/georchestra/console/ws/editorgdetails/EditOrgDetailsFormController.java
@@ -110,6 +110,7 @@ public String edit(Model model, @ModelAttribute EditOrgDetailsFormBean formBean,
         validation.validateOrgField("url", formBean.getUrl(), resultErrors);
         validation.validateOrgField("address", formBean.getAddress(), resultErrors);
         validation.validateOrgField("description", formBean.getDescription(), resultErrors);
+        validation.validateOrgField("uniqueOrganizationId", formBean.getUniqueOrganizationId(), resultErrors);
         // TODO validate mail address for the organization ?
 
         if (resultErrors.hasErrors()) {
@@ -122,6 +123,7 @@ public String edit(Model model, @ModelAttribute EditOrgDetailsFormBean formBean,
         orgOrigin.setDescription(formBean.getDescription());
         orgOrigin.setUrl(formBean.getUrl());
         orgOrigin.setAddress(formBean.getAddress());
+        orgOrigin.setUniqueOrganizationId(formBean.getUniqueOrganizationId());
 
         if (!logo.isEmpty()) {
             orgOrigin.setLogo(transformLogoFileToBase64(logo));
diff --git a/console/src/main/webapp/WEB-INF/i18n/application.properties b/console/src/main/webapp/WEB-INF/i18n/application.properties
index bdbaead441..13c50ad487 100644
--- a/console/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/console/src/main/webapp/WEB-INF/i18n/application.properties
@@ -119,6 +119,7 @@ org.creation.orgDescription=Description
 org.creation.orgUrl=Url
 org.creation.orgMail=Mail
 org.creation.orgLogo=Logo
+org.creation.orgUniqueId=Identification number
 org.shortNameFormat=Short name must only contain alphanumeric characters
 password.label=Password
 password.placeholder=Password
diff --git a/console/src/main/webapp/WEB-INF/i18n/application_fr.properties b/console/src/main/webapp/WEB-INF/i18n/application_fr.properties
index fde13ef0ec..29d629867b 100644
--- a/console/src/main/webapp/WEB-INF/i18n/application_fr.properties
+++ b/console/src/main/webapp/WEB-INF/i18n/application_fr.properties
@@ -117,6 +117,7 @@ org.creation.orgDescription=Description
 org.creation.orgUrl=Url
 org.creation.orgMail=Mail
 org.creation.orgLogo=Logo
+org.creation.orgUniqueId=Numéro d'identification
 org.shortNameFormat=Le nom court ne doit comporter que des caractères alphanumériques
 password.label=Mot de passe
 password.placeholder=Mot de passe
diff --git a/console/src/main/webapp/WEB-INF/views/createAccountForm.jsp b/console/src/main/webapp/WEB-INF/views/createAccountForm.jsp
index c5230397ae..5bcef3b51d 100644
--- a/console/src/main/webapp/WEB-INF/views/createAccountForm.jsp
+++ b/console/src/main/webapp/WEB-INF/views/createAccountForm.jsp
@@ -132,6 +132,10 @@
                         <jsp:attribute name="label"><s:message code="org.creation.orgLogo"/></jsp:attribute>
                     </t:textarea>
 
+                    <t:textarea path="orgUniqueId" required="${orgUniqueIdRequired}">
+                        <jsp:attribute name="uniqueOrganizationId"><s:message code="org.creation.orgUniqueId"/></jsp:attribute>
+                    </t:textarea>
+
                     <link rel="stylesheet" href="/console/manager/public/libraries.css">
                     <link rel="stylesheet" href="/console/manager/public/app.css">
                     <style>
diff --git a/console/src/main/webapp/manager/app/assets/lang/en.json b/console/src/main/webapp/manager/app/assets/lang/en.json
index 80d33cfb9a..3750184885 100644
--- a/console/src/main/webapp/manager/app/assets/lang/en.json
+++ b/console/src/main/webapp/manager/app/assets/lang/en.json
@@ -111,6 +111,7 @@
   "org.description"       : "Description",
   "org.url"               : "Website",
   "org.mail"               : "Mail",
+  "org.uniqueOrganizationId": "Identification number",
   "org.logo"              : "Logo",
   "org.note"              : "Internal Notes",
   "org.cities"            : "Area",
diff --git a/console/src/main/webapp/manager/app/assets/lang/fr.json b/console/src/main/webapp/manager/app/assets/lang/fr.json
index 962182e12f..5939599f92 100644
--- a/console/src/main/webapp/manager/app/assets/lang/fr.json
+++ b/console/src/main/webapp/manager/app/assets/lang/fr.json
@@ -111,6 +111,7 @@
   "org.description"       : "Description",
   "org.url"               : "Site web",
   "org.mail"               : "Mail",
+  "org.uniqueOrganizationId": "Numéro d'identification",
   "org.logo"              : "Logo",
   "org.note"              : "Notes Internes",
   "org.cities"            : "Aire de compétence",
diff --git a/console/src/main/webapp/manager/app/components/orgs/orgs.es6 b/console/src/main/webapp/manager/app/components/orgs/orgs.es6
index c74763ee47..b6a6f12617 100644
--- a/console/src/main/webapp/manager/app/components/orgs/orgs.es6
+++ b/console/src/main/webapp/manager/app/components/orgs/orgs.es6
@@ -20,7 +20,7 @@ class OrgsController {
         delete org.members
       })
       this.simplifiedOrgs = this.orgs.map((org) => {
-        return { id: org.id, name: org.name, shortName: org.shortName, membersCount: org.membersCount, pending: org.pending, status: org.status }
+        return { id: org.id, name: org.name, shortName: org.shortName, membersCount: org.membersCount, pending: org.pending, status: org.status, uniqueOrganizationId: org.uniqueOrganizationId }
       })
     })
 
diff --git a/console/src/main/webapp/manager/app/templates/orgForm.tpl.html b/console/src/main/webapp/manager/app/templates/orgForm.tpl.html
index 6aaa564793..618b6ec86a 100644
--- a/console/src/main/webapp/manager/app/templates/orgForm.tpl.html
+++ b/console/src/main/webapp/manager/app/templates/orgForm.tpl.html
@@ -75,6 +75,13 @@
                  placeholder="" ng-required="required.mail">
         </div>
       </div>
+      <div class="form-group form-group-sm" ng-class="{required: required.uniqueOrganizationId}">
+        <label class="col-sm-4" for="uniqueOrganizationId" translate>org.uniqueOrganizationId</label>
+        <div class="col-sm-8">
+          <input ng-model="model.uniqueOrganizationId" class="form-control" id="uniqueOrganizationId"
+                 placeholder="">
+        </div>
+      </div>
 
       <imageinput model="model" attribute="'logo'"></imageinput>
 
diff --git a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/Org.java b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/Org.java
index a28393eca5..c91a21b0c5 100644
--- a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/Org.java
+++ b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/Org.java
@@ -59,6 +59,7 @@ public class Org extends ReferenceAware implements Comparable<Org>, Cloneable {
     public static final String JSON_ADDRESS = "address";
     public static final String JSON_ORG_TYPE = "orgType";
     public static final String JSON_MAIL = "mail";
+    public static final String JSON_UNIQUE_ORGANIZATION_ID = "uniqueOrganizationId";
 
     private String id;
     private String name;
@@ -180,4 +181,13 @@ public String getMail() {
     public void setMail(String mail) {
         this.ext.setMail(mail);
     }
+
+    @JsonProperty(JSON_UNIQUE_ORGANIZATION_ID)
+    public void setUniqueOrganizationId(String uniqueOrganizationId) {
+        this.ext.setUniqueOrganizationId(uniqueOrganizationId);
+    }
+
+    public String getUniqueOrganizationId() {
+        return this.ext.getUniqueOrganizationId();
+    }
 }
diff --git a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgExt.java b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgExt.java
index f7aae8321f..ae31fc46aa 100644
--- a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgExt.java
+++ b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgExt.java
@@ -47,6 +47,7 @@ class OrgExt extends ReferenceAware implements Cloneable {
     private String logo = "";
     private String note = "";
     private String mail = "";
+    private String uniqueOrganizationId = "";
 
     @Override
     public OrgExt clone() {
diff --git a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDao.java b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDao.java
index b8bca51068..fdbae93766 100644
--- a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDao.java
+++ b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDao.java
@@ -56,6 +56,8 @@ public interface OrgsDao {
 
     public Org findByUser(Account user);
 
+    public Org findByUniqueOrganizationId(String uniqueOrganizationId);
+
     /**
      * Search by {@link Org#getUniqueIdentifier()}
      *
diff --git a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDaoImpl.java b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDaoImpl.java
index f1a7567ae2..17befc06e6 100644
--- a/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDaoImpl.java
+++ b/ldap-account-management/src/main/java/org/georchestra/ds/orgs/OrgsDaoImpl.java
@@ -204,6 +204,7 @@ public Org mapFromAttributes(Attributes attrs) throws NamingException {
                             .map(LdapNameBuilder::build).map(name -> name.getRdn(name.size() - 1).getValue().toString())
                             .collect(Collectors.toList()));
                     org.setPending(pending);
+                    org.setUniqueOrganizationId(asStringStream(attrs, "uniqueOrganizationId").collect(joining(",")));
                     return org;
                 }
             };
@@ -396,6 +397,13 @@ public Org findById(UUID uuid) {
         return findAllWithExt().filter(o -> uuid.equals(o.getUniqueIdentifier())).findFirst().orElse(null);
     }
 
+    @Override
+    public Org findByUniqueOrganizationId(String uniqueOrganizationId) {
+        return findAllWithExt().filter(o -> uniqueOrganizationId.equals(o.getUniqueOrganizationId())).findFirst()
+                .orElse(null);
+
+    }
+
     private Org addExt(Org org) {
         if (org == null) {
             return null;
diff --git a/ldap/docker-root/georchestra.ldif b/ldap/docker-root/georchestra.ldif
index c985c45839..0dd781e0b2 100644
--- a/ldap/docker-root/georchestra.ldif
+++ b/ldap/docker-root/georchestra.ldif
@@ -370,6 +370,7 @@ o: C2C
 mail: georchestra@camptocamp.com
 businessCategory: Company
 postalAddress: 18 Rue du lac Saint André, 73000 Chambéry
+uniqueOrganizationId: 43369857800054
 labeledURI: https://www.camptocamp.com/
 description: Camptocamp SAS France
 knowledgeInformation: Internal CRM notes on Camptocamp
diff --git a/ldap/docker-root/georchestraSchema.ldif b/ldap/docker-root/georchestraSchema.ldif
index b5c49182b3..1a76a2f9ea 100644
--- a/ldap/docker-root/georchestraSchema.ldif
+++ b/ldap/docker-root/georchestraSchema.ldif
@@ -20,25 +20,31 @@ olcAttributeTypes: ( 1.3.6.1.4.1.53611.1.2.2
     SINGLE-VALUE  )
 olcAttributeTypes: ( 1.3.6.1.4.1.53611.1.2.3
     NAME 'oAuth2Provider'
-    DESC 'OAuth2 provider for external identity provider users)'
+    DESC 'OAuth2 provider for external identity provider users'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
     SINGLE-VALUE )
 olcAttributeTypes: ( 1.3.6.1.4.1.53611.1.2.4
     NAME 'oAuth2Uid'
-    DESC 'OAuth2 UID for external identity provider users)'
+    DESC 'OAuth2 UID for external identity provider users'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
     SINGLE-VALUE )
+olcAttributeTypes: ( 1.3.6.1.4.1.53611.1.2.5
+    NAME 'uniqueOrganizationId'
+    DESC 'organization UID such as SIRET or other'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+    SINGLE-VALUE)
 olcObjectClasses: ( 1.3.6.1.4.1.53611.1.1.2
     NAME 'georchestraOrg'
     DESC 'georchestra org'
     SUP top
     AUXILIARY
-    MAY (jpegphoto $ labeledURI $ knowledgeInformation $ georchestraObjectIdentifier))
+    MAY (jpegphoto $ labeledURI $ knowledgeInformation $ georchestraObjectIdentifier $ uniqueOrganizationId))
 olcObjectClasses: ( 1.3.6.1.4.1.53611.1.1.3
     NAME 'georchestraRole'
     DESC 'Uniquely identifiable georchestra role'
     SUP top
     AUXILIARY
-    MAY (georchestraObjectIdentifier))
+    MAY (georchestraObjectIdentifier))
\ No newline at end of file