X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Frouting%2Fredirect.service.ts;h=3982cf36f31a6e1eea1559f2bea65f541a599046;hb=610d0be13b3d01f653ef269271dd667a57c85ef2;hp=abe044d7306e007dbab9ef61084b345fdff0a53e;hpb=108a66f0dac7586f2f7871c6bb77f73cb924f2b3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index abe044d73..3982cf36f 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Router } from '@angular/router'
+import { NavigationEnd, Router } from '@angular/router'
 import { ServerService } from '../server'
 
 @Injectable()
@@ -8,41 +8,67 @@ export class RedirectService {
   static INIT_DEFAULT_ROUTE = '/videos/trending'
   static DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
 
+  private previousUrl: string
+  private currentUrl: string
+
   constructor (
     private router: Router,
     private serverService: ServerService
   ) {
     // The config is first loaded from the cache so try to get the default route
-    const config = this.serverService.getConfig()
-    if (config && config.instance && config.instance.defaultClientRoute) {
-      RedirectService.DEFAULT_ROUTE = config.instance.defaultClientRoute
+    const tmpConfig = this.serverService.getTmpConfig()
+    if (tmpConfig && tmpConfig.instance && tmpConfig.instance.defaultClientRoute) {
+      RedirectService.DEFAULT_ROUTE = tmpConfig.instance.defaultClientRoute
     }
 
-    this.serverService.configLoaded
-      .subscribe(() => {
-        const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
+    // Load default route
+    this.serverService.getConfig()
+        .subscribe(config => {
+          const defaultRouteConfig = config.instance.defaultClientRoute
+
+          if (defaultRouteConfig) {
+            RedirectService.DEFAULT_ROUTE = defaultRouteConfig
+          }
+        })
+
+    // Track previous url
+    this.currentUrl = this.router.url
+    router.events.subscribe(event => {
+      if (event instanceof NavigationEnd) {
+        this.previousUrl = this.currentUrl
+        this.currentUrl = event.url
+      }
+    })
+  }
+
+  redirectToPreviousRoute () {
+    const exceptions = [
+      '/verify-account',
+      '/reset-password'
+    ]
+
+    if (this.previousUrl) {
+      const isException = exceptions.find(e => this.previousUrl.startsWith(e))
+      if (!isException) return this.router.navigateByUrl(this.previousUrl)
+    }
 
-        if (defaultRouteConfig) {
-          RedirectService.DEFAULT_ROUTE = defaultRouteConfig
-        }
-      })
+    return this.redirectToHomepage()
   }
 
-  redirectToHomepage () {
+  redirectToHomepage (skipLocationChange = false) {
     console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
-      .catch(() => {
-        console.error(
-          'Cannot navigate to %s, resetting default route to %s.',
-          RedirectService.DEFAULT_ROUTE,
-          RedirectService.INIT_DEFAULT_ROUTE
-        )
+    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+        .catch(() => {
+          console.error(
+            'Cannot navigate to %s, resetting default route to %s.',
+            RedirectService.DEFAULT_ROUTE,
+            RedirectService.INIT_DEFAULT_ROUTE
+          )
 
-        RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
-        return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
-      })
+          RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
+          return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+        })
 
   }
-
 }