feat: stubable time in text package

ory · Oct 19, 2021 · 22e4ed1 · 22e4ed1
1 parent 71583c5
commit 22e4ed1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/text/message_login.go b/text/message_login.go
@@ -118,7 +118,7 @@ func NewErrorValidationLoginFlowExpired(ago time.Duration) *Message {
 		Text: fmt.Sprintf("The login flow expired %.2f minutes ago, please try again.", ago.Minutes()),
 		Type: Error,
 		Context: context(map[string]interface{}{
-			"expired_at": time.Now().Add(ago),
+			"expired_at": Now().UTC().Add(ago),
 		}),
 	}
 }

diff --git a/text/message_recovery.go b/text/message_recovery.go
@@ -26,13 +26,13 @@ func NewErrorValidationRecoveryFlowExpired(ago time.Duration) *Message {
 		Text: fmt.Sprintf("The recovery flow expired %.2f minutes ago, please try again.", ago.Minutes()),
 		Type: Error,
 		Context: context(map[string]interface{}{
-			"expired_at": time.Now().Add(ago),
+			"expired_at": Now().UTC().Add(ago),
 		}),
 	}
 }
 
 func NewRecoverySuccessful(privilegedSessionExpiresAt time.Time) *Message {
-	hasLeft := time.Until(privilegedSessionExpiresAt)
+	hasLeft := Until(privilegedSessionExpiresAt)
 	return &Message{
 		ID:   InfoSelfServiceRecoverySuccessful,
 		Type: Info,

diff --git a/text/message_registration.go b/text/message_registration.go
@@ -51,7 +51,7 @@ func NewErrorValidationRegistrationFlowExpired(ago time.Duration) *Message {
 		Text: fmt.Sprintf("The registration flow expired %.2f minutes ago, please try again.", ago.Minutes()),
 		Type: Error,
 		Context: context(map[string]interface{}{
-			"expired_at": time.Now().Add(ago),
+			"expired_at": Now().UTC().Add(ago),
 		}),
 	}
 }
diff --git a/text/message_settings.go b/text/message_settings.go
@@ -37,7 +37,7 @@ func NewErrorValidationSettingsFlowExpired(ago time.Duration) *Message {
 		Text: fmt.Sprintf("The settings flow expired %.2f minutes ago, please try again.", ago.Minutes()),
 		Type: Error,
 		Context: context(map[string]interface{}{
-			"expired_at": time.Now().Add(ago),
+			"expired_at": Now().UTC().Add(ago),
 		}),
 	}
 }

diff --git a/text/message_verification.go b/text/message_verification.go
@@ -26,7 +26,7 @@ func NewErrorValidationVerificationFlowExpired(ago time.Duration) *Message {
 		Text: fmt.Sprintf("The verification flow expired %.2f minutes ago, please try again.", ago.Minutes()),
 		Type: Error,
 		Context: context(map[string]interface{}{
-			"expired_at": time.Now().Add(ago),
+			"expired_at": Now().UTC().Add(ago),
 		}),
 	}
 }

diff --git a/text/type.go b/text/type.go
@@ -1,9 +1,14 @@
 package text
 
+import "time"
+
 // swagger:model uiTextType
 type Type string
 
 const (
 	Info  Type = "info"
 	Error Type = "error"
 )
+
+var Now = time.Now
+var Until = time.Until