Comestic updates as per review

psignoret · Feb 14, 2018 · 9bec7f1 · bradkovach · Feb 14, 2018 · 9bec7f1
1 parent 308348b
commit 9bec7f1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/aad-sso-wordpress.php b/aad-sso-wordpress.php
@@ -384,9 +384,9 @@ function get_wp_user_from_aad_user( $jwt, $group_memberships ) {
 
 				// 3. If we are configured to check, and there are no groups for this user, we should not be creating it.
 				if ( true === $this->settings->enable_aad_group_to_wp_role && empty( $group_memberships->value ) ) {
-					// The user was authenticated, but not found in WP and auto-provisioning is disabled
+					// The user was authenticated, but is not a member a role-granting group.
 					return new WP_Error(
-						'user_not_registered',
+						'user_not_assigned_to_group',
 						sprintf(
 							__( 'ERROR: The authenticated user \'%s\' does not have a group assignment for this site.',
 							'aad-sso-wordpress' ),
@@ -441,8 +441,7 @@ function get_wp_user_from_aad_user( $jwt, $group_memberships ) {
 		* Sets a WordPress user's role based on their AAD group memberships
 		*
 		* @param WP_User $user
-		* @param string $aad_user_id The AAD object id of the user
-		* @param string $aad_tenant_id The AAD directory tenant ID
+		* @param mixed   $group_memberships The response to the checkMemberGroups request.
 		*
 		* @return WP_User|WP_Error Return the WP_User with updated roles, or WP_Error if failed.
 		*/
@@ -451,7 +450,7 @@ function update_wp_user_roles( $user, $group_memberships ) {
 		// Check for errors in the group membership check response
 		if ( isset( $group_memberships->value ) ) {
 			AADSSO::debug_log( sprintf(
-				'Out of [%s], user \'%s\' is a member of [%s]', 
+				'Out of [%s], user \'%s\' is a member of [%s]',
 				implode( ',', $group_ids ), $aad_user_id, implode( ',', $group_memberships->value ) ), 20
 			);
 		} elseif ( isset ( $group_memberships->{'odata.error'} ) ) {