Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: swoft-cloud/swoft-auth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.3
Choose a base ref
...
head repository: swoft-cloud/swoft-auth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 52 files changed
  • 4 contributors

Commits on Nov 2, 2018

  1. fix: Fix Auth token cache time (swoft-cloud/swoft-component#223) 

    * composer update

* fix #419 token cache time is incorrect.

* update composer
    @rlgy @swoft-bot
    rlgy authored and swoft-bot committed Nov 2, 2018
    Copy the full SHA
    477dbb4 View commit details

Commits on Jul 26, 2019

  1. update: refacting for swoft v2

    @inhere
    inhere committed Jul 26, 2019
    Copy the full SHA
    b1b1aac View commit details

  2. update: modify some dir structure

    @inhere
    inhere committed Jul 26, 2019
    Copy the full SHA
    e958632 View commit details

  3. optimize code format, update some logic

    @inhere
    inhere committed Jul 26, 2019
    Copy the full SHA
    e5217cd View commit details

  4. re-format all codes

    @inhere
    inhere committed Jul 26, 2019
    Copy the full SHA
    f7d8e20 View commit details

  5. update: inspect and format codes

    @inhere
    inhere committed Jul 26, 2019
    Copy the full SHA
    7210b5b View commit details

Commits on Jul 29, 2019

  1. fix some error

    @inhere
    inhere committed Jul 29, 2019
    Copy the full SHA
    7a436b0 View commit details

Commits on Aug 5, 2019

  1. update some

    @inhere
    inhere committed Aug 5, 2019
    Copy the full SHA
    ce462ff View commit details

Commits on Oct 10, 2019

  1. up: fix some error and format codes

    @inhere
    inhere committed Oct 10, 2019
    Copy the full SHA
    56875c6 View commit details

Commits on Oct 24, 2019

  1. update some class codes

    @inhere
    inhere committed Oct 24, 2019
    Copy the full SHA
    74d2642 View commit details

Commits on Aug 6, 2021

  1. 修复异常抛出格式

    @zeng444
    zeng444 committed Aug 6, 2021
    Copy the full SHA
    70dc4de View commit details

  2. 更新包

    @zeng444
    zeng444 committed Aug 6, 2021
    Copy the full SHA
    e5823ac View commit details

Commits on Sep 3, 2021

  1. Delete .travis.yml

    @inhere
    inhere authored Sep 3, 2021
    Copy the full SHA
    f30602a View commit details

  2. Update composer.json

    @inhere
    inhere authored Sep 3, 2021
    Copy the full SHA
    b7acf88 View commit details

  3. Merge pull request #4 from zeng444/master 

    修复异常抛出格式
    @inhere
    inhere authored Sep 3, 2021
    Copy the full SHA
    57ebb64 View commit details

  4. Update composer.json

    @inhere
    inhere authored Sep 3, 2021
    Copy the full SHA
    bba38c9 View commit details
Showing with 913 additions and 989 deletions.
  1. +2 −2 .php_cs
  2. +0 −26 .travis.yml
  3. +2 −1 README.md
  4. +36 −44 composer.json
  5. +10 −10 phpunit.xml
  6. +33 −0 src/AuthConst.php
  7. +91 −62 src/AuthManager.php
  8. +21 −6 src/{Bean → }/AuthResult.php
  9. +5 −6 src/{Bean → }/AuthSession.php
  10. +25 −14 src/AuthUserService.php
  11. +64 −0 src/AutoLoader.php
  12. +0 −43 src/Bootstrap/CoreBean.php
  13. +0 −27 src/Constants/AuthConstants.php
  14. +11 −6 src/{Mapping → Contract}/AccountTypeInterface.php
  15. +3 −3 src/{Mapping → Contract}/AuthHandlerInterface.php
  16. +7 −4 src/{Mapping → Contract}/AuthManagerInterface.php
  17. +8 −3 src/{Mapping → Contract}/AuthServiceInterface.php
  18. +3 −3 src/{Mapping → Contract}/AuthorizationParserInterface.php
  19. +20 −0 src/Contract/TokenParserInterface.php
  20. +60 −0 src/ErrorCode.php
  21. +8 −8 src/Exception/AuthException.php
  22. +24 −0 src/Exception/ForbiddenException.php
  23. +0 −55 src/Helper/ErrorCode.php
  24. +49 −51 src/Helper/ErrorCodeHelper.php
  25. +0 −20 src/Mapping/TokenParserInterface.php
  26. +19 −13 src/Middleware/AclMiddleware.php
  27. +17 −12 src/Middleware/AuthMiddleware.php
  28. +33 −19 src/Parser/AuthorizationHeaderParser.php
  29. +18 −13 src/Parser/Handler/BasicAuthHandler.php
  30. +34 −16 src/Parser/Handler/BearerTokenHandler.php
  31. +34 −29 src/Parser/JWTTokenParser.php
  32. +0 −38 test/.env
  33. +0 −51 test/Cases/Handler/BearerTokenParserTest.php
  34. +0 −56 test/Cases/Manager/AuthManagerTest.php
  35. +6 −29 test/bootstrap.php
  36. +1 −0 test/config/base.php
  37. +0 −19 test/config/beans/base.php
  38. +0 −41 test/config/beans/log.php
  39. +0 −33 test/config/define.php
  40. +0 −37 test/config/properties/app.php
  41. +0 −22 test/config/properties/cache.php
  42. +0 −45 test/config/server.php
  43. +33 −0 test/testing/AutoLoader.php
  44. +10 −9 test/{Cases/Account → testing}/TestAccount.php
  45. +5 −5 test/{Cases/Manager → testing}/TestManager.php
  46. +6 −0 test/testing/bean.php
  47. +67 −69 test/{Cases → unit}/AbstractTestCase.php
  48. +17 −17 test/{Cases → unit}/Handler/BasicAuthParserTest.php
  49. +51 −0 test/unit/Handler/BearerTokenParserTest.php
  50. +8 −8 test/{Cases → unit}/Helper/ErrorCodeHelperTest.php
  51. +58 −0 test/unit/Manager/AuthManagerTest.php
  52. +14 −14 test/{Cases → unit}/Parser/JWTTokenParserTest.php
4 changes: 2 additions & 2 deletions .php_cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
<?php declare(strict_types=1);

$header = <<<'EOF'
This file is part of Swoft.
@link https://swoft.org
@document https://doc.swoft.org
@document https://swoft.org/docs
@contact group@swoft.org
@license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
EOF;
26 changes: 0 additions & 26 deletions .travis.yml
View file

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -10,9 +10,10 @@ Swoft Auth Component
composer require swoft/auth
```

## Document [wiki](https://github.com/aprchen/swoft-auth/wiki)
## Document

Now

- BasicAuth
- BearerToken (JWT)
- Acl
80 changes: 36 additions & 44 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,39 @@
{
"name": "swoft/auth",
"type": "library",
"keywords": [
"php",
"swoole",
"swoft",
"auth",
"auth-manager",
"jwt",
"acl"
],
"description": "Auth compoment for swoft",
"license": "Apache-2.0",
"require": {
"swoft/http-server": "^1.0",
"firebase/php-jwt": "^5.0",
"psr/simple-cache": "^1.0",
"swoft/framework": "^1.0",
"swoft/cache": "^1.0"
},
"autoload": {
"psr-4": {
"Swoft\\Auth\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"SwoftTest\\Auth\\": "test/Cases"
}
},
"repositories": [
{
"type": "composer",
"url": "https://packagist.laravel-china.org"
}
],
"require-dev": {
"eaglewu/swoole-ide-helper": "dev-master",
"phpunit/phpunit": "^5.7",
"friendsofphp/php-cs-fixer": "^2.11"
},
"scripts": {
"test": "./vendor/bin/phpunit -c phpunit.xml",
"cs-fix": "./vendor/bin/php-cs-fixer fix $1"
"name": "swoft/auth",
"type": "library",
"keywords": [
"php",
"swoole",
"swoft",
"auth",
"auth-manager",
"jwt",
"acl"
],
"description": "Auth component for swoft",
"license": "Apache-2.0",
"require": {
"swoft/framework": "~2.0.0",
"firebase/php-jwt": "^5.0",
"psr/simple-cache": "^1.0"
},
"autoload": {
"psr-4": {
"Swoft\\Auth\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"SwoftTest\\Auth\\Testing": "test/testing",
"SwoftTest\\Auth\\Unit": "test/unit"
}
},
"require-dev": {
"phpunit/phpunit": "^7.5",
"friendsofphp/php-cs-fixer": "^2.11"
},
"scripts": {
"test": "./vendor/bin/phpunit -c phpunit.xml",
"cs-fix": "./vendor/bin/php-cs-fixer fix $1"
}
}
20 changes: 10 additions & 10 deletions phpunit.xml
View file
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Tests">
<directory suffix="Test.php">./test/Cases</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<testsuites>
<testsuite name="Tests">
<directory suffix="Test.php">./test/Cases</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
</phpunit>

33 changes: 33 additions & 0 deletions src/AuthConst.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php declare(strict_types=1);
/**
* This file is part of Swoft.
*
* @link https://swoft.org
* @document https://swoft.org/docs
* @contact group@swoft.org
* @license https://github.com/swoft-cloud/swoft/blob/master/LICENSE
*/

namespace Swoft\Auth;

/**
* Class AuthConst
*
* @since 2.0
*/
class AuthConst
{
public const IS_LOGIN = 'isLogin';

public const IDENTITY = 'identity';

public const HEADER_KEY = 'Authorization';

public const BASIC_USER_NAME = 'basicUsername';

public const BASIC_PASSWORD = 'basicPassword';

public const AUTH_SESSION = 'authSession';

public const EXTEND_DATA = 'extendedData';
}
Loading