From a758bc839f6e7e37c0edcf812ec9d6defac32dec Mon Sep 17 00:00:00 2001 From: obog Date: Fri, 4 Sep 2020 14:15:15 +0300 Subject: [PATCH] Renamed m2m token params --- Topcoder/class.topcoder.plugin.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Topcoder/class.topcoder.plugin.php b/Topcoder/class.topcoder.plugin.php index a7dbcb3..7e443af 100644 --- a/Topcoder/class.topcoder.plugin.php +++ b/Topcoder/class.topcoder.plugin.php @@ -32,7 +32,6 @@ public function settingsController_topcoder_create($sender) { 'Plugins.Topcoder.MemberApiURI' => ['Control' => 'TextBox', 'Default' => '/v3/members', 'Description' => 'Topcoder Member API URI'], 'Plugins.Topcoder.RoleApiURI' => ['Control' => 'TextBox', 'Default' => '/v3/roles', 'Description' => 'Topcoder Role API URI'], 'Plugins.Topcoder.MemberProfileURL' => ['Control' => 'TextBox', 'Default' => 'https://www.topcoder.com/members', 'Description' => 'Topcoder Member Profile URL'], - ]); $sender->setData('Title', sprintf(t('%s Settings'), 'Topcoder')); @@ -302,18 +301,17 @@ public static function getTopcoderId($name) { */ public static function getM2MToken() { - $TOPCODER_AUTH0_CLIENT_ID = getenv('TOPCODER_AUTH0_CLIENT_ID'); - $TOPCODER_AUTH0_CLIENT_SECRET = getenv('TOPCODER_AUTH0_CLIENT_SECRET'); - $TOPCODER_AUTH0_AUDIENCE = getenv('TOPCODER_AUTH0_AUDIENCE'); - $TOPCODER_AUTH0_URL = getenv('TOPCODER_AUTH0_URL'); - $TOPCODER_AUTH0_PROXY_SERVER_URL = getenv('TOPCODER_AUTH0_PROXY_SERVER_URL'); + $TOPCODER_AUTH0_CLIENT_ID = getenv('AUTH0_CLIENT_ID'); + $TOPCODER_AUTH0_CLIENT_SECRET = getenv('AUTH0_CLIENT_SECRET'); + $TOPCODER_AUTH0_AUDIENCE = getenv('AUTH0_AUDIENCE'); + $TOPCODER_AUTH0_URL = getenv('AUTH0_URL'); + $TOPCODER_AUTH0_PROXY_SERVER_URL = getenv('AUTH0_PROXY_SERVER_URL'); - $issetM2MParams = (isset($TOPCODER_AUTH0_CLIENT_ID) && + if(!(isset($TOPCODER_AUTH0_CLIENT_ID) && isset($TOPCODER_AUTH0_CLIENT_SECRET) && isset($TOPCODER_AUTH0_AUDIENCE) && isset($TOPCODER_AUTH0_URL) && - isset($TOPCODER_AUTH0_PROXY_SERVER_URL)); - if(!$issetM2MParams) { + isset($TOPCODER_AUTH0_PROXY_SERVER_URL))) { logMessage(__FILE__,__LINE__,'TopcoderPlugin','getM2MToken()',"M2M Token parameters weren't set"); throw new InvalidArgumentException("M2M Token parameters weren't set"); }