From f89ebf1af3d4c9dd3abe7b250692b8bf6f21913b Mon Sep 17 00:00:00 2001 From: shibanglin Date: Sun, 9 Oct 2022 15:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B3=A8=E9=94=80=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=9B=9E=E8=B0=83=E5=A4=96=E9=83=A8URL=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/routes/passport/logout.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/logout.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/logout.component.ts index 9b4802c47..dd3fa643b 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/logout.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/logout.component.ts @@ -45,6 +45,9 @@ export class LogoutComponent implements OnInit { ngOnInit(): void { this.redirect_uri = this.route.snapshot.params[CONSTS.REDIRECT_URI]; + if (this.redirect_uri == null || this.redirect_uri == '') { + this.redirect_uri = this.route.snapshot.queryParams[CONSTS.REDIRECT_URI]; + } this.authnService .logout() .pipe( @@ -53,7 +56,11 @@ export class LogoutComponent implements OnInit { if (this.redirect_uri == null || this.redirect_uri == '') { this.router.navigateByUrl(this.tokenService.login_url!); } else { - this.router.navigateByUrl(this.redirect_uri); + if (this.redirect_uri.startsWith("http")){ + location.href = this.redirect_uri; + } else { + this.router.navigateByUrl(this.redirect_uri); + } } }) )