From 824c027d8cc4472ccb276e946f6573db568dae77 Mon Sep 17 00:00:00 2001
From: Richard LT <richard.le.terrier@gmail.com>
Date: Tue, 18 May 2021 09:44:50 +0200
Subject: [PATCH] fix(ui): signin callback redirect only on other pages (#5814)

---
 ui/src/app/views/auth/callback/callback.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/app/views/auth/callback/callback.component.ts b/ui/src/app/views/auth/callback/callback.component.ts
index e25ba6fc7c..2b75dd7574 100644
--- a/ui/src/app/views/auth/callback/callback.component.ts
+++ b/ui/src/app/views/auth/callback/callback.component.ts
@@ -115,7 +115,8 @@ export class CallbackComponent implements OnInit, OnDestroy {
                 this._cd.markForCheck();
             }))
             .subscribe(_ => {
-                if (this.payloadData && this.payloadData.redirect_uri) {
+                if (this.payloadData && this.payloadData.redirect_uri &&
+                    !(this.payloadData.redirect_uri as string).startsWith('/auth/callback/')) {
                     let dus = new DefaultUrlSerializer();
                     this._router.navigateByUrl(dus.parse(this.payloadData.redirect_uri));
                 } else {