From 428a2391ad8649d97e44dcf106f28ca89c102c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Mon, 7 Sep 2015 09:56:59 +0200 Subject: [PATCH] Refactor Member -> User --- scripts-available/CDB_Groups.sql | 8 ++++---- scripts-available/CDB_Groups_API.sql | 4 ++-- test/organization/test.sh | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts-available/CDB_Groups.sql b/scripts-available/CDB_Groups.sql index 41687fa..06d4d03 100644 --- a/scripts-available/CDB_Groups.sql +++ b/scripts-available/CDB_Groups.sql @@ -52,7 +52,7 @@ $$ LANGUAGE PLPGSQL VOLATILE; -- Adds a user to a group CREATE OR REPLACE -FUNCTION cartodb.CDB_Group_AddMember(group_name text, username text) +FUNCTION cartodb.CDB_Group_AddUser(group_name text, username text) RETURNS VOID AS $$ DECLARE group_role TEXT; @@ -65,13 +65,13 @@ BEGIN RAISE EXCEPTION 'Group role (%) and user role (%) must be already existing', group_role, user_role; END IF; EXECUTE format('GRANT %I TO %I', group_role, user_role); - PERFORM cartodb._CDB_Group_AddMember_API(group_name, username); + PERFORM cartodb._CDB_Group_AddUser_API(group_name, username); END $$ LANGUAGE PLPGSQL VOLATILE; -- Removes a user from a group CREATE OR REPLACE -FUNCTION cartodb.CDB_Group_RemoveMember(group_name text, username text) +FUNCTION cartodb.CDB_Group_RemoveUser(group_name text, username text) RETURNS VOID AS $$ DECLARE group_role TEXT; @@ -80,7 +80,7 @@ BEGIN group_role := cartodb._CDB_Group_GroupRole(group_name); user_role := cartodb._CDB_User_RoleFromUsername(username); EXECUTE format('REVOKE %I FROM %I', group_role, user_role); - PERFORM cartodb._CDB_Group_RemoveMember_API(group_name, username); + PERFORM cartodb._CDB_Group_RemoveUser_API(group_name, username); END $$ LANGUAGE PLPGSQL VOLATILE; diff --git a/scripts-available/CDB_Groups_API.sql b/scripts-available/CDB_Groups_API.sql index 5287802..db3ad0e 100644 --- a/scripts-available/CDB_Groups_API.sql +++ b/scripts-available/CDB_Groups_API.sql @@ -45,7 +45,7 @@ $$ $$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER; CREATE OR REPLACE -FUNCTION cartodb._CDB_Group_AddMember_API(group_name text, username text) +FUNCTION cartodb._CDB_Group_AddUser_API(group_name text, username text) RETURNS VOID AS $$ import string @@ -58,7 +58,7 @@ $$ $$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER; CREATE OR REPLACE -FUNCTION cartodb._CDB_Group_RemoveMember_API(group_name text, username text) +FUNCTION cartodb._CDB_Group_RemoveUser_API(group_name text, username text) RETURNS VOID AS $$ import string diff --git a/test/organization/test.sh b/test/organization/test.sh index 56a5b0d..5d55115 100644 --- a/test/organization/test.sh +++ b/test/organization/test.sh @@ -187,7 +187,7 @@ function setup() { sql "SELECT cartodb.CDB_Group_CreateGroup('group_a_tmp')" sql "SELECT cartodb.CDB_Group_RenameGroup('group_a_tmp', 'group_a')" - sql "SELECT cartodb.CDB_Group_AddMember('group_a', 'cdb_testmember_1')" + sql "SELECT cartodb.CDB_Group_AddUser('group_a', 'cdb_testmember_1')" sql "SELECT cartodb.CDB_Group_CreateGroup('group_b')" } @@ -203,7 +203,7 @@ function tear_down() { sql "select cartodb.CDB_Group_DropGroup('group_b')" - sql "SELECT cartodb.CDB_Group_RemoveMember('group_a', 'cdb_testmember_1')" + sql "SELECT cartodb.CDB_Group_RemoveUser('group_a', 'cdb_testmember_1')" sql "select cartodb.CDB_Group_DropGroup('group_a')" sql "SELECT cartodb.CDB_Organization_RemoveAdmin('cdb_org_admin');" @@ -474,8 +474,8 @@ function test_group_management_functions_cant_be_used_by_normal_members() { sql cdb_testmember_1 "SELECT cartodb.CDB_Group_CreateGroup('group_x_1');" fails sql cdb_testmember_1 "SELECT cartodb.CDB_Group_RenameGroup('group_a', 'group_x_2');" fails sql cdb_testmember_1 "SELECT cartodb.CDB_Group_DropGroup('group_a');" fails - sql cdb_testmember_1 "SELECT cartodb.CDB_Group_AddMember('group_a', 'cdb_testmember_2');" fails - sql cdb_testmember_1 "SELECT cartodb.CDB_Group_RemoveMember('group_a', 'cdb_testmember_1');" fails + sql cdb_testmember_1 "SELECT cartodb.CDB_Group_AddUser('group_a', 'cdb_testmember_2');" fails + sql cdb_testmember_1 "SELECT cartodb.CDB_Group_RemoveUser('group_a', 'cdb_testmember_1');" fails } function test_group_permission_functions_cant_be_used_by_normal_members() { @@ -496,8 +496,8 @@ function test_group_permission_functions_cant_be_used_by_normal_members() { function test_group_management_functions_can_be_used_by_org_admin() { sql cdb_org_admin "SELECT cartodb.CDB_Group_CreateGroup('group_x_tmp');" sql cdb_org_admin "SELECT cartodb.CDB_Group_RenameGroup('group_x_tmp', 'group_x');" - sql cdb_org_admin "SELECT cartodb.CDB_Group_AddMember('group_x', 'cdb_testmember_1');" - sql cdb_org_admin "SELECT cartodb.CDB_Group_RemoveMember('group_x', 'cdb_testmember_1');" + sql cdb_org_admin "SELECT cartodb.CDB_Group_AddUser('group_x', 'cdb_testmember_1');" + sql cdb_org_admin "SELECT cartodb.CDB_Group_RemoveUser('group_x', 'cdb_testmember_1');" # TODO: workaround superadmin limitation sql "SELECT cartodb.CDB_Group_DropGroup('group_x');" }