Merge branch 'master' of https://github.com/xtwoend/oauth-server

Author: xtwoend

composer.json

@@ -10,8 +10,8 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "hyperf/database": "^2.1",
-        "hyperf/db-connection": "^2.1",
+        "hyperf/database": "^2.2",
+        "hyperf/db-connection": "^2.2",
         "league/oauth2-server": "^8.2",
         "phpseclib/phpseclib": "^3.0"
     },
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         },
         "hyperf": {
             "config": "OAuthServer\\ConfigProvider"

publish/oauth.php

@@ -6,6 +6,8 @@
     'scopes' => [
         'public' => 'read all public resource'
     ],
+    'use_otp_grant' => false,
     'provider' => 'default', // connection provider
+    'user_table' => 'users', // user table 
     'find_by' => 'email' // username check
 ];

readme.md

@@ -0,0 +1,21 @@
+## OAuth2 Server for Hyperf Framework
+
+
+
+### installation
+
+```
+    composer require xtwoend/oauth-server
+```
+
+
+### Run on terminal
+
+```
+    php bin/hyperf.php vendor:publish xtwoend/oauth-server
+    
+    php bin/hyperf.php migrate
+
+    php bin/hyperf.php oauth:key
+
+```

src/AuthorizationServerFactory.php

@@ -58,10 +58,12 @@ public function __invoke()
                 $tokenExpiresIn
             );
 
-            $server->enableGrantType(
-                $this->makeOtpGrant(),
-                $tokenExpiresIn
-            );
+            if($this->config->get('oauth.use_otp_grant', false)) {
+                $server->enableGrantType(
+                    $this->makeOtpGrant(),
+                    $tokenExpiresIn
+                );
+            }
 
             $server->enableGrantType(
                 $this->makeUserGrant(),

src/ConfigProvider.php

@@ -52,7 +52,7 @@ public function __invoke(): array
                     'id' => 'config',
                     'description' => 'The config for oauth.',
                     'source' => __DIR__ . '/../publish/oauth.php',
-                    'destination' => BASE_PATH . '/config/oauth.php',
+                    'destination' => BASE_PATH . '/config/autoload/oauth.php',
                 ],
                 [
                     'id' => 'migration',

src/Controller/TokenIssueController.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace OAuthServer\Controller;
+
+use Psr\Container\ContainerInterface;
+use Hyperf\HttpServer\Annotation\Controller;
+use League\OAuth2\Server\AuthorizationServer;
+use OAuthServer\Repositories\TokenRepository;
+use Hyperf\HttpServer\Annotation\RequestMapping;
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface;
+use OAuthServer\Exception\AuthenticationException;
+use League\OAuth2\Server\Exception\OAuthServerException;
+
+
+/**
+ * @Controller()
+ */
+class TokenIssueController
+{
+    protected $container;
+    protected $server;
+    protected $tokens;
+
+    public function __construct(
+        ContainerInterface $container,
+        AuthorizationServer $server,
+        TokenRepository $tokens
+    ) {
+        $this->container = $container;
+        $this->server    = $server;
+        $this->tokens    = $tokens;
+    }
+
+    /**
+     * @RequestMapping(path="/oauth/token", methods="post")
+     */
+    public function issueToken(RequestInterface $request, ResponseInterface $response)
+    {
+        try {
+            return $this->server->respondToAccessTokenRequest($request, $response);
+        } catch (OAuthServerException $e) {
+            return $e->generateHttpResponse($response);
+        } catch (\Exception $e) {
+            throw new AuthenticationException("Unauthorize: {$e->getMessage()}");
+        }
+    }
+}

src/Repositories/AccessTokenRepository.php

@@ -40,7 +40,7 @@ public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEnt
             'user_id' => $accessTokenEntity->getUserIdentifier(),
             'client_id' => $accessTokenEntity->getClient()->getIdentifier(),
             'scopes' => $this->formatScopesForStorage($accessTokenEntity->getScopes()),
-            'revoked' => false,
+            'revoked' => 0,
             'created_at' => new DateTime(),
             'updated_at' => new DateTime(),
             'expires_at' => $accessTokenEntity->getExpiryDateTime(),
@@ -58,7 +58,7 @@ public function persistNewAccessToken(AccessTokenEntityInterface $accessTokenEnt
      */
     public function revokeAccessToken($tokenId)
     {
-        Db::connection(config('oauth.provider', 'default'))->table('oauth_access_tokens')->where('id', $tokenId)->update(['revoked' => true]);
+        Db::connection(config('oauth.provider', 'default'))->table('oauth_access_tokens')->where('id', $tokenId)->update(['revoked' => 1]);
     }
 
     /**

src/Repositories/AuthCodeRepository.php

@@ -25,7 +25,7 @@ public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity)
             'user_id' => $authCodeEntity->getUserIdentifier(),
             'client_id' => $authCodeEntity->getClient()->getIdentifier(),
             'scopes' => $this->formatScopesForStorage($authCodeEntity->getScopes()),
-            'revoked' => false,
+            'revoked' => 0,
             'expires_at' => $authCodeEntity->getExpiryDateTime(),
         ];
 
@@ -37,7 +37,7 @@ public function persistNewAuthCode(AuthCodeEntityInterface $authCodeEntity)
      */
     public function revokeAuthCode($codeId)
     {
-        Db::connection(config('oauth.provider', 'default'))->table('oauth_auth_codes')->where('id', $codeId)->update(['revoked' => true]);
+        Db::connection(config('oauth.provider', 'default'))->table('oauth_auth_codes')->where('id', $codeId)->update(['revoked' => 1]);
     }
 
     /**

src/Repositories/RefreshTokenRepository.php

@@ -33,7 +33,7 @@ public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshToken
         Db::connection(config('oauth.provider', 'default'))->table('oauth_refresh_tokens')->insert([
             'id' => $id = $refreshTokenEntity->getIdentifier(),
             'access_token_id' => $accessTokenId = $refreshTokenEntity->getAccessToken()->getIdentifier(),
-            'revoked' => false,
+            'revoked' => 0,
             'expires_at' => $refreshTokenEntity->getExpiryDateTime(),
         ]);
 
@@ -45,16 +45,16 @@ public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshToken
      */
     public function revokeRefreshToken($tokenId)
     {
-        Db::connection(config('oauth.provider', 'default'))->table('oauth_refresh_tokens')->where('id', $tokenId)->update(['revoked' => true]);
+        Db::connection(config('oauth.provider', 'default'))->table('oauth_refresh_tokens')->where('id', $tokenId)->update(['revoked' => 1]);
     }
 
     /**
      * {@inheritdoc}
      */
     public function isRefreshTokenRevoked($tokenId)
     {
-        if ($token = Db::connection(config('oauth.provider', 'default'))->table('oauth_refresh_tokens')->where('id', $tokenId)) {
-            return $token->revoked;
+        if ($token = Db::connection(config('oauth.provider', 'default'))->table('oauth_refresh_tokens')->where('id', $tokenId)->first()) {
+            return (bool) $token->revoked;
         }
 
         return true;

src/Repositories/UserRepository.php

@@ -35,7 +35,7 @@ public function getUserEntityByUserCredentials(
 
         $query = Db::connection($provider);
 
-        $user = $query->table('users')->where(config('oauth.find_by', 'email'), $username)->first();
+        $user = $query->table(config('oauth.user_table', 'users'))->where(config('oauth.find_by', 'email'), $username)->first();
 
         if (! $user) {
             return;
@@ -67,7 +67,7 @@ public function getUserEntityByOtp(
 
         $query = Db::connection($provider);
 
-        $user = $query->table('users')->where('phone', $phone)->first();
+        $user = $query->table(config('oauth.user_table', 'users'))->where('phone', $phone)->first();
 
         if (! $user) {
             return;
@@ -89,7 +89,7 @@ public function getUserByProviderUserId($id, $client)
         }
 
         $query = Db::connection($provider);
-        $user = $query->table('users')->find($id);
+        $user = $query->table(config('oauth.user_table', 'users'))->find($id);
 
         unset($user->password);