Merge pull request #16357 from CartoDB/bug/sc-186998/aquaservice-error-while-trying-to-import

NEWS.md

@@ -65,6 +65,7 @@ Development
 - Fix regenerating API Keys for a whole organization [#16336](https://github.com/CartoDB/cartodb/pull/16336)
 - Fix API Keys propagation to Redis function [#16340](https://github.com/CartoDB/cartodb/pull/16340)
 - Fix scrolling on widget's sidebar in builder [#16350](https://github.com/CartoDB/cartodb/pull/16350)
+- Fix Auth URL generation while establishing a connection with Google Drive [#16357](https://github.com/CartoDB/cartodb/pull/16357)
 - Fix adding license metadata to a dataset [#16356](https://github.com/CartoDB/cartodb/pull/16356)
 
 4.45.0 (2021-04-14)

services/datasources/lib/datasources/url/bigquery.rb

@@ -72,8 +72,8 @@ module CartoDB
         # @return string | nil
         def get_auth_url()
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username)
-                                                         .sub('service', service_name)
+          @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name)
+                                                         .sub('user', @user.username)
           @client.authorization_uri.to_s
         end
 

services/datasources/lib/datasources/url/box.rb

@@ -332,7 +332,7 @@ module CartoDB
         # @return string | nil
         def get_auth_url
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           BoxAPI::oauth_url(state,
                             host: config['box_host'],
                             response_type: "code",

services/datasources/lib/datasources/url/dropbox.rb

@@ -279,7 +279,7 @@ module CartoDB
 
         def state
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
         end
       end
     end

services/datasources/lib/datasources/url/gdrive.rb

@@ -77,8 +77,8 @@ module CartoDB
         def get_auth_url(use_callback_flow = true)
           if use_callback_flow
             service_name = service_name_for_user(DATASOURCE_NAME, @user)
-            @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username)
-                                                           .sub('service', service_name)
+            @client.state = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name)
+                                                           .sub('user', @user.username)
           else
             @client.redirect_uri = REDIRECT_URI
           end

services/datasources/lib/datasources/url/instagram_oauth.rb

@@ -30,7 +30,7 @@ module CartoDB
           raise ServiceDisabledError.new(DATASOURCE_NAME, @user.username) unless @user.has_feature_flag?('instagram_import')
 
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           @callback_url = "#{config.fetch('callback_url')}?state=#{placeholder}"
 
           self.filter   = []

services/datasources/lib/datasources/url/mailchimp.rb

@@ -40,7 +40,7 @@ module CartoDB
           @http_connect_timeout = config.fetch(:http_connect_timeout, 60)
 
           service_name = service_name_for_user(DATASOURCE_NAME, @user)
-          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('user', @user.username).sub('service', service_name)
+          placeholder = CALLBACK_STATE_DATA_PLACEHOLDER.sub('service', service_name).sub('user', @user.username)
           @callback_url = "#{config.fetch('callback_url')}?state=#{placeholder}"
 
           Gibbon::API.timeout = API_TIMEOUT_SECS