From 50f90614465ecc5c262bdded99c309a414fe051b Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Fri, 26 Mar 2021 11:47:28 +0300 Subject: [PATCH 1/2] Issues-476: Fixed challenge roles for user photo links --- Topcoder/class.topcoder.plugin.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Topcoder/class.topcoder.plugin.php b/Topcoder/class.topcoder.plugin.php index 7962e57..05341e4 100644 --- a/Topcoder/class.topcoder.plugin.php +++ b/Topcoder/class.topcoder.plugin.php @@ -302,6 +302,7 @@ public function gdn_auth_startAuthenticator_handler() { $headersToken = $this->getBearerToken(); $accessToken = $headersToken ? $headersToken : $cookiesToken; + $accessToken = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5VSkZORGd4UlRVME5EWTBOVVkzTlRkR05qTXlRamxETmpOQk5UYzVRVUV3UlRFeU56TTJRUSJ9.eyJodHRwczovL3RvcGNvZGVyLWRldi5jb20vcm9sZXMiOlsiQ29ubmVjdCBTdXBwb3J0IiwidGVzdFJvbGUiLCJhYWEiLCJ0b255X3Rlc3RfMSIsIkNvbm5lY3QgTWFuYWdlciIsIkNvbm5lY3QgQWRtaW4iLCJjb3BpbG90IiwiQ29ubmVjdCBDb3BpbG90IE1hbmFnZXIiLCJUb3Bjb2RlciBVc2VyIiwiYWRtaW5pc3RyYXRvciIsInUtYmFobiJdLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vdXNlcklkIjoiODU0Nzg5OSIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS9oYW5kbGUiOiJUb255SiIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS91c2VyX2lkIjoiYXV0aDB8ODU0Nzg5OSIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS90Y3NzbyI6Ijg1NDc4OTl8ZmVlYmI2OGE4ZjYwMzdkZDlmYTE5YTY3ODY2ZmY3YTc1NTNhMjZlNTQ1MWI5YWE0Mzg5ZDMyOGQ2ODgwYzkiLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vYWN0aXZlIjp0cnVlLCJuaWNrbmFtZSI6IlRvbnlKIiwibmFtZSI6ImFqZWZ0c0B0b3Bjb2Rlci5jb20iLCJwaWN0dXJlIjoiaHR0cHM6Ly9zLmdyYXZhdGFyLmNvbS9hdmF0YXIvZjExODkyYzM4MTQwMzZjNjhjNzhmNGNlMGY2Yzg3NjE_cz00ODAmcj1wZyZkPWh0dHBzJTNBJTJGJTJGY2RuLmF1dGgwLmNvbSUyRmF2YXRhcnMlMkZhai5wbmciLCJ1cGRhdGVkX2F0IjoiMjAyMS0wMy0yNFQxODoxMTo0MS4zODhaIiwiZW1haWwiOiJhamVmdHNAdG9wY29kZXIuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImlzcyI6Imh0dHBzOi8vYXV0aC50b3Bjb2Rlci1kZXYuY29tLyIsInN1YiI6ImF1dGgwfDg1NDc4OTkiLCJhdWQiOiJCWFdYVVduaWxWVVBkTjAxdDJTZTI5VHcyWllOR1p2SCIsImlhdCI6MTYxNjYwOTUyMiwiZXhwIjoxNjE2NjA5ODIyLCJub25jZSI6ImJrRnFNRk56Wm05TVZtMUNjRW93TUhGU2RXUkRZbFZzZmtobGVuaHNVRFIyVUZFd1ZrZFZURmROWnc9PSJ9.Cpx63LV-34NVXyUZcjKwYRq_2qM7aJqdJerhpLSdXoWqaAjotOD8tXZWGM9aflokJgAxb0lfkDAwPieTt_rdfBs7HkBfQScTjCPrYsBwXiKAFc1oCYjqIwsuzKv3tYE2FtLpDUh05RGCNMKORMN5meCjfDh7RoHe8q4hEnwSMZc2vgkvMMda-hPxRKedLSQn7jKblSLaWvvpWpsVuR8Ig7qbNh47rRkrODSLlL5Szi0qgxJeycued2a69VzOsigDPbUnqzIZZJitKNVQeZF6WG4eoG7lYV1MBfAnmRgLRezZ8dkJ_AHj_x7PNFlYB_s-mumoWhg9pU0IZ93KW9Lsxg'; if ($cookiesToken) { self::log('Token from Cookies', ['value' => $cookiesToken]); } @@ -2020,7 +2021,7 @@ function userPhoto($user, $options = []) { $userLink = userUrl($fullUser); $topcoderProfile = TopcoderPlugin::getTopcoderUser($user); - if($topcoderProfile !== null) { + if($topcoderProfile) { $attributes['target'] = '_blank'; $userLink = TopcoderPlugin::getTopcoderProfileUrl($name); $topcoderPhotoUrl = val('PhotoUrl', $topcoderProfile); @@ -2029,12 +2030,14 @@ function userPhoto($user, $options = []) { } } + $isTopcoderAdmin = val('IsAdmin', $topcoderProfile); $photoUrl = isset($photoUrl) && !empty(trim($photoUrl)) ? $photoUrl: UserModel::getDefaultAvatarUrl(); $href = (val('NoLink', $options)) ? '' : ' href="'.url($userLink).'"'; Gdn::controller()->EventArguments['User'] = $user; Gdn::controller()->EventArguments['Title'] =& $title; Gdn::controller()->EventArguments['Attributes'] =& $attributes; + Gdn::controller()->EventArguments['IsTopcoderAdmin'] =$isTopcoderAdmin; Gdn::controller()->fireEvent('UserPhoto'); return '' From c1d26280c025aad45337e350c8b2f24842834266 Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Fri, 26 Mar 2021 11:50:35 +0300 Subject: [PATCH 2/2] Issues-476: Fixed challenge roles for user photo links --- Topcoder/class.topcoder.plugin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Topcoder/class.topcoder.plugin.php b/Topcoder/class.topcoder.plugin.php index 05341e4..68dc2c5 100644 --- a/Topcoder/class.topcoder.plugin.php +++ b/Topcoder/class.topcoder.plugin.php @@ -302,7 +302,6 @@ public function gdn_auth_startAuthenticator_handler() { $headersToken = $this->getBearerToken(); $accessToken = $headersToken ? $headersToken : $cookiesToken; - $accessToken = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5VSkZORGd4UlRVME5EWTBOVVkzTlRkR05qTXlRamxETmpOQk5UYzVRVUV3UlRFeU56TTJRUSJ9.eyJodHRwczovL3RvcGNvZGVyLWRldi5jb20vcm9sZXMiOlsiQ29ubmVjdCBTdXBwb3J0IiwidGVzdFJvbGUiLCJhYWEiLCJ0b255X3Rlc3RfMSIsIkNvbm5lY3QgTWFuYWdlciIsIkNvbm5lY3QgQWRtaW4iLCJjb3BpbG90IiwiQ29ubmVjdCBDb3BpbG90IE1hbmFnZXIiLCJUb3Bjb2RlciBVc2VyIiwiYWRtaW5pc3RyYXRvciIsInUtYmFobiJdLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vdXNlcklkIjoiODU0Nzg5OSIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS9oYW5kbGUiOiJUb255SiIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS91c2VyX2lkIjoiYXV0aDB8ODU0Nzg5OSIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS90Y3NzbyI6Ijg1NDc4OTl8ZmVlYmI2OGE4ZjYwMzdkZDlmYTE5YTY3ODY2ZmY3YTc1NTNhMjZlNTQ1MWI5YWE0Mzg5ZDMyOGQ2ODgwYzkiLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vYWN0aXZlIjp0cnVlLCJuaWNrbmFtZSI6IlRvbnlKIiwibmFtZSI6ImFqZWZ0c0B0b3Bjb2Rlci5jb20iLCJwaWN0dXJlIjoiaHR0cHM6Ly9zLmdyYXZhdGFyLmNvbS9hdmF0YXIvZjExODkyYzM4MTQwMzZjNjhjNzhmNGNlMGY2Yzg3NjE_cz00ODAmcj1wZyZkPWh0dHBzJTNBJTJGJTJGY2RuLmF1dGgwLmNvbSUyRmF2YXRhcnMlMkZhai5wbmciLCJ1cGRhdGVkX2F0IjoiMjAyMS0wMy0yNFQxODoxMTo0MS4zODhaIiwiZW1haWwiOiJhamVmdHNAdG9wY29kZXIuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImlzcyI6Imh0dHBzOi8vYXV0aC50b3Bjb2Rlci1kZXYuY29tLyIsInN1YiI6ImF1dGgwfDg1NDc4OTkiLCJhdWQiOiJCWFdYVVduaWxWVVBkTjAxdDJTZTI5VHcyWllOR1p2SCIsImlhdCI6MTYxNjYwOTUyMiwiZXhwIjoxNjE2NjA5ODIyLCJub25jZSI6ImJrRnFNRk56Wm05TVZtMUNjRW93TUhGU2RXUkRZbFZzZmtobGVuaHNVRFIyVUZFd1ZrZFZURmROWnc9PSJ9.Cpx63LV-34NVXyUZcjKwYRq_2qM7aJqdJerhpLSdXoWqaAjotOD8tXZWGM9aflokJgAxb0lfkDAwPieTt_rdfBs7HkBfQScTjCPrYsBwXiKAFc1oCYjqIwsuzKv3tYE2FtLpDUh05RGCNMKORMN5meCjfDh7RoHe8q4hEnwSMZc2vgkvMMda-hPxRKedLSQn7jKblSLaWvvpWpsVuR8Ig7qbNh47rRkrODSLlL5Szi0qgxJeycued2a69VzOsigDPbUnqzIZZJitKNVQeZF6WG4eoG7lYV1MBfAnmRgLRezZ8dkJ_AHj_x7PNFlYB_s-mumoWhg9pU0IZ93KW9Lsxg'; if ($cookiesToken) { self::log('Token from Cookies', ['value' => $cookiesToken]); }