From 18e164608bae210bb18f3746af050cf12162be47 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 1 Oct 2019 21:02:20 +0530 Subject: [PATCH] fix: reverted back to UUID from account_id --- app/config/providers.php | 2 +- src/Auth/OAuth/Bitbucket.php | 7 +++++-- src/Auth/OAuth/Instagram.php | 0 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 src/Auth/OAuth/Instagram.php diff --git a/app/config/providers.php b/app/config/providers.php index fde8652ee8..01b7b6b429 100644 --- a/app/config/providers.php +++ b/app/config/providers.php @@ -29,7 +29,7 @@ return [ 'instagram' => [ 'developers' => 'https://www.instagram.com/developer/', 'icon' => 'icon-instagram', - 'enabled' => true, + 'enabled' => false, ], 'microsoft' => [ 'developers' => 'https://developer.microsoft.com/en-us/', diff --git a/src/Auth/OAuth/Bitbucket.php b/src/Auth/OAuth/Bitbucket.php index d8a2cce570..b0e9969c1b 100644 --- a/src/Auth/OAuth/Bitbucket.php +++ b/src/Auth/OAuth/Bitbucket.php @@ -71,8 +71,8 @@ class Bitbucket extends OAuth { $user = $this->getUser($accessToken); - if (isset($user['account_id'])) { - return $user['account_id']; + if (isset($user['uuid'])) { + return $user['uuid']; } return ''; @@ -123,6 +123,9 @@ class Bitbucket extends OAuth $email = $this->request('GET', 'https://api.bitbucket.org/2.0/user/emails?access_token='.urlencode($accessToken)); $this->user['email'] = json_decode($email, true)['values'][0]['email']; + + // var_dump($user); + // exit(); } return $this->user; } diff --git a/src/Auth/OAuth/Instagram.php b/src/Auth/OAuth/Instagram.php deleted file mode 100644 index e69de29bb2..0000000000