Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-01-25 15:02:36 +01:00
parent ff9d07e0cb e82d932cfb
commit 031ca517ed
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dicos/91_ninegate.xml
View File

@ -102,7 +102,8 @@
<variable type='string' name='ninegate_openldapsubbranchuser' description="Rechercher les utilisateurs dans la sous-branche" mandatory='False' /> <variable type='string' name='ninegate_openldapsubbranchuser' description="Rechercher les utilisateurs dans la sous-branche" mandatory='False' />
<variable type='string' name='ninegate_ldaptype' description="Annuaire Cadoles LDAP ou AD " mandatory='True'><value>LDAP</value></variable> <variable type='string' name='ninegate_ldaptype' description="Annuaire Cadoles LDAP ou AD " mandatory='True'><value>LDAP</value></variable>
<variable type='string' name='ninegate_addomaine' description="Nom de votre domaine AD" mandatory='True'><value></value></variable> <variable type='string' name='ninegate_addomainehome' description="Nom de votre domaine AD Home" mandatory='True'><value></value></variable>
<variable type='string' name='ninegate_addomaineprofil' description="Nom de votre domaine AD Profil" mandatory='True'><value></value></variable>
<variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable> <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
<variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable> <variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
<variable type='string' name='ninegate_niveau01branche' description="Nom de la branche de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau01</value></variable> <variable type='string' name='ninegate_niveau01branche' description="Nom de la branche de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau01</value></variable>
@ -694,7 +695,8 @@
<condition name='hidden_if_not_in' source='ninegate_ldaptype'> <condition name='hidden_if_not_in' source='ninegate_ldaptype'>
<param>AD</param> <param>AD</param>
<target type='variable'>ninegate_addomaine</target> <target type='variable'>ninegate_addomainehome</target>
<target type='variable'>ninegate_addomaineprofil</target>
</condition> </condition>
<!-- AFFICHAGE EN FONCTION DU MODULE PORTAL --> <!-- AFFICHAGE EN FONCTION DU MODULE PORTAL -->

3
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml
View File

@ -109,7 +109,8 @@ services:
- %ldap_port% - %ldap_port%
- %ldap_tls% - %ldap_tls%
- %ldap_type% - %ldap_type%
- %ldap_addomaine% - %ldap_addomainehome%
- %ldap_addomaineprofil%
calls: calls:
- [setUser, ["%ldap_user%"]] - [setUser, ["%ldap_user%"]]
- [setPassword, ["%ldap_password%"]] - [setPassword, ["%ldap_password%"]]

19
src/ninegate-1.0/src/Cadoles/CoreBundle/Service/ldapService.php
View File

@ -15,7 +15,8 @@ class ldapService
protected $port; protected $port;
protected $tls; protected $tls;
protected $type; protected $type;
protected $addomaine; protected $addomainehome;
protected $addomaineprofil;
protected $baseDN; protected $baseDN;
protected $baseUser; protected $baseUser;
@ -29,13 +30,14 @@ class ldapService
private $connection = null; private $connection = null;
private $ldapSync = false; private $ldapSync = false;
public function __construct($host, $port, $tls, $type, $addomaine) public function __construct($host, $port, $tls, $type, $addomainehome, $addomaineprofil)
{ {
$this->host = $host; $this->host = $host;
$this->port = $port; $this->port = $port;
$this->tls = $tls; $this->tls = $tls;
$this->type = $type; $this->type = $type;
$this->addomaine = $addomaine; $this->addomainehome = $addomainehome;
$this->addomaineprofil = $addomaineprofil;
} }
public function isEnabled() { public function isEnabled() {
@ -316,7 +318,8 @@ class ldapService
$attrs['sAMAccountName'] = $user->getUsername(); $attrs['sAMAccountName'] = $user->getUsername();
$attrs["userAccountControl"] = 544; $attrs["userAccountControl"] = 544;
$attrs["homeDrive"] = "U:"; $attrs["homeDrive"] = "U:";
$attrs["homeDirectory"] = "\\\\".$this->addomaine."\\".$user->getUsername(); $attrs["homeDirectory"] = "\\\\".$this->addomainehome."\\".$user->getUsername();
$attrs["profilePath"] = "\\\\".$this->addomaineprofil."\\profiles\\".$user->getUsername();
} }
$attrs['givenName'] = $user->getFirstname(); $attrs['givenName'] = $user->getFirstname();

1
src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
View File

@ -557,6 +557,7 @@ $api('$id',data);";
public function helloAction() { public function helloAction() {
$reponse = new Response('ninegate', Response::HTTP_OK); $reponse = new Response('ninegate', Response::HTTP_OK);
$reponse->headers->set('Access-Control-Allow-Origin', '*');
return $reponse; return $reponse;
} }

6
tmpl/ninegate-template.yml
View File

@ -136,9 +136,11 @@ parameters:
%end if %end if
ldap_basedn: %%ldap_base_dn ldap_basedn: %%ldap_base_dn
%if %%getVar("ninegate_ldaptype", 'LDAP') == "AD" %if %%getVar("ninegate_ldaptype", 'LDAP') == "AD"
ldap_addomaine: %%ninegate_addomaine ldap_addomainehome: %%ninegate_addomainehome
ldap_addomaineprofil: %%ninegate_addomaineprofil
%else %else
ldap_addomaine: ldap_addomainehome:
ldap_addomaineprofil:
%end if %end if
# Mise en page # Mise en page