Skip to content

Commit 2ceb31d

Browse files
committed
c
1 parent 38b4cda commit 2ceb31d

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
],
1111
"minimum-stability": "dev",
1212
"require": {
13-
"hyperf/database": "^2.1",
14-
"hyperf/db-connection": "^2.1",
13+
"hyperf/database": "^2.2",
14+
"hyperf/db-connection": "^2.2",
1515
"league/oauth2-server": "^8.2",
1616
"phpseclib/phpseclib": "^3.0"
1717
},
@@ -25,7 +25,7 @@
2525
},
2626
"extra": {
2727
"branch-alias": {
28-
"dev-master": "1.0-dev"
28+
"dev-master": "1.1-dev"
2929
},
3030
"hyperf": {
3131
"config": "OAuthServer\\ConfigProvider"

publish/oauth.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
'public' => 'read all public resource'
88
],
99
'provider' => 'default', // connection provider
10+
'user_table' => 'users', // user table
1011
'find_by' => 'email' // username check
1112
];

readme.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## OAuth2 Server for Hyperf Framework
2+
3+
4+
5+
### installation
6+
7+
```
8+
composer require xtwoend/oauth-server
9+
10+
php bin/hyperf.php vendor:publish xtwoend/oauth-server
11+
```

src/Repositories/UserRepository.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getUserEntityByUserCredentials(
3535

3636
$query = Db::connection($provider);
3737

38-
$user = $query->table('users')->where(config('oauth.find_by', 'email'), $username)->first();
38+
$user = $query->table(config('oauth.user_table', 'users'))->where(config('oauth.find_by', 'email'), $username)->first();
3939

4040
if (! $user) {
4141
return;
@@ -67,7 +67,7 @@ public function getUserEntityByOtp(
6767

6868
$query = Db::connection($provider);
6969

70-
$user = $query->table('users')->where('phone', $phone)->first();
70+
$user = $query->table(config('oauth.user_table', 'users'))->where('phone', $phone)->first();
7171

7272
if (! $user) {
7373
return;
@@ -89,7 +89,7 @@ public function getUserByProviderUserId($id, $client)
8989
}
9090

9191
$query = Db::connection($provider);
92-
$user = $query->table('users')->find($id);
92+
$user = $query->table(config('oauth.user_table', 'users'))->find($id);
9393

9494
unset($user->password);
9595

0 commit comments

Comments
 (0)