From 91707d166d386c0561fe4224dbebdfeeef64ac07 Mon Sep 17 00:00:00 2001 From: "Benjamin D. Plessinger" Date: Fri, 10 Jul 2020 10:40:40 -0400 Subject: [PATCH 1/3] add person_id to current user api call --- classes/Rest/Controllers/UserControllerProvider.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Rest/Controllers/UserControllerProvider.php b/classes/Rest/Controllers/UserControllerProvider.php index 7f534a6e61..be12c23077 100644 --- a/classes/Rest/Controllers/UserControllerProvider.php +++ b/classes/Rest/Controllers/UserControllerProvider.php @@ -142,7 +142,8 @@ private function extractUserData(XDUser $user) 'autoload_suppression' => isset($_SESSION['suppress_profile_autoload']), 'field_of_science' => $user->getFieldOfScience(), 'active_role' => $mostPrivilegedFormalName, - 'most_privileged_role' => $mostPrivilegedFormalName + 'most_privileged_role' => $mostPrivilegedFormalName, + 'person_id' => $user->getPersonID(true) ); } From ad13b40e1c26db17e3cac10b38bc42be5efc3d79 Mon Sep 17 00:00:00 2001 From: "Benjamin D. Plessinger" Date: Fri, 10 Jul 2020 10:47:21 -0400 Subject: [PATCH 2/3] add raw_data_allowed_realms --- classes/Rest/Controllers/UserControllerProvider.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/classes/Rest/Controllers/UserControllerProvider.php b/classes/Rest/Controllers/UserControllerProvider.php index be12c23077..6a45ffeb1f 100644 --- a/classes/Rest/Controllers/UserControllerProvider.php +++ b/classes/Rest/Controllers/UserControllerProvider.php @@ -133,6 +133,14 @@ private function extractUserData(XDUser $user) $organization = Organizations::getAbbrevById($user->getOrganizationID()); $mostPrivilegedFormalName = "$mostPrivilegedFormalName - $organization"; } + $rawRealmConfig = \DataWarehouse\Access\RawData::getRawDataRealms($user); + $rawDataRealms = array_map( + function ($item) { + return $item['name']; + }, + $rawRealmConfig + ); + return array( 'first_name' => $user->getFirstName(), 'last_name' => $user->getLastName(), @@ -143,7 +151,8 @@ private function extractUserData(XDUser $user) 'field_of_science' => $user->getFieldOfScience(), 'active_role' => $mostPrivilegedFormalName, 'most_privileged_role' => $mostPrivilegedFormalName, - 'person_id' => $user->getPersonID(true) + 'person_id' => $user->getPersonID(true), + 'raw_data_allowed_realms' => $rawDataRealms ); } From c629554dc025aff3b2bad2bbbb6fb5b57089bc41 Mon Sep 17 00:00:00 2001 From: "Benjamin D. Plessinger" Date: Fri, 10 Jul 2020 11:11:32 -0400 Subject: [PATCH 3/3] update-tests1 --- .../user_controller/output/get_current_user-cd-8.0.0.json | 6 +++++- .../user_controller/output/get_current_user-cs-8.0.0.json | 6 +++++- .../user_controller/output/get_current_user-mgr-8.0.0.json | 6 +++++- .../user_controller/output/get_current_user-pi-8.0.0.json | 6 +++++- .../user_controller/output/get_current_user-usr-8.0.0.json | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tests/artifacts/xdmod/user_controller/output/get_current_user-cd-8.0.0.json b/tests/artifacts/xdmod/user_controller/output/get_current_user-cd-8.0.0.json index 590d952d24..653ff90c3d 100644 --- a/tests/artifacts/xdmod/user_controller/output/get_current_user-cd-8.0.0.json +++ b/tests/artifacts/xdmod/user_controller/output/get_current_user-cd-8.0.0.json @@ -9,6 +9,10 @@ "autoload_suppression": false, "field_of_science": "0", "active_role": "Center Director - screw", - "most_privileged_role": "Center Director - screw" + "most_privileged_role": "Center Director - screw", + "person_id": "97", + "raw_data_allowed_realms": [ + "Jobs" + ] } } diff --git a/tests/artifacts/xdmod/user_controller/output/get_current_user-cs-8.0.0.json b/tests/artifacts/xdmod/user_controller/output/get_current_user-cs-8.0.0.json index 71fc58adfd..a591df071f 100644 --- a/tests/artifacts/xdmod/user_controller/output/get_current_user-cs-8.0.0.json +++ b/tests/artifacts/xdmod/user_controller/output/get_current_user-cs-8.0.0.json @@ -9,6 +9,10 @@ "autoload_suppression": false, "field_of_science": "0", "active_role": "Center Staff - screw", - "most_privileged_role": "Center Staff - screw" + "most_privileged_role": "Center Staff - screw", + "person_id": "111", + "raw_data_allowed_realms": [ + "Jobs" + ] } } diff --git a/tests/artifacts/xdmod/user_controller/output/get_current_user-mgr-8.0.0.json b/tests/artifacts/xdmod/user_controller/output/get_current_user-mgr-8.0.0.json index 84d9c00686..35206efd6b 100644 --- a/tests/artifacts/xdmod/user_controller/output/get_current_user-mgr-8.0.0.json +++ b/tests/artifacts/xdmod/user_controller/output/get_current_user-mgr-8.0.0.json @@ -9,6 +9,10 @@ "autoload_suppression": false, "field_of_science": "0", "active_role": "User", - "most_privileged_role": "User" + "most_privileged_role": "User", + "person_id": "-1", + "raw_data_allowed_realms": [ + "Jobs" + ] } } diff --git a/tests/artifacts/xdmod/user_controller/output/get_current_user-pi-8.0.0.json b/tests/artifacts/xdmod/user_controller/output/get_current_user-pi-8.0.0.json index f8413b05ff..f47625dd86 100644 --- a/tests/artifacts/xdmod/user_controller/output/get_current_user-pi-8.0.0.json +++ b/tests/artifacts/xdmod/user_controller/output/get_current_user-pi-8.0.0.json @@ -9,6 +9,10 @@ "autoload_suppression": false, "field_of_science": "0", "active_role": "Principal Investigator", - "most_privileged_role": "Principal Investigator" + "most_privileged_role": "Principal Investigator", + "person_id": "9", + "raw_data_allowed_realms": [ + "Jobs" + ] } } diff --git a/tests/artifacts/xdmod/user_controller/output/get_current_user-usr-8.0.0.json b/tests/artifacts/xdmod/user_controller/output/get_current_user-usr-8.0.0.json index 28dda6098f..21fdeed707 100644 --- a/tests/artifacts/xdmod/user_controller/output/get_current_user-usr-8.0.0.json +++ b/tests/artifacts/xdmod/user_controller/output/get_current_user-usr-8.0.0.json @@ -9,6 +9,10 @@ "autoload_suppression": false, "field_of_science": "0", "active_role": "User", - "most_privileged_role": "User" + "most_privileged_role": "User", + "person_id": "114", + "raw_data_allowed_realms":[ + "Jobs" + ] } }