tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-23 13:55:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

[DEV-328] Fix array offset on null in /user/login (#1185)

Browse Source
This commit is contained in:
Maximiliano Redigonda 2022-05-02 16:48:14 -03:00 committed by GitHub
parent a5da776d27
commit a74d6ab4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/models/User.php
View File

@ -19,7 +19,7 @@ class User extends DataStore {
public static function authenticate($userEmail, $userPassword) { public static function authenticate($userEmail, $userPassword) {
$user = User::getUser($userEmail, 'email'); $user = User::getUser($userEmail, 'email');
return ($user && Hashing::verifyPassword($userPassword, $user->password) && !$user->notRegistered) ? $user : new NullDataStore(); return (!$user->isNull() && Hashing::verifyPassword($userPassword, $user->password) && !$user->notRegistered) ? $user : new NullDataStore();
} }
public static function getProps() { public static function getProps() {

2
tests/staff/assign-ticket.rb
View File

@ -27,7 +27,7 @@ describe '/staff/assign-ticket' do
#end #end
it 'should assign ticket if everything is okey' do it 'should assign ticket if everything is okay' do
ticket1 = $database.getRow('ticket', 'ticket_to_assing_1', 'title') ticket1 = $database.getRow('ticket', 'ticket_to_assing_1', 'title')
ticket2 = $database.getRow('ticket', 'ticket_to_assing_2', 'title') ticket2 = $database.getRow('ticket', 'ticket_to_assing_2', 'title')
ticket3 = $database.getRow('ticket', 'ticket_to_assing_3', 'title') ticket3 = $database.getRow('ticket', 'ticket_to_assing_3', 'title')

4
tests/ticket/seen.rb
View File

@ -6,7 +6,7 @@ describe '/ticket/seen' do
Scripts.login($staff[:email], $staff[:password], true) Scripts.login($staff[:email], $staff[:password], true)
Scripts.assignTicket(ticket['ticket_number']) Scripts.assignTicket(ticket['ticket_number'])
it 'should change unread if everything is okey ' do it 'should change unread if everything is okay ' do
result = request('/ticket/seen', { result = request('/ticket/seen', {
ticketNumber: ticket['ticket_number'], ticketNumber: ticket['ticket_number'],
@ -38,7 +38,7 @@ describe '/ticket/seen' do
Scripts.logout() Scripts.logout()
Scripts.login('user_get@os4.com', 'user_get') Scripts.login('user_get@os4.com', 'user_get')
it 'should change unread if everything is okey ' do it 'should change unread if everything is okay ' do
ticket = $database.getRow('ticket', 'Should we pay?', 'title') ticket = $database.getRow('ticket', 'Should we pay?', 'title')
result = request('/ticket/seen', { result = request('/ticket/seen', {
ticketNumber: ticket['ticket_number'], ticketNumber: ticket['ticket_number'],