tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-28 08:14:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Guillermo - add path /user/verify [skip ci]

Browse Source
This commit is contained in:
AntonyAntonio 2016-12-23 01:56:01 -03:00
parent be2e492aa4
commit e24f46c278
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/controllers/user/get-user.php
View File

@ -34,7 +34,8 @@ class GetUserByIdController extends Controller {
'name' => $user->name, 'name' => $user->name,
'email' => $user->email, 'email' => $user->email,
'signupDate' => $user->signupDate, 'signupDate' => $user->signupDate,
'tickets' => $tickets->toArray() 'tickets' => $tickets->toArray(),
'verified' => !$user->verificationToken
]); ]);
} }
} }

9
server/controllers/user/signup.php
View File

@ -9,6 +9,7 @@ class SignUpController extends Controller {
private $userEmail; private $userEmail;
private $userName; private $userName;
private $userPassword; private $userPassword;
private $verificationToken;
public function validations() { public function validations() {
return [ return [
@ -64,20 +65,19 @@ class SignUpController extends Controller {
$this->userName = Controller::request('name'); $this->userName = Controller::request('name');
$this->userEmail = Controller::request('email'); $this->userEmail = Controller::request('email');
$this->userPassword = Controller::request('password'); $this->userPassword = Controller::request('password');
$this->verificationToken = Hashing::generateRandomToken();
} }
public function createNewUserAndRetrieveId() { public function createNewUserAndRetrieveId() {
$userInstance = new User(); $userInstance = new User();
$token = Hashing::generateRandomToken();
$userInstance->setProperties([ $userInstance->setProperties([
'name' => $this->userName, 'name' => $this->userName,
'signupDate' => Date::getCurrentDate(), 'signupDate' => Date::getCurrentDate(),
'tickets' => 0, 'tickets' => 0,
'email' => $this->userEmail, 'email' => $this->userEmail,
'password' => Hashing::hashPassword($this->userPassword), 'password' => Hashing::hashPassword($this->userPassword),
'verificationToken' => $token 'verificationToken' => $this->verificationToken
]); ]);
return $userInstance->store(); return $userInstance->store();
@ -88,7 +88,8 @@ class SignUpController extends Controller {
$mailSender->setTemplate(MailTemplate::USER_SIGNUP, [ $mailSender->setTemplate(MailTemplate::USER_SIGNUP, [
'to' => $this->userEmail, 'to' => $this->userEmail,
'name' => $this->userName 'name' => $this->userName,
'verificationToken' => $this->verificationToken
]); ]);
$mailSender->send(); $mailSender->send();

3
server/data/mail-templates/user-signup-en.html
View File

@ -1,4 +1,5 @@
<div> <div>
Welcome, {{name}} to our support center, Welcome, {{name}} to our support center,
your email is {{to}} your email is {{to}},
your token is {{verificationToken}}
</div> </div>

3
server/data/mail-templates/user-signup-es.html
View File

@ -1,4 +1,5 @@
<div> <div>
Bienvenido, {{name}} a nuestro centro de soporte, Bienvenido, {{name}} a nuestro centro de soporte,
tu email es {{to}} tu email es {{to}},
tu codigo de verificacion es {{verificationToken}}
</div> </div>

18
tests/system/edit-settings.rb
View File

@ -12,11 +12,7 @@ describe'system/edit-settings' do
"allow-attachments" => 1, "allow-attachments" => 1,
"max-size" => 2, "max-size" => 2,
"language" => 'es', "language" => 'es',
"no-reply-email" => 'testemail@hotmail.com', "no-reply-email" => 'testemail@hotmail.com'
"smtp-host" => 'www.opensupports.com',
"smtp-port" => 18,
"smtp-user" => 'admin',
"smtp-pass" => 'pass1234',
}) })
(result['status']).should.equal('success') (result['status']).should.equal('success')
@ -39,18 +35,6 @@ describe'system/edit-settings' do
row = $database.getRow('setting', 'no-reply-email', 'name') row = $database.getRow('setting', 'no-reply-email', 'name')
(row['value']).should.equal('testemail@hotmail.com') (row['value']).should.equal('testemail@hotmail.com')
row = $database.getRow('setting', 'smtp-host', 'name')
(row['value']).should.equal('www.opensupports.com')
row = $database.getRow('setting', 'smtp-port', 'name')
(row['value']).should.equal('18')
row = $database.getRow('setting', 'smtp-user', 'name')
(row['value']).should.equal('admin')
row = $database.getRow('setting', 'smtp-pass', 'name')
(row['value']).should.equal('pass1234')
request('/user/logout') request('/user/logout')
end end
end end