From 3fdf08c1fa270d8d57c6155cac02b63b07083865 Mon Sep 17 00:00:00 2001
From: Atlas Public Policy <nick.nigro@atlaspolicy.com>
Date: Tue, 18 Jul 2017 08:18:43 -0400
Subject: [PATCH] Fix for invalid email address

Strip out '#' from unique name. This helps address an issue with external users that have a Microsoft account (as opposed to a Work/School account).
---
 aad-sso-wordpress.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/aad-sso-wordpress.php b/aad-sso-wordpress.php
index 0cda951..f8a3362 100644
--- a/aad-sso-wordpress.php
+++ b/aad-sso-wordpress.php
@@ -325,6 +325,13 @@ function get_wp_user_from_aad_user( $jwt ) {
 						'aad-sso-wordpress' )
 				);
 		}
+		
+		// Check if unique name is a reasonable email address
+		$bad_char = strpos($unique_name, "#");
+		if ($bad_char != false)
+		{
+			$unique_name = substr($unique_name, $bad_char + 1);	
+		}
 
 		$user = get_user_by( $this->settings->field_to_match_to_upn, $unique_name );