✨ removed DBStorage as this is not OAuth business

Author: codemasher

.travis.yml

@@ -1,43 +1,15 @@
 language: php
 
-env:
-  global:
-    - setup=no_encryption
-
 matrix:
   include:
     - php: 7.2
-      env: setup=no_encryption
-    - php: nightly
-      env: setup=no_encryption
-    - php: 7.2
-      env: setup=sodium_ext
     - php: nightly
-      env: setup=sodium_ext
   allow_failures:
     - php: nightly
 
-mysql:
-  database: dbtest
-  username: root
-  encoding: utf8
-
-before_install:
-  # Manually compile the libsodium library. This sucks, Travis. https://github.com/travis-ci/travis-ci/issues/8863
-  - |
-    if [[ $setup = 'sodium_ext' ]]; then
-      git clone -b stable https://github.com/jedisct1/libsodium.git;
-      cd libsodium && sudo ./configure && sudo make check && sudo make install && cd ..;
-    fi
-
 install:
-  - |
-    if [[ $setup = 'sodium_ext' ]]; then
-      pecl install libsodium;
-    fi
   - curl -o config/cacert.pem https://curl.haxx.se/ca/cacert.pem
   - travis_retry composer install --no-interaction --prefer-source
-  - mysql -e 'create database dbtest;'
 
 script: vendor/bin/phpunit --configuration phpunit.xml --coverage-clover clover.xml
 

README.md

@@ -28,7 +28,7 @@
 - PHP 7.2+
 - the [Sodium](http://php.net/manual/book.sodium.php) extension for token encryption
 - cURL, PHP's stream wrapper or a HTTP client library of your choice
-- see [`chillerlan/php-oauth`](https://github.com/chillerlan/php-oauth)
+- see [`chillerlan/php-oauth`](https://github.com/chillerlan/php-oauth) for already implemented providers
 
 ## Getting Started
 In order to instance an [`OAuthInterface`](https://github.com/chillerlan/php-oauth-core/blob/master/src/Core/OAuthInterface.php) you you'll need to invoke a [`HTTPClientInterface`](https://github.com/chillerlan/php-httpinterface/blob/master/src/HTTPClientInterface.php), [`OAuthStorageInterface`](https://github.com/chillerlan/php-oauth-core/blob/master/src/Storage/OAuthStorageInterface.php) and `OAuthOptions` (a [`ContainerInterface`](https://github.com/chillerlan/php-traits/blob/master/src/ContainerInterface.php)) objects first:
@@ -182,10 +182,9 @@ class MyOauth2Provider extends Oauth2Provider implements ClientCredentials, CSRF
 ```
 
 ### [`OAuthStorageInterface`](https://github.com/chillerlan/php-oauth-core/tree/master/src/Storage/OAuthStorageInterface.php)
-There are currently 3 different `OAuthStorageInterface`, refer to these for implementation details (extend `OAuthStorageAbstract`):
+There are 2 different `OAuthStorageInterface`, refer to these for implementation details (extend `OAuthStorageAbstract`):
 - [`MemoryStorage`](https://github.com/chillerlan/php-oauth-core/tree/master/src/Storage/MemoryStorage.php): non-persistent, to store an existing token during script runtime and then discard it.
-- [`SessionStorage`](https://github.com/chillerlan/php-oauth-core/tree/master/src/Storage/SessionStorage.php): half-persistent, stores a token for as long a user's session is alive, e.g. while authenticating.
-- [`DBStorage`](https://github.com/chillerlan/php-oauth-core/tree/master/src/Storage/DBStorage.php): persistent, multi purpose database driven storage with encryption support (via ext-sodium)
+- [`SessionStorage`](https://github.com/chillerlan/php-oauth-core/tree/master/src/Storage/SessionStorage.php): (half-)persistent, stores a token for as long a user's session is alive, e.g. while authenticating.
 
 ## API
 ### [`OAuthInterface`](https://github.com/chillerlan/php-oauth-core/blob/master/src/Core/OAuthProvider.php)

composer.json

@@ -24,11 +24,9 @@
 		"chillerlan/php-traits": "^2.0",
 		"chillerlan/php-httpinterface": "^2.0",
 		"chillerlan/php-magic-apiclient": "^1.1",
-		"psr/log": "^1.0",
-		"psr/simple-cache": "^1.0"
+		"psr/log": "^1.0"
 	},
 	"require-dev": {
-		"chillerlan/php-database": "^2.1",
 		"chillerlan/php-log": "^2.0",
 		"phpunit/phpunit": "^7.3"
 	},

examples/oauth-example-common.php

@@ -7,18 +7,9 @@
  * @license      MIT
  */
 
-use chillerlan\Database\{
-	Database, DatabaseOptionsTrait, Drivers\MySQLiDrv
-};
-use chillerlan\HTTP\{
-	HTTPClientAbstract, HTTPResponseInterface, CurlClient
-};
-use chillerlan\Logger\{
-	Log, LogOptionsTrait, Output\ConsoleLog
-};
-use chillerlan\OAuth\{
-	OAuthOptions, Storage\SessionStorage
-};
+use chillerlan\HTTP\{CurlClient, HTTPClientAbstract, HTTPResponseInterface};
+use chillerlan\Logger\{Log, LogOptionsTrait, Output\ConsoleLog};
+use chillerlan\OAuth\{OAuthOptions, Storage\SessionStorage};
 use chillerlan\Traits\{DotEnv, ImmutableSettingsInterface};
 
 ini_set('date.timezone', 'Europe/Amsterdam');
@@ -33,20 +24,8 @@
 	'key'              => $env->get($ENVVAR.'_KEY'),
 	'secret'           => $env->get($ENVVAR.'_SECRET'),
 	'callbackURL'      => $env->get($ENVVAR.'_CALLBACK_URL'),
-	'dbUserID'         => 1,
-	'dbTokenTable'     => 'storagetest',
-	'dbProviderTable'  => 'storagetest_providers',
-	'storageCryptoKey' => '000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f',
 	'tokenAutoRefresh' => true,
 
-	// DatabaseOptions
-	'driver'           => MySQLiDrv::class,
-	'host'             => $env->MYSQL_HOST,
-	'port'             => $env->MYSQL_PORT,
-	'database'         => $env->MYSQL_DATABASE,
-	'username'         => $env->MYSQL_USERNAME,
-	'password'         => $env->MYSQL_PASSWORD,
-
 	// HTTPOptions
 	'ca_info'          => $CFGDIR.'/cacert.pem',
 	'userAgent'        => 'chillerlanPhpOAuth/3.0.0 +https://github.com/codemasher/php-oauth',
@@ -60,7 +39,7 @@
 
 /** @var \chillerlan\Traits\ImmutableSettingsInterface $options */
 $options = new class($options_arr) extends OAuthOptions{
-	use DatabaseOptionsTrait, LogOptionsTrait;
+	use LogOptionsTrait;
 
 	protected $sleep;
 };
@@ -101,10 +80,6 @@ protected function getResponse():HTTPResponseInterface{
 
 #$http->setLogger($logger);
 
-/** @var \chillerlan\Database\Database $db */
-$db = new Database($options);
-#$db->setLogger($logger);
-
 /** @var \chillerlan\OAuth\Storage\OAuthStorageInterface $storage */
-$storage = new SessionStorage($options); //new DBStorage($options, $db);
+$storage = new SessionStorage($options);
 #$storage->setLogger($logger);

src/OAuthOptions.php

@@ -13,9 +13,7 @@
 namespace chillerlan\OAuth;
 
 use chillerlan\HTTP\HTTPOptionsTrait;
-use chillerlan\Traits\{
-	ImmutableSettingsContainer, ImmutableSettingsInterface, Crypto\MemzeroDestructorTrait
-};
+use chillerlan\Traits\ImmutableSettingsAbstract;
 
 /**
  * OAuthOptionsTrait
@@ -27,25 +25,8 @@
  * @property bool       $sessionStart
  * @property string     $sessionTokenVar
  * @property string     $sessionStateVar
- * @property bool       $useEncryption
- * @property string     $storageCryptoKey
  * @property bool       $tokenAutoRefresh
  *
- * @property string     $dbLabelHashAlgo
- * @property string     $dbLabelFormat
- * @property string|int $dbUserID
- *
- * @property string     $dbTokenTable
- * @property string     $dbTokenTableExpires
- * @property string     $dbTokenTableLabel
- * @property string     $dbTokenTableProviderID
- * @property string     $dbTokenTableState
- * @property string     $dbTokenTableToken
- * @property string     $dbTokenTableUser
- *
- * @property string     $dbProviderTable
- * @property string     $dbProviderTableID
- * @property string     $dbProviderTableName
  *
  * HTTPOptionsTrait
  *
@@ -55,22 +36,6 @@
  * @property string     $ca_info
  * @property int        $max_redirects
  */
-class OAuthOptions implements ImmutableSettingsInterface{
-	use OAuthOptionsTrait, HTTPOptionsTrait, MemzeroDestructorTrait, ImmutableSettingsContainer{
-		__construct as protected containerConstruct;
-	}
-
-	/**
-	 * OAuthOptions constructor.
-	 *
-	 * @param iterable|null $properties
-	 */
-	public function __construct(iterable $properties = null){
-		// enable encryption by default if possible...
-		$this->useEncryption = extension_loaded('sodium');
-
-		// ... then load and override the settings
-		$this->containerConstruct($properties);
-	}
-
+class OAuthOptions extends ImmutableSettingsAbstract{
+	use OAuthOptionsTrait, HTTPOptionsTrait;
 }

src/OAuthOptionsTrait.php

@@ -49,50 +49,9 @@ trait OAuthOptionsTrait{
 	 */
 	protected $sessionStateVar = 'chillerlan-oauth-state';
 
-	/**
-	 * @var bool
-	 */
-	protected $useEncryption;
-
-	/**
-	 * a 32 byte string, hex encoded
-	 *
-	 * @see sodium_crypto_box_secretkey()
-	 *
-	 * @var string
-	 */
-	protected $storageCryptoKey;
-
 	/**
 	 * @var bool
 	 */
 	protected $tokenAutoRefresh = false;
 
-	/**
-	 * @var string
-	 */
-	protected $dbLabelHashAlgo = 'md5';
-
-	/**
-	 * @var string
-	 */
-	protected $dbLabelFormat   = '%1$s@%2$s'; // user@service
-
-	/**
-	 * @var int|string
-	 */
-	protected $dbUserID;
-
-	protected $dbTokenTable;
-	protected $dbTokenTableExpires    = 'expires';
-	protected $dbTokenTableLabel      = 'label';
-	protected $dbTokenTableProviderID = 'provider_id';
-	protected $dbTokenTableState      = 'state';
-	protected $dbTokenTableToken      = 'token';
-	protected $dbTokenTableUser       = 'user_id';
-
-	protected $dbProviderTable;
-	protected $dbProviderTableID      = 'provider_id';
-	protected $dbProviderTableName    = 'servicename';
-
 }