From e33d400a3d0dfcf2bdf001f728016ce307985643 Mon Sep 17 00:00:00 2001
From: mary-dcouto <mary.dcouto@netfoundry.io>
Date: Fri, 1 Oct 2021 12:17:41 +0530
Subject: [PATCH] send identity events after service events, mfa auth and mfa
 verify

---
 release-notes.md                   | 14 ++++++++++++++
 service/ziti-tunnel/service/ipc.go | 16 ++++++++++++----
 version                            |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/release-notes.md b/release-notes.md
index 54076108..9a04597d 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,17 @@
+# Release 1.10.5
+
+## What's New
+* none
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* [#452](https://github.com/openziti/desktop-edge-win/issues/452) Send identity updated events after mfa verify, mfa auth and service events
+
+## Dependency Updates
+* none
+
 # Release 1.10.4
 
 ## What's New
diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go
index 803c5b1f..f7efaee9 100644
--- a/service/ziti-tunnel/service/ipc.go
+++ b/service/ziti-tunnel/service/ipc.go
@@ -653,6 +653,11 @@ func verifyMfa(out *json.Encoder, fingerprint string, code string) {
 			respond(out, dto.Response{Message: "mfa verify complete", Code: SUCCESS, Error: "", Payload: nil})
 			id.CId.MfaEnabled = true
 			rts.SetNotified(id.FingerPrint, false)
+			id.CId.UpdateMFATimeRem()
+			rts.BroadcastEvent(dto.IdentityEvent{
+				ActionEvent: dto.IdentityUpdateComplete,
+				Id:          Clean(id),
+			})
 		} else {
 			respondWithError(out, "Could not verify mfa code", UNKNOWN_ERROR, fmt.Errorf("verification failed for fingerprint: %s", fingerprint))
 		}
@@ -1136,15 +1141,13 @@ func handleBulkServiceChange(sc cziti.BulkServiceChange) {
 
 	rts.BroadcastEvent(be)
 
+	id := rts.Find(sc.Fingerprint)
 	var m = dto.IdentityEvent{
 		ActionEvent: dto.IdentityUpdateComplete,
-		Id: dto.Identity{
-			FingerPrint: sc.Fingerprint,
-		},
+		Id: Clean(id),
 	}
 	rts.BroadcastEvent(m)
 
-	id := rts.Find(sc.Fingerprint)
 	if id != nil && !id.Notified && id.MfaEnabled {
 		broadcastNotification(true)
 	}
@@ -1380,6 +1383,11 @@ func authMfa(out *json.Encoder, fingerprint string, code string) {
 		respond(out, dto.Response{Message: "AuthMFA complete", Code: SUCCESS, Error: "", Payload: fingerprint})
 		rts.SetNotified(fingerprint, false)
 		id.CId.UpdateMFATimeRem()
+		rts.BroadcastEvent(dto.IdentityEvent{
+			ActionEvent: dto.IdentityUpdateComplete,
+			Id:          Clean(id),
+		})
+
 		broadcastNotification(true)
 	} else {
 		respondWithError(out, fmt.Sprintf("AuthMFA failed. the supplied code [%s] was not valid: %s", code, result), 1, result)
diff --git a/version b/version
index 18b31142..db77e0ee 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.10.4
+1.10.5