{"action":"created","comment":{"url":"https://api.github.com/repos/ubccr/xdmod/pulls/comments/227482127","pull_request_review_id":167533971,"id":227482127,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyNzQ4MjEyNw==","diff_hunk":"@@ -335,6 +335,56 @@ protected function updateUser($userId, $password = null, $firstName = null, $las\n         $helper->logout();\n     }\n \n+    /**\n+     * Update the user identified by $userId w/ the values supplied for the rest of the function\n+     * arguments. Note that this utilizes the user_admin/update_user operation to do the updating\n+     * as opposed to the `updateCurrentUser` function that utilizes the `users/current` rest path.\n+     *\n+     * @param int    $userId\n+     * @param string $emailAddress\n+     * @param array  $acls\n+     * @param int    $assignedPerson\n+     * @param int    $institution\n+     * @param int    $user_type\n+     * @throws Exception\n+     */\n+    protected function updateUser($userId, $emailAddress, $acls, $assignedPerson, $institution, $user_type)","path":"open_xdmod/modules/xdmod/integration_tests/lib/Controllers/BaseUserAdminTest.php","position":26,"original_position":26,"commit_id":"1168744aeec2fa245942fb1cf0267d1006fefd42","original_commit_id":"1168744aeec2fa245942fb1cf0267d1006fefd42","user":{"login":"plessbd","id":683012,"node_id":"MDQ6VXNlcjY4MzAxMg==","avatar_url":"https://avatars2.githubusercontent.com/u/683012?v=4","gravatar_id":"","url":"https://api.github.com/users/plessbd","html_url":"https://github.com/plessbd","followers_url":"https://api.github.com/users/plessbd/followers","following_url":"https://api.github.com/users/plessbd/following{/other_user}","gists_url":"https://api.github.com/users/plessbd/gists{/gist_id}","starred_url":"https://api.github.com/users/plessbd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/plessbd/subscriptions","organizations_url":"https://api.github.com/users/plessbd/orgs","repos_url":"https://api.github.com/users/plessbd/repos","events_url":"https://api.github.com/users/plessbd/events{/privacy}","received_events_url":"https://api.github.com/users/plessbd/received_events","type":"User","site_admin":false},"body":"why do we use `institution` here instead of `organization`?","created_at":"2018-10-23T17:04:01Z","updated_at":"2018-10-23T17:04:02Z","html_url":"https://github.com/ubccr/xdmod/pull/692#discussion_r227482127","pull_request_url":"https://api.github.com/repos/ubccr/xdmod/pulls/692","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/comments/227482127"},"html":{"href":"https://github.com/ubccr/xdmod/pull/692#discussion_r227482127"},"pull_request":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/692"}}},"pull_request":{"url":"https://api.github.com/repos/ubccr/xdmod/pulls/692","id":219818647,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE5ODE4NjQ3","html_url":"https://github.com/ubccr/xdmod/pull/692","diff_url":"https://github.com/ubccr/xdmod/pull/692.diff","patch_url":"https://github.com/ubccr/xdmod/pull/692.patch","issue_url":"https://api.github.com/repos/ubccr/xdmod/issues/692","number":692,"state":"open","locked":false,"title":"Update sso user retrieval","user":{"login":"ryanrath","id":10520715,"node_id":"MDQ6VXNlcjEwNTIwNzE1","avatar_url":"https://avatars2.githubusercontent.com/u/10520715?v=4","gravatar_id":"","url":"https://api.github.com/users/ryanrath","html_url":"https://github.com/ryanrath","followers_url":"https://api.github.com/users/ryanrath/followers","following_url":"https://api.github.com/users/ryanrath/following{/other_user}","gists_url":"https://api.github.com/users/ryanrath/gists{/gist_id}","starred_url":"https://api.github.com/users/ryanrath/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ryanrath/subscriptions","organizations_url":"https://api.github.com/users/ryanrath/orgs","repos_url":"https://api.github.com/users/ryanrath/repos","events_url":"https://api.github.com/users/ryanrath/events{/privacy}","received_events_url":"https://api.github.com/users/ryanrath/received_events","type":"User","site_admin":false},"body":"## Description\r\nAdded additional functionality to both SSO & normal login path that makes sure\r\nthat the user that is authenticating has an up to date organization_id. A user's\r\norganization can become out of date if the person they are associated with has\r\ntheir organization changed. It can also occur if a User's person is updated but not their organization. \r\n\r\nWe also do not check the organization if the user has been assigned the unknown\r\nperson or organizations.\r\n\r\nAdded a new `MailHelper` class that's a thin wrapper around\r\n`MailWrapper::sendMail` to catch / log any exceptions that may be encountered\r\nwhile sending an email.\r\n\r\n## Motivation and Context\r\nWe need to be able to account for when a user's assigned person has their organization updated. \r\n\r\n## Tests performed\r\nManual Tests Performed:\r\n\r\n- Manually update a centerdirector's user's person to somebody with a different organization.\r\n- Login as the centerdirector\r\n- Check that email(s) have been sent\r\n- Check that the Users record has been updated w/ the new person & organization\r\n- Check that the user no longer has the center director acl. \r\n- Create an SSO User\r\n- Give them the center director acl \r\n- Give them a person w/ an organization != Unknown Organization\r\n- Login via SSO\r\n- Ensure that no email has been generated\r\n- Manually update this users's person w/ somebody who has a different organization\r\n- Login via SSO\r\n- Ensure that emails are generated\r\n- Ensure that the user has their person / organization updated\r\n- Ensure that the user no longer has the center director acl\r\n\r\n## Types of changes\r\n<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->\r\n- [X] Bug fix (non-breaking change which fixes an issue)\r\n- [ ] New feature (non-breaking change which adds functionality)\r\n- [ ] Breaking change (fix or feature that would cause existing functionality to change)\r\n\r\n## Checklist:\r\n<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->\r\n<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->\r\n- [X] My code follows the code style of this project as found in the **CONTRIBUTING** document.\r\n- [ ] I have added tests to cover my changes.\r\n- [X] All new and existing tests passed.\r\n","created_at":"2018-10-02T19:29:52Z","updated_at":"2018-10-23T17:04:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8851f5c412d10b284d861373a5404c3a4b400e8b","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":907687125,"node_id":"MDU6TGFiZWw5MDc2ODcxMjU=","url":"https://api.github.com/repos/ubccr/xdmod/labels/SSO","name":"SSO","color":"d65e22","default":false},{"id":470896633,"node_id":"MDU6TGFiZWw0NzA4OTY2MzM=","url":"https://api.github.com/repos/ubccr/xdmod/labels/bug","name":"bug","color":"ee0701","default":true}],"milestone":{"url":"https://api.github.com/repos/ubccr/xdmod/milestones/8","html_url":"https://github.com/ubccr/xdmod/milestone/8","labels_url":"https://api.github.com/repos/ubccr/xdmod/milestones/8/labels","id":3075821,"node_id":"MDk6TWlsZXN0b25lMzA3NTgyMQ==","number":8,"title":"8.0.0","description":"","creator":{"login":"smgallo","id":2301909,"node_id":"MDQ6VXNlcjIzMDE5MDk=","avatar_url":"https://avatars1.githubusercontent.com/u/2301909?v=4","gravatar_id":"","url":"https://api.github.com/users/smgallo","html_url":"https://github.com/smgallo","followers_url":"https://api.github.com/users/smgallo/followers","following_url":"https://api.github.com/users/smgallo/following{/other_user}","gists_url":"https://api.github.com/users/smgallo/gists{/gist_id}","starred_url":"https://api.github.com/users/smgallo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smgallo/subscriptions","organizations_url":"https://api.github.com/users/smgallo/orgs","repos_url":"https://api.github.com/users/smgallo/repos","events_url":"https://api.github.com/users/smgallo/events{/privacy}","received_events_url":"https://api.github.com/users/smgallo/received_events","type":"User","site_admin":false},"open_issues":1,"closed_issues":175,"state":"open","created_at":"2018-01-30T18:52:17Z","updated_at":"2018-10-22T14:41:18Z","due_on":"2018-08-27T07:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/ubccr/xdmod/pulls/692/commits","review_comments_url":"https://api.github.com/repos/ubccr/xdmod/pulls/692/comments","review_comment_url":"https://api.github.com/repos/ubccr/xdmod/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ubccr/xdmod/issues/692/comments","statuses_url":"https://api.github.com/repos/ubccr/xdmod/statuses/1168744aeec2fa245942fb1cf0267d1006fefd42","head":{"label":"ryanrath:update_sso_user_retrieval","ref":"update_sso_user_retrieval","sha":"1168744aeec2fa245942fb1cf0267d1006fefd42","user":{"login":"ryanrath","id":10520715,"node_id":"MDQ6VXNlcjEwNTIwNzE1","avatar_url":"https://avatars2.githubusercontent.com/u/10520715?v=4","gravatar_id":"","url":"https://api.github.com/users/ryanrath","html_url":"https://github.com/ryanrath","followers_url":"https://api.github.com/users/ryanrath/followers","following_url":"https://api.github.com/users/ryanrath/following{/other_user}","gists_url":"https://api.github.com/users/ryanrath/gists{/gist_id}","starred_url":"https://api.github.com/users/ryanrath/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ryanrath/subscriptions","organizations_url":"https://api.github.com/users/ryanrath/orgs","repos_url":"https://api.github.com/users/ryanrath/repos","events_url":"https://api.github.com/users/ryanrath/events{/privacy}","received_events_url":"https://api.github.com/users/ryanrath/received_events","type":"User","site_admin":false},"repo":{"id":77923709,"node_id":"MDEwOlJlcG9zaXRvcnk3NzkyMzcwOQ==","name":"xdmod","full_name":"ryanrath/xdmod","private":false,"owner":{"login":"ryanrath","id":10520715,"node_id":"MDQ6VXNlcjEwNTIwNzE1","avatar_url":"https://avatars2.githubusercontent.com/u/10520715?v=4","gravatar_id":"","url":"https://api.github.com/users/ryanrath","html_url":"https://github.com/ryanrath","followers_url":"https://api.github.com/users/ryanrath/followers","following_url":"https://api.github.com/users/ryanrath/following{/other_user}","gists_url":"https://api.github.com/users/ryanrath/gists{/gist_id}","starred_url":"https://api.github.com/users/ryanrath/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ryanrath/subscriptions","organizations_url":"https://api.github.com/users/ryanrath/orgs","repos_url":"https://api.github.com/users/ryanrath/repos","events_url":"https://api.github.com/users/ryanrath/events{/privacy}","received_events_url":"https://api.github.com/users/ryanrath/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ryanrath/xdmod","description":"An open framework for collecting and analyzing HPC metrics.","fork":true,"url":"https://api.github.com/repos/ryanrath/xdmod","forks_url":"https://api.github.com/repos/ryanrath/xdmod/forks","keys_url":"https://api.github.com/repos/ryanrath/xdmod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ryanrath/xdmod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ryanrath/xdmod/teams","hooks_url":"https://api.github.com/repos/ryanrath/xdmod/hooks","issue_events_url":"https://api.github.com/repos/ryanrath/xdmod/issues/events{/number}","events_url":"https://api.github.com/repos/ryanrath/xdmod/events","assignees_url":"https://api.github.com/repos/ryanrath/xdmod/assignees{/user}","branches_url":"https://api.github.com/repos/ryanrath/xdmod/branches{/branch}","tags_url":"https://api.github.com/repos/ryanrath/xdmod/tags","blobs_url":"https://api.github.com/repos/ryanrath/xdmod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ryanrath/xdmod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ryanrath/xdmod/git/refs{/sha}","trees_url":"https://api.github.com/repos/ryanrath/xdmod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ryanrath/xdmod/statuses/{sha}","languages_url":"https://api.github.com/repos/ryanrath/xdmod/languages","stargazers_url":"https://api.github.com/repos/ryanrath/xdmod/stargazers","contributors_url":"https://api.github.com/repos/ryanrath/xdmod/contributors","subscribers_url":"https://api.github.com/repos/ryanrath/xdmod/subscribers","subscription_url":"https://api.github.com/repos/ryanrath/xdmod/subscription","commits_url":"https://api.github.com/repos/ryanrath/xdmod/commits{/sha}","git_commits_url":"https://api.github.com/repos/ryanrath/xdmod/git/commits{/sha}","comments_url":"https://api.github.com/repos/ryanrath/xdmod/comments{/number}","issue_comment_url":"https://api.github.com/repos/ryanrath/xdmod/issues/comments{/number}","contents_url":"https://api.github.com/repos/ryanrath/xdmod/contents/{+path}","compare_url":"https://api.github.com/repos/ryanrath/xdmod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ryanrath/xdmod/merges","archive_url":"https://api.github.com/repos/ryanrath/xdmod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ryanrath/xdmod/downloads","issues_url":"https://api.github.com/repos/ryanrath/xdmod/issues{/number}","pulls_url":"https://api.github.com/repos/ryanrath/xdmod/pulls{/number}","milestones_url":"https://api.github.com/repos/ryanrath/xdmod/milestones{/number}","notifications_url":"https://api.github.com/repos/ryanrath/xdmod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ryanrath/xdmod/labels{/name}","releases_url":"https://api.github.com/repos/ryanrath/xdmod/releases{/id}","deployments_url":"https://api.github.com/repos/ryanrath/xdmod/deployments","created_at":"2017-01-03T14:23:30Z","updated_at":"2017-01-03T14:23:34Z","pushed_at":"2018-10-23T15:31:09Z","git_url":"git://github.com/ryanrath/xdmod.git","ssh_url":"git@github.com:ryanrath/xdmod.git","clone_url":"https://github.com/ryanrath/xdmod.git","svn_url":"https://github.com/ryanrath/xdmod","homepage":"http://open.xdmod.org","size":14098,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"lgpl-3.0","name":"GNU Lesser General Public License v3.0","spdx_id":"LGPL-3.0","url":"https://api.github.com/licenses/lgpl-3.0","node_id":"MDc6TGljZW5zZTEy"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"xdmod6.5"}},"base":{"label":"ubccr:xdmod8.0","ref":"xdmod8.0","sha":"4798df53d90c02eb93a2c49d65a00ae3fbebdaf1","user":{"login":"ubccr","id":2301947,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIzMDE5NDc=","avatar_url":"https://avatars2.githubusercontent.com/u/2301947?v=4","gravatar_id":"","url":"https://api.github.com/users/ubccr","html_url":"https://github.com/ubccr","followers_url":"https://api.github.com/users/ubccr/followers","following_url":"https://api.github.com/users/ubccr/following{/other_user}","gists_url":"https://api.github.com/users/ubccr/gists{/gist_id}","starred_url":"https://api.github.com/users/ubccr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ubccr/subscriptions","organizations_url":"https://api.github.com/users/ubccr/orgs","repos_url":"https://api.github.com/users/ubccr/repos","events_url":"https://api.github.com/users/ubccr/events{/privacy}","received_events_url":"https://api.github.com/users/ubccr/received_events","type":"Organization","site_admin":false},"repo":{"id":72233032,"node_id":"MDEwOlJlcG9zaXRvcnk3MjIzMzAzMg==","name":"xdmod","full_name":"ubccr/xdmod","private":false,"owner":{"login":"ubccr","id":2301947,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIzMDE5NDc=","avatar_url":"https://avatars2.githubusercontent.com/u/2301947?v=4","gravatar_id":"","url":"https://api.github.com/users/ubccr","html_url":"https://github.com/ubccr","followers_url":"https://api.github.com/users/ubccr/followers","following_url":"https://api.github.com/users/ubccr/following{/other_user}","gists_url":"https://api.github.com/users/ubccr/gists{/gist_id}","starred_url":"https://api.github.com/users/ubccr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ubccr/subscriptions","organizations_url":"https://api.github.com/users/ubccr/orgs","repos_url":"https://api.github.com/users/ubccr/repos","events_url":"https://api.github.com/users/ubccr/events{/privacy}","received_events_url":"https://api.github.com/users/ubccr/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/ubccr/xdmod","description":"An open framework for collecting and analyzing HPC metrics.","fork":false,"url":"https://api.github.com/repos/ubccr/xdmod","forks_url":"https://api.github.com/repos/ubccr/xdmod/forks","keys_url":"https://api.github.com/repos/ubccr/xdmod/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ubccr/xdmod/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ubccr/xdmod/teams","hooks_url":"https://api.github.com/repos/ubccr/xdmod/hooks","issue_events_url":"https://api.github.com/repos/ubccr/xdmod/issues/events{/number}","events_url":"https://api.github.com/repos/ubccr/xdmod/events","assignees_url":"https://api.github.com/repos/ubccr/xdmod/assignees{/user}","branches_url":"https://api.github.com/repos/ubccr/xdmod/branches{/branch}","tags_url":"https://api.github.com/repos/ubccr/xdmod/tags","blobs_url":"https://api.github.com/repos/ubccr/xdmod/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ubccr/xdmod/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ubccr/xdmod/git/refs{/sha}","trees_url":"https://api.github.com/repos/ubccr/xdmod/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ubccr/xdmod/statuses/{sha}","languages_url":"https://api.github.com/repos/ubccr/xdmod/languages","stargazers_url":"https://api.github.com/repos/ubccr/xdmod/stargazers","contributors_url":"https://api.github.com/repos/ubccr/xdmod/contributors","subscribers_url":"https://api.github.com/repos/ubccr/xdmod/subscribers","subscription_url":"https://api.github.com/repos/ubccr/xdmod/subscription","commits_url":"https://api.github.com/repos/ubccr/xdmod/commits{/sha}","git_commits_url":"https://api.github.com/repos/ubccr/xdmod/git/commits{/sha}","comments_url":"https://api.github.com/repos/ubccr/xdmod/comments{/number}","issue_comment_url":"https://api.github.com/repos/ubccr/xdmod/issues/comments{/number}","contents_url":"https://api.github.com/repos/ubccr/xdmod/contents/{+path}","compare_url":"https://api.github.com/repos/ubccr/xdmod/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ubccr/xdmod/merges","archive_url":"https://api.github.com/repos/ubccr/xdmod/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ubccr/xdmod/downloads","issues_url":"https://api.github.com/repos/ubccr/xdmod/issues{/number}","pulls_url":"https://api.github.com/repos/ubccr/xdmod/pulls{/number}","milestones_url":"https://api.github.com/repos/ubccr/xdmod/milestones{/number}","notifications_url":"https://api.github.com/repos/ubccr/xdmod/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ubccr/xdmod/labels{/name}","releases_url":"https://api.github.com/repos/ubccr/xdmod/releases{/id}","deployments_url":"https://api.github.com/repos/ubccr/xdmod/deployments","created_at":"2016-10-28T18:41:25Z","updated_at":"2018-10-22T14:41:20Z","pushed_at":"2018-10-23T15:31:12Z","git_url":"git://github.com/ubccr/xdmod.git","ssh_url":"git@github.com:ubccr/xdmod.git","clone_url":"https://github.com/ubccr/xdmod.git","svn_url":"https://github.com/ubccr/xdmod","homepage":"https://open.xdmod.org","size":12821,"stargazers_count":28,"watchers_count":28,"language":"PHP","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":27,"mirror_url":null,"archived":false,"open_issues_count":8,"license":{"key":"lgpl-3.0","name":"GNU Lesser General Public License v3.0","spdx_id":"LGPL-3.0","url":"https://api.github.com/licenses/lgpl-3.0","node_id":"MDc6TGljZW5zZTEy"},"forks":27,"open_issues":8,"watchers":28,"default_branch":"xdmod8.0"}},"_links":{"self":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/692"},"html":{"href":"https://github.com/ubccr/xdmod/pull/692"},"issue":{"href":"https://api.github.com/repos/ubccr/xdmod/issues/692"},"comments":{"href":"https://api.github.com/repos/ubccr/xdmod/issues/692/comments"},"review_comments":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/692/comments"},"review_comment":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ubccr/xdmod/pulls/692/commits"},"statuses":{"href":"https://api.github.com/repos/ubccr/xdmod/statuses/1168744aeec2fa245942fb1cf0267d1006fefd42"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"plessbd"}}