DigitaleAgentur___ALT
/
nc-vue-register
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix# should fix #123

This commit is contained in:
Pellaeon Lin 2018-02-24 22:39:32 +08:00
parent d953ab9260
commit 45efd7f346
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service/registrationservice.php
View File

@ -122,6 +122,7 @@ class RegistrationService {
$this->registrationMapper->update($registration); $this->registrationMapper->update($registration);
} }
/** /**
* Create registration request, used by both the API and form
* @param string $email * @param string $email
* @param string $username * @param string $username
* @param string $password * @param string $password
@ -138,7 +139,8 @@ class RegistrationService {
$registration->setPassword($password); $registration->setPassword($password);
} }
$this->registrationMapper->generateNewToken($registration); $this->registrationMapper->generateNewToken($registration);
$this->registrationMapper->generateClientSecret($registration); if ( $password !== '' && $username !== '' )
$this->registrationMapper->generateClientSecret($registration);
$this->registrationMapper->insert($registration); $this->registrationMapper->insert($registration);
return $registration; return $registration;
} }
@ -301,6 +303,9 @@ class RegistrationService {
} }
// Delete pending registration if no client secret is stored // Delete pending registration if no client secret is stored
// with client secret implies registered via API
// without client secret implies registered via form
// if registered via API, the registration request will be deleted in apicontroller::status
if($registration->getClientSecret() === null) { if($registration->getClientSecret() === null) {
$res = $this->registrationMapper->delete($registration); $res = $this->registrationMapper->delete($registration);
if ($res === false) { if ($res === false) {