From 53070781713a6a11f8f0c25d5dc06061c69566d2 Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Tue, 11 Sep 2018 12:13:06 +0200 Subject: [PATCH] Added CR suggestions --- .../templates/25_exception_safe_private_functions.erb | 4 ++-- client/sql/21_bulk_geocoding_functions.sql | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/renderer/templates/25_exception_safe_private_functions.erb b/client/renderer/templates/25_exception_safe_private_functions.erb index 4a12b05..c027253 100644 --- a/client/renderer/templates/25_exception_safe_private_functions.erb +++ b/client/renderer/templates/25_exception_safe_private_functions.erb @@ -12,9 +12,9 @@ DECLARE _pg_exception_context TEXT; <% unless superuser_function? -%>apikey_permissions json;<% end %> BEGIN - IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN + <% unless requires_permission %>IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN RAISE EXCEPTION 'The api_key must be provided'; - END IF; + END IF;<% end %> <% unless superuser_function? -%>SELECT u, o, p INTO username, orgname, apikey_permissions FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text, p json); <% if requires_permission %>IF apikey_permissions IS NULL OR NOT apikey_permissions::jsonb ? '<%= permission_name %>' THEN RAISE EXCEPTION '<%= permission_error %>'; diff --git a/client/sql/21_bulk_geocoding_functions.sql b/client/sql/21_bulk_geocoding_functions.sql index d4d7c5d..723ead3 100644 --- a/client/sql/21_bulk_geocoding_functions.sql +++ b/client/sql/21_bulk_geocoding_functions.sql @@ -17,9 +17,6 @@ DECLARE orgname text; apikey_permissions json; BEGIN - IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN - RAISE EXCEPTION 'The api_key must be provided'; - END IF; SELECT u, o, p INTO username, orgname, apikey_permissions FROM cdb_dataservices_client._cdb_entity_config() AS (u text, o text, p json); IF apikey_permissions IS NULL OR NOT apikey_permissions::jsonb ? 'geocoding' THEN RAISE EXCEPTION 'Geocoding permission denied' USING ERRCODE = '01007';