From 4d3e9f2b32d0d88a41c94023e9f9e07b0f9952c9 Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Tue, 11 Sep 2018 10:14:52 +0200 Subject: [PATCH] Getting the username from cdb_conf --- client/sql/15_config_management.sql | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client/sql/15_config_management.sql b/client/sql/15_config_management.sql index d1e92f5..7e03c3f 100644 --- a/client/sql/15_config_management.sql +++ b/client/sql/15_config_management.sql @@ -25,16 +25,11 @@ BEGIN IF is_organization IS NULL THEN RAISE EXCEPTION 'User must have user configuration in the config table'; ELSIF is_organization = TRUE THEN - SELECT nspname - FROM pg_namespace s - LEFT JOIN pg_roles r ON s.nspowner = r.oid - WHERE r.rolname = session_user INTO username; SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO organization_name; ELSE - SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO username; organization_name = NULL; END IF; - result.username = username; + result.username = apikey_config->'username'; result.organization_name = organization_name; result.apikey_permissions = apikey_config->'permissions'; RETURN result;