Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

True2thepen patch 3 #67

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

True2thepen patch 3 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2b4a267
Update general-view.php Remove beta tag.
true2thepen Nov 28, 2022
7c71a47
Update dashboard Add Protect endpoints status
true2thepen Nov 28, 2022
145ed78
Merge pull request #1 from true2thepen/true2thepen-patch-1
true2thepen Nov 28, 2022
6662b6b
Merge pull request #2 from true2thepen/true2thepen-patch-2
true2thepen Nov 28, 2022
df03858
Merge branch 'nicumicle:master' into master
true2thepen Nov 29, 2022
4c369cd
Merge branch 'nicumicle:master' into master
true2thepen Nov 30, 2022
69b060f
Allow username/email for /auth username
true2thepen Nov 30, 2022
4dfda36
Update AuthenticateService.php
true2thepen Nov 30, 2022
ee88d72
Update AuthenticateService.php
true2thepen Nov 30, 2022
a6cc452
Update AuthenticateService.php
true2thepen Nov 30, 2022
e4c94fc
Update AuthenticateService.php
true2thepen Nov 30, 2022
4b18f61
Update AuthenticateService.php
true2thepen Nov 30, 2022
d1b3d83
Update AuthenticateService.php
true2thepen Nov 30, 2022
4287a90
Update AuthenticateService.php
true2thepen Dec 2, 2022
6b7e499
Update AuthenticateService.php
true2thepen Dec 2, 2022
0d1b002
Update AuthenticateService.php
true2thepen Dec 2, 2022
7ca53f9
Update AuthenticateService.php
true2thepen Dec 2, 2022
97c0632
Update AuthenticateService.php
true2thepen Dec 2, 2022
940096b
Update AuthenticateService.php
true2thepen Dec 2, 2022
14e7d5d
Update AuthenticateServiceTest.php
true2thepen Dec 2, 2022
2851aa2
Update AuthenticateService.php
true2thepen Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion simple-jwt-login/src/Services/AuthenticateService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ public function authenticateUser()
ErrorCodes::AUTHENTICATION_MISSING_PASSWORD
);
}


if (isset($this->request['username']) && str_contains($this->request['username'], '@')) {
$this->request['email'] = $this->request['username'];
unset($this->request['username']);
}

$user = isset($this->request['username'])
? $this->wordPressData->getUserByUserLogin(
$this->wordPressData->sanitizeTextField($this->request['username'])
Expand Down
6 changes: 6 additions & 0 deletions tests/Services/AuthenticateServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ public function testSuccessFlowWithFullPayload()
$this->wordPressDataMock
->method('getUserByUserLogin')
->willReturn('user');
$this->wordPressDataMock
->method('getUserDetailsByEmail')
->willReturn('user');
$this->wordPressDataMock
->method('getUserPassword')
->willReturn('1234');
Expand Down Expand Up @@ -323,6 +326,9 @@ public function testSuccessFlowWithFullPayloadAndPasshash()
$this->wordPressDataMock
->method('getUserByUserLogin')
->willReturn('user');
$this->wordPressDataMock
->method('getUserDetailsByEmail')
->willReturn('user');
$this->wordPressDataMock
->method('getUserPassword')
->willReturn('1234');
Expand Down