Change GeoNode routes to use url_helpers

app/models/geo_node.rb

@@ -66,13 +66,11 @@ class GeoNode < ActiveRecord::Base
   end
 
   def oauth_callback_url
-    URI.join(uri, "#{uri.path}/", 'oauth/geo/callback').to_s
+    Gitlab::Routing.url_helpers.oauth_geo_callback_url(url_helper_args)
   end
 
   def oauth_logout_url(state)
-    logout_uri = URI.join(uri, "#{uri.path}/", 'oauth/geo/logout')
-    logout_uri.query = "state=#{state}"
-    logout_uri.to_s
+    Gitlab::Routing.url_helpers.oauth_geo_logout_url(url_helper_args.merge(state: state))
   end
 
   def missing_oauth_application?
@@ -81,6 +79,14 @@ class GeoNode < ActiveRecord::Base
 
   private
 
+  def url_helper_args
+    if relative_url_root
+      relative_url = relative_url_root.starts_with?('/') ? relative_url_root : "/#{relative_url_root}"
+    end
+
+    { protocol: schema, host: host, port: port, script_name: relative_url }
+  end
+
   def refresh_bulk_notify_worker_status
     if Gitlab::Geo.primary?
       Gitlab::Geo.bulk_notify_job.try(:enable!)

config/routes.rb

@@ -53,10 +53,12 @@ Rails.application.routes.draw do
                 authorizations: 'oauth/authorizations'
   end
 
-  namespace :oauth, path: 'oauth/geo', controller: 'geo_auth', as: 'oauth_geo' do
-    get 'auth'
-    get 'callback'
-    get 'logout'
+  namespace :oauth do
+    scope path: 'geo', controller: :geo_auth, as: :geo do
+      get 'auth'
+      get 'callback'
+      get 'logout'
+    end
   end
 
   # Autocomplete