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

PHPBB3-16689
---
 phpBB/phpbb/auth/provider/oauth/service/bitly.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/phpBB/phpbb/auth/provider/oauth/service/bitly.php b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
index 44cb957acf..fe10774f77 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/bitly.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/bitly.php
@@ -77,8 +77,13 @@ class bitly extends base
 			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
 		}
 
+		if (!isset($result['data']['login']))
+		{
+			throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
+		}
+
 		// Return the unique identifier returned from bitly
-		return $result['data']['login'] ?? throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
+		return $result['data']['login'];
 	}
 
 	/**
@@ -101,7 +106,12 @@ class bitly extends base
 			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
 		}
 
+		if (!isset($result['data']['login']))
+		{
+			throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
+		}
+
 		// Return the unique identifier
-		return $result['data']['login'] ?? throw new exception('AUTH_PROVIDER_OAUTH_RETURN_ERROR');
+		return $result['data']['login'];
 	}
 }