1 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 55707000cf8..75193309a4e 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -18,14 +18,14 @@ class Import::BitbucketController < Import::BaseController
     if auth_state.blank? || !ActiveSupport::SecurityUtils.secure_compare(auth_state, params[:state])
       go_to_bitbucket_for_permissions
     else
-      response = oauth_client.auth_code.get_token(params[:code], redirect_uri: users_import_bitbucket_callback_url)
+      response = oauth_client.auth_code.get_token(params[:code], redirect_uri: users_import_bitbucket_callback_url(namespace_id: params[:namespace_id]))
 
       session[:bitbucket_token]         = response.token
       session[:bitbucket_expires_at]    = response.expires_at
       session[:bitbucket_expires_in]    = response.expires_in
       session[:bitbucket_refresh_token] = response.refresh_token
 
-      redirect_to status_import_bitbucket_url
+      redirect_to status_import_bitbucket_url(namespace_id: params[:namespace_id])
     end
   end
 
@@ -78,16 +78,15 @@ class Import::BitbucketController < Import::BaseController
     bitbucket_repos.reject { |repo| repo.valid? }
   end
 
+  def provider_url
+    nil
+  end
+
   override :provider_name
   def provider_name
     :bitbucket
   end
 
-  override :provider_url
-  def provider_url
-    provider.url
-  end
-
   private
 
   def oauth_client
@@ -121,7 +120,7 @@ class Import::BitbucketController < Import::BaseController
   def go_to_bitbucket_for_permissions
     state = SecureRandom.base64(64)
     session[:bitbucket_auth_state] = state
-    redirect_to oauth_client.auth_code.authorize_url(redirect_uri: users_import_bitbucket_callback_url, state: state)
+    redirect_to oauth_client.auth_code.authorize_url(redirect_uri: users_import_bitbucket_callback_url(namespace_id: params[:namespace_id]), state: state)
   end
 
   def bitbucket_unauthorized(exception)