From 5fe66ec026c198f407d68440322560cefc1fc247 Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Wed, 27 Mar 2019 15:09:55 -0700
Subject: [PATCH] Fix routing loop (#12959)

---
 CHANGELOG.md                                | 1 +
 ui/src/Signin.tsx                           | 2 +-
 ui/src/onboarding/components/SigninForm.tsx | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2df59a68b18..186a67d917f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 1. [12793](https://github.com/influxdata/influxdb/pull/12793): Fix task creation error when switching schedule types.
 1. [12805](https://github.com/influxdata/influxdb/pull/12805): Fix hidden horizonal scrollbars in flux raw data view
 1. [12827](https://github.com/influxdata/influxdb/pull/12827): Fix screen tearing bug in Raw Data View
+1. [12959](https://github.com/influxdata/influxdb/pull/12959): Fix routing loop
 
 ### UI Improvements
 
diff --git a/ui/src/Signin.tsx b/ui/src/Signin.tsx
index 352f441ad28..f8f435de279 100644
--- a/ui/src/Signin.tsx
+++ b/ui/src/Signin.tsx
@@ -94,7 +94,7 @@ export class Signin extends PureComponent<Props, State> {
         this.props.notify(sessionTimedOut())
       }
 
-      this.props.router.push(`/signin${returnTo}`)
+      this.props.router.replace(`/signin${returnTo}`)
     }
   }
 }
diff --git a/ui/src/onboarding/components/SigninForm.tsx b/ui/src/onboarding/components/SigninForm.tsx
index 14c38468310..3266f2c8de0 100644
--- a/ui/src/onboarding/components/SigninForm.tsx
+++ b/ui/src/onboarding/components/SigninForm.tsx
@@ -134,7 +134,7 @@ class SigninForm extends PureComponent<Props, State> {
     const {query} = this.props.location
 
     if (query && query.returnTo) {
-      router.push(query.returnTo)
+      router.replace(query.returnTo)
     } else {
       router.push('/')
     }