Merge pull request #60 from mmacy/fix-logout

Enable sign-out and tasks for all tenants
Azure-Samples · Sep 19, 2019 · c5556f4 · c5556f4
2 parents 96a1eca + 6c3bea4
commit c5556f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/TaskService/Controllers/TasksController.cs b/TaskService/Controllers/TasksController.cs
@@ -33,7 +33,7 @@ public class TasksController : ApiController
         {
             HasRequiredScopes(ReadPermission);
 
-            var owner = CheckClaimMatch(objectIdElement);
+            var owner = CheckClaimMatch(ClaimTypes.NameIdentifier);
 
             IEnumerable<Models.Task> userTasks = db.Where(t => t.Owner == owner);
             return userTasks;
@@ -49,7 +49,7 @@ public void Post(Models.Task task)
             if (String.IsNullOrEmpty(task.Text))
                 throw new WebException("Please provide a task description");
 
-            var owner = CheckClaimMatch(objectIdElement);
+            var owner = CheckClaimMatch(ClaimTypes.NameIdentifier);
 
             task.Id = taskId++;
             task.Owner = owner;
@@ -65,7 +65,7 @@ public void Delete(int id)
         {
             HasRequiredScopes(WritePermission);
 
-            var owner = CheckClaimMatch(objectIdElement);
+            var owner = CheckClaimMatch(ClaimTypes.NameIdentifier);
 
             Models.Task task = db.Where(t => t.Owner.Equals(owner) && t.Id.Equals(id)).FirstOrDefault();
             db.Remove(task);

diff --git a/TaskWebApp/Utils/ClaimsPrincipalExtension.cs b/TaskWebApp/Utils/ClaimsPrincipalExtension.cs
@@ -54,11 +54,11 @@ public static string GetB2CMsalAccountId(this ClaimsPrincipal claimsPrincipal)
 		/// <returns>Unique object ID of the identity, or <c>null</c> if it cannot be found</returns>
 		public static string GetObjectId(this ClaimsPrincipal claimsPrincipal)
         {
-            var objIdclaim = claimsPrincipal.FindFirst(ClaimConstants.ObjectId);
+            var objIdclaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier);
 
             if (objIdclaim == null)
             {
-                objIdclaim = claimsPrincipal.FindFirst("oid");
+                objIdclaim = claimsPrincipal.FindFirst("sub");
             }
 
             return objIdclaim != null ? objIdclaim.Value : string.Empty;