diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-31 22:43:07 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-01 21:31:06 +0200 |
| commit | 6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7 (patch) | |
| tree | 3cd8ff3ae639535b97f99f203bc77b8c074ba115 /phpBB/phpbb/session.php | |
| parent | 306beab4cba155a933391c40c75f5dd9c57fd69e (diff) | |
| download | forums-6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7.tar forums-6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7.tar.gz forums-6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7.tar.bz2 forums-6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7.tar.xz forums-6f5f0d6d8d5d3afcabccaa9da7c64108af5d4ab7.zip | |
[ticket/12352] Use custom provider collection for auth providers
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.
PHPBB3-12352
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index c663977882..ad6759a3e2 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -408,16 +408,8 @@ class session $session_expired = false; // Check whether the session is still valid if we have one - $method = basename(trim($config['auth_method'])); - $provider_collection = $phpbb_container->get('auth.provider_collection'); - - // Revert to db auth provider if selected method does not exist - if (!isset($provider_collection['auth.provider.' . $method])) - { - $method = 'db'; - } - $provider = $provider_collection['auth.provider.' . $method]; + $provider = $provider_collection->get_provider(); if (!($provider instanceof \phpbb\auth\provider\provider_interface)) { @@ -584,16 +576,8 @@ class session } } - $method = basename(trim($config['auth_method'])); - $provider_collection = $phpbb_container->get('auth.provider_collection'); - - // Revert to db auth provider if selected method does not exist - if (!isset($provider_collection['auth.provider.' . $method])) - { - $method = 'db'; - } - $provider = $provider_collection['auth.provider.' . $method]; + $provider = $provider_collection->get_provider(); $this->data = $provider->autologin(); if (sizeof($this->data)) @@ -912,9 +896,8 @@ class session $db->sql_query($sql); // Allow connecting logout with external auth method logout - $method = basename(trim($config['auth_method'])); - - $provider = $phpbb_container->get('auth.provider.' . $method); + $provider_collection = $phpbb_container->get('auth.provider_collection'); + $provider = $provider_collection->get_provider(); $provider->logout($this->data, $new_session); if ($this->data['user_id'] != ANONYMOUS) |