Merge pull request #1714 from jo-lund/failed-inventory-update

fix: Resend the inventory when the device has reauthenticated

src/api/client.cpp

@@ -87,6 +87,7 @@ error::Error HTTPClient::AsyncCall(
 				});
 				return;
 			}
+			reauthenticated_ = true;
 		};
 
 	return authenticator_.WithToken(

src/api/client.hpp

@@ -79,10 +79,19 @@ class HTTPClient : public Client {
 		authenticator_.ExpireToken();
 	}
 
+	bool HasReauthenticated() {
+		return reauthenticated_;
+	}
+
+	void SetReauthenticated(bool reauthenticated) {
+		reauthenticated_ = reauthenticated;
+	}
+
 private:
 	events::EventLoop &event_loop_;
 	http::Client http_client_;
 	auth::Authenticator &authenticator_;
+	bool reauthenticated_ {false};
 };
 
 } // namespace api

src/mender-update/daemon/states.cpp

@@ -279,7 +279,12 @@ void PollForDeploymentState::OnEnter(Context &ctx, sm::EventPoster<StateEvent> &
 			} else if (!response.value()) {
 				log::Info("No update available");
 				poster.PostEvent(StateEvent::NothingToDo);
-
+				if (ctx.http_client.HasReauthenticated()) {
+					log::Debug("Client has reauthenticated, clear inventory data cache");
+					ctx.inventory_client->ClearDataCache();
+					ctx.has_submitted_inventory = false;
+					ctx.http_client.SetReauthenticated(false);
+				}
 				if (not ctx.has_submitted_inventory) {
 					// If we have not submitted inventory successfully at least
 					// once, schedule this after receiving a successful response