From 7d8eb4ddb09f96fe19722476144d73d32228f3a8 Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Thu, 26 Oct 2017 13:59:28 +0300
Subject: [PATCH] Fix bitbucket login

---
 changelogs/unreleased/39495-fix-bitbucket-login.yml | 5 +++++
 lib/omni_auth/strategies/bitbucket.rb               | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 changelogs/unreleased/39495-fix-bitbucket-login.yml

diff --git a/changelogs/unreleased/39495-fix-bitbucket-login.yml b/changelogs/unreleased/39495-fix-bitbucket-login.yml
new file mode 100644
index 00000000000..b48d557108b
--- /dev/null
+++ b/changelogs/unreleased/39495-fix-bitbucket-login.yml
@@ -0,0 +1,5 @@
+---
+title: Fix bitbucket login
+merge_request: 15051
+author:
+type: fixed
diff --git a/lib/omni_auth/strategies/bitbucket.rb b/lib/omni_auth/strategies/bitbucket.rb
index 5a7d67c2390..ce1bdfe6ee4 100644
--- a/lib/omni_auth/strategies/bitbucket.rb
+++ b/lib/omni_auth/strategies/bitbucket.rb
@@ -36,6 +36,10 @@ module OmniAuth
         email_response = access_token.get('api/2.0/user/emails').parsed
         @emails ||= email_response && email_response['values'] || nil
       end
+
+      def callback_url
+        options[:redirect_uri] || (full_host + script_name + callback_path)
+      end
     end
   end
 end