mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 13:41:52 +02:00
Code Issues Releases Wiki Activity

social_login_config::getSupportedConfiguredProviderConfigs()

Browse Source 
is a better name than
`\social_login_config::getValidConfiguredProviderConfigs()` because the
method does not validate the provider configs.
This commit is contained in:
Nick Liu 2021-12-28 11:48:00 +01:00
parent c96d64e275
commit 8e8622f12d
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
4 changed files with 12 additions and 5 deletions
e107_core
controllers/system
xup.php
shortcodes/batch
signup_shortcodes.php
e107_handlers
user_handler.php
e107_plugins/social/includes
social_login_config.php

2
e107_core/controllers/system/xup.php

@ -105,7 +105,7 @@ class core_system_xup_controller extends eController
$testUrl = SITEURL."?route=system/xup/test";
$providers = $manager->getValidConfiguredProviderConfigs();
$providers = $manager->getSupportedConfiguredProviderConfigs();
foreach($providers as $key=>$var)
{

2
e107_core/shortcodes/batch/signup_shortcodes.php

@ -125,7 +125,7 @@ class signup_shortcodes extends e_shortcode
$manager = new social_login_config(e107::getConfig());
$providers = $manager->getValidConfiguredProviderConfigs();
$providers = $manager->getSupportedConfiguredProviderConfigs();
foreach ($providers as $p => $v)
{

4
e107_handlers/user_handler.php

@ -1144,8 +1144,8 @@ class e_user_provider
else
{
$this->_config = array(
"callback" => $this->generateCallbackUrl($provider),
"providers" => $this->social_login_config_manager->getValidConfiguredProviderConfigs(),
"callback" => $this->generateCallbackUrl($provider),
"providers" => $this->social_login_config_manager->getSupportedConfiguredProviderConfigs(),
"debug_mode" => 'error',
"debug_file" => e_LOG . "hybridAuth.log"
);

9
e107_plugins/social/includes/social_login_config.php

@ -162,9 +162,13 @@ class social_login_config
/**
* Get configs of providers that are supported and configured
*
* These configs are not validated here by the social login implementation.
* This method only filters out providers that are not supported and not configured.
*
* @return array Associative array where the key is the denormalized provider name and the value is its config
*/
public function getValidConfiguredProviderConfigs()
public function getSupportedConfiguredProviderConfigs()
{
$supported_providers = $this->getSupportedProviders();
$configured_providers = $this->getConfiguredProviders();
@ -233,6 +237,9 @@ class social_login_config
return $output;
}
/**
* @return array
*/
protected function getSocialLoginConfig()
{
$config = $this->config->get(self::SOCIAL_LOGIN_PREF);