Revert device id in jwt token and moved to reading from header. Added clear token by identifier API/repo/sproc so that token can be cleared after logout.

src/Core/Repositories/IDeviceRepository.cs

@@ -10,5 +10,6 @@ namespace Bit.Core.Repositories
         Task<Device> GetByIdAsync(Guid id, Guid userId);
         Task<Device> GetByIdentifierAsync(string identifier, Guid userId);
         Task<ICollection<Device>> GetManyByUserIdAsync(Guid userId);
+        Task ClearPushTokenByIdentifierAsync(string identifier);
     }
 }

src/Core/Repositories/SqlServer/DeviceRepository.cs

@@ -59,5 +59,19 @@ namespace Bit.Core.Repositories.SqlServer
                 return results.ToList();
             }
         }
+
+        public async Task ClearPushTokenByIdentifierAsync(string identifier)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                await connection.ExecuteAsync(
+                    $"[{Schema}].[{Table}_ClearPushTokenByIdentifier]",
+                    new
+                    {
+                        Identifier = identifier
+                    },
+                    commandType: CommandType.StoredProcedure);
+            }
+        }
     }
 }