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

ignore username input 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2020-01-16 11:48:06 -01:00
parent 570c86664f
commit 459c9e0454
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Controller/RegisterController.php
View File

@ -21,6 +21,7 @@ use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Http\RedirectResponse; use \OCP\AppFramework\Http\RedirectResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use \OCP\IConfig;
use \OCP\IL10N; use \OCP\IL10N;
class RegisterController extends Controller { class RegisterController extends Controller {
@ -29,6 +30,8 @@ class RegisterController extends Controller {
private $l10n; private $l10n;
/** @var IURLGenerator */ /** @var IURLGenerator */
private $urlgenerator; private $urlgenerator;
/** @var IConfig */
private $config;
/** @var RegistrationService */ /** @var RegistrationService */
private $registrationService; private $registrationService;
/** @var MailService */ /** @var MailService */
@ -40,12 +43,14 @@ class RegisterController extends Controller {
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
IURLGenerator $urlgenerator, IURLGenerator $urlgenerator,
IConfig $config,
RegistrationService $registrationService, RegistrationService $registrationService,
MailService $mailService MailService $mailService
) { ) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->l10n = $l10n; $this->l10n = $l10n;
$this->urlgenerator = $urlgenerator; $this->urlgenerator = $urlgenerator;
$this->config = $config;
$this->registrationService = $registrationService; $this->registrationService = $registrationService;
$this->mailService = $mailService; $this->mailService = $mailService;
} }
@ -140,9 +145,13 @@ class RegisterController extends Controller {
* @return RedirectResponse|TemplateResponse * @return RedirectResponse|TemplateResponse
*/ */
public function createAccount($token) { public function createAccount($token) {
$username = $this->request->getParam('username');
$password = $this->request->getParam('password');
$registration = $this->registrationService->getRegistrationForToken($token); $registration = $this->registrationService->getRegistrationForToken($token);
if ($this->config->getAppValue('registration', 'email_is_login', '0') === '1') {
$username = $registration->email;
} else {
$username = $this->request->getParam('username');
}
$password = $this->request->getParam('password');
try { try {
$user = $this->registrationService->createAccount($registration, $username, $password); $user = $this->registrationService->createAccount($registration, $username, $password);

2
lib/Db/Registration.php
View File

@ -47,7 +47,7 @@ use OCP\AppFramework\Db\Entity;
*/ */
class Registration extends Entity { class Registration extends Entity {
public $id; public $id;
protected $email; public $email;
protected $username; protected $username;
protected $displayname; protected $displayname;
protected $password; protected $password;

2
templates/form.php
View File

@ -23,6 +23,7 @@ script('registration', 'form');
<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/> <img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
</p> </p>
<?php if ( \OC::$server->getConfig()->getAppValue('registration', 'email_is_login', '0') !== '1' ) { ?>
<p class="groupmiddle"> <p class="groupmiddle">
<input type="text" name="username" id="username" value="<?php if (!empty($_['entered_data']['user'])) { <input type="text" name="username" id="username" value="<?php if (!empty($_['entered_data']['user'])) {
p($_['entered_data']['user']); p($_['entered_data']['user']);
@ -30,6 +31,7 @@ script('registration', 'form');
<label for="username" class="infield"><?php p($l->t('Username')); ?></label> <label for="username" class="infield"><?php p($l->t('Username')); ?></label>
<img id="username-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> <img id="username-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
</p> </p>
<?php } ?>
<p class="groupbottom"> <p class="groupbottom">
<input type="password" name="password" id="password" placeholder="<?php p($l->t('Password')); ?>"/> <input type="password" name="password" id="password" placeholder="<?php p($l->t('Password')); ?>"/>