From 2c4b86264803504268f11431f875c530af1f731a Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Tue, 19 Jan 2021 15:14:43 +0100
Subject: [PATCH] [ticket/16689] Fix SQL errors for Bitly OAuth

PHPBB3-16689
---
 phpBB/language/en/common.php                      | 1 +
 phpBB/phpbb/auth/provider/oauth/service/bitly.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2fc7eeb12a..7443f27be3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -95,6 +95,7 @@ $lang = array_merge($lang, array(
 	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY'				=> 'Invalid database entry.',
 	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'		=> 'Invalid service type provided to OAuth service handler.',
 	'AUTH_PROVIDER_OAUTH_ERROR_REQUEST'						=> 'Something went wrong when processing your OAuth request.',
+	'AUTH_PROVIDER_OAUTH_RETURN_ERROR'						=> 'The external service returned a wrong value therefore your request can not be processed.',
 	'AUTH_PROVIDER_OAUTH_ERROR_SERVICE_NOT_CREATED'			=> 'OAuth service not created',
 	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'						=> 'Bitly',
 	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'					=> 'Facebook',
diff --git a/phpBB/phpbb/auth/provider/oauth/service/bitly.php b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
index ca131b2019..44cb957acf 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/bitly.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
@@ -78,7 +78,7 @@ class bitly extends base
 		}
 
 		// Return the unique identifier returned from bitly
-		return $result['data']['login'];
+		return $result['data']['login'] ?? throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
 	}
 
 	/**
@@ -102,6 +102,6 @@ class bitly extends base
 		}
 
 		// Return the unique identifier
-		return $result['data']['login'];
+		return $result['data']['login'] ?? throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
 	}
 }