From afb64e4a88d273f687c3529171f0d43038272a47 Mon Sep 17 00:00:00 2001
From: Peter Cai <222655+pcai@users.noreply.github.com>
Date: Wed, 10 Jan 2024 20:48:02 +0000
Subject: [PATCH] preserve timestamp-before-username behavior

---
 lib/akami/wsse.rb       | 2 +-
 spec/akami/wsse_spec.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/akami/wsse.rb b/lib/akami/wsse.rb
index 180a93d..bdecd24 100644
--- a/lib/akami/wsse.rb
+++ b/lib/akami/wsse.rb
@@ -91,8 +91,8 @@ def body_attributes
     # Returns the XML for a WSSE header.
     def to_xml
       h = wsse_signature if signature? && signature.have_document?
-      h = merge_hashes_with_keys(h, wsse_username_token) if username_token?
       h = merge_hashes_with_keys(h, wsu_timestamp) if timestamp?
+      h = merge_hashes_with_keys(h, wsse_username_token) if username_token?
 
       return '' unless h
       Gyoku.xml h
diff --git a/spec/akami/wsse_spec.rb b/spec/akami/wsse_spec.rb
index 4bd8791..b57fec0 100644
--- a/spec/akami/wsse_spec.rb
+++ b/spec/akami/wsse_spec.rb
@@ -305,8 +305,7 @@
         end
 
         it "contains a wsse:Timestamp node" do
-          expect(wsse.to_xml).to include('<wsu:Timestamp wsu:Id="Timestamp-2" ' +
-            "xmlns:wsu=\"#{Akami::WSSE::WSU_NAMESPACE}\">")
+          expect(wsse.to_xml).to match(/<wsu:Timestamp wsu:Id=\"Timestamp-\d\" xmlns:wsu=\"#{Akami::WSSE::WSU_NAMESPACE}\">/i)
         end
       end
     end