2 Commits
1.0.0 ... 1.0.1

4 changed files with 13 additions and 8 deletions

2
.env
View File

@ -23,8 +23,6 @@ APP_MASTERIDENTITY=SQL # SQL | SSO | LDAP
APP_AUTH=SQL # SQL | CAS| LDAP | OPENID | à faire SAML
APP_ALIAS=/
APP_NAME=Nineskeletor
APP_MASTERURL=
APP_MASTERKEY=
APP_MODEREGISTRATION= # null | BYADMIN | BYUSER
APP_ADMINS='["admin"]'
APP_NIVEAU01LABEL="Niveau 01"

View File

@ -8,8 +8,6 @@ parameters:
appAlias: '%env(resolve:APP_ALIAS)%'
appName: '%env(resolve:APP_NAME)%'
appMasteridentity: '%env(resolve:APP_MASTERIDENTITY)%'
appMasterurl: '%env(resolve:APP_MASTERURL)%'
appMasterkey: '%env(resolve:APP_MASTERKEY)%'
appModeregistration: '%env(resolve:APP_MODEREGISTRATION)%'
appAdmins: '%env(json:APP_ADMINS)%'
appNiveau01label: '%env(resolve:APP_NIVEAU01LABEL)%'

View File

@ -280,9 +280,12 @@ class SynchroCommand extends Command
$user->setUsername($ldapentry[$this->username]);
$user->setIsvisible(true);
$user->setApikey(Uuid::uuid4());
$user->setPassword("LDAPPWD-".$ldapentry[$this->username]);
$user->setRole("ROLE_USER");
$user->setAvatar("noavatar.png");
$uuid=Uuid::uuid4();
$user->setPassword("PWD-".$ldapentry[$this->username]."-".$uuid);
$this->em->persist($user);
}
@ -736,9 +739,12 @@ class SynchroCommand extends Command
$user->setUsername($nineuser->userlogin);
$user->setIsvisible(true);
$user->setApikey(Uuid::uuid4());
$user->setPassword("NINEPWD-".$nineuser->userlogin);
$user->setRole("ROLE_USER");
$user->setAvatar($nineuser->useravatar);
$uuid=Uuid::uuid4();
$user->setPassword("PWD-".$nineuser->userlogin."-".$uuid);
$this->em->persist($user);
}
@ -893,11 +899,13 @@ class SynchroCommand extends Command
$user->setEmail($email);
$user->setNiveau01($niveau01);
$user->setSiren($niveau01->getSiren());
$user->setPassword("PASSWORDFROMEXTERNE");
$user->setVisible(true);
$user->setAuthlevel("simple");
$user->setBelongingpopulation("agent");
$uuid=Uuid::uuid4();
$user->setPassword("PWD-".$username."-".$uuid);
if(in_array($username,$usersadmin))
$user->setRole("ROLE_ADMIN");
else {

View File

@ -457,7 +457,8 @@ class SecurityController extends AbstractController
if(empty($avatar)) $avatar = "noavatar.png";
if(empty($firstname)) $firstname = " ";
if(empty($lastname)) $lastname = $username;
$password=$this->getParameter("appAuth")."PWD-".$username;
$uuid=Uuid::uuid4();
$password=$this->getParameter("appAuth")."PWD-".$username."-".$uuid;
// Si aucun niveau01 on prend par défaut le niveau system
if(!$niveau01) $niveau01=$em->getRepository('App\Entity\Niveau01')->find(-1);