From 37f0f3e9324f184e1f5769a3678a7c868a132b87 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Mon, 24 Feb 2020 17:33:23 +0300
Subject: [PATCH] Fixed error when expected UserId is string but not guid

---
 .../Security/Principal/AbpClaimsIdentityExtensions.cs      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs
index 694fb7baa6..f4e4bba1a0 100644
--- a/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs
+++ b/framework/src/Volo.Abp.Security/System/Security/Principal/AbpClaimsIdentityExtensions.cs
@@ -17,8 +17,11 @@ namespace System.Security.Principal
             {
                 return null;
             }
-
-            return Guid.Parse(userIdOrNull.Value);
+            if (Guid.TryParse(userIdOrNull.Value, out Guid result))
+            {
+                return result;
+            }
+            return null;
         }
 
         public static Guid? FindUserId([NotNull] this IIdentity identity)