Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / routing / redirect.service.ts

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index 43b89f08dc8e194f1ca7e4759d5c6d13fb46b1bf..2b8cbaa59f72df2448a033e733881a48a074cca6 100644 (file)
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -1,74 +1,131 @@
+import * as debug from 'debug'
 import { Injectable } from '@angular/core'
-import { NavigationEnd, Router } from '@angular/router'
+import { NavigationCancel, NavigationEnd, Router } from '@angular/router'
 import { ServerService } from '../server'
+import { SessionStorageService } from '../wrappers/storage.service'
+
+const logger = debug('peertube:router:RedirectService')
 
 @Injectable()
 export class RedirectService {
+  private static SESSION_STORAGE_LATEST_SESSION_URL_KEY = 'redirect-latest-session-url'
+
   // Default route could change according to the instance configuration
   static INIT_DEFAULT_ROUTE = '/videos/trending'
-  static DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
+  static INIT_DEFAULT_TRENDING_ALGORITHM = 'most-viewed'
 
   private previousUrl: string
   private currentUrl: string
 
+  private latestSessionUrl: string
+
+  private redirectingToHomepage = false
+  private defaultTrendingAlgorithm = RedirectService.INIT_DEFAULT_TRENDING_ALGORITHM
+  private defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+
   constructor (
     private router: Router,
-    private serverService: ServerService
+    private serverService: ServerService,
+    private storage: SessionStorageService
   ) {
     // 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 config = this.serverService.getHTMLConfig()
+    if (config?.instance?.defaultClientRoute) {
+      this.defaultRoute = config.instance.defaultClientRoute
+    }
+    if (config?.trending?.videos?.algorithms?.default) {
+      this.defaultTrendingAlgorithm = config.trending.videos.algorithms.default
     }
 
-    // Load default route
-    this.serverService.configLoaded
-        .subscribe(() => {
-          const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
+    this.latestSessionUrl = this.storage.getItem(RedirectService.SESSION_STORAGE_LATEST_SESSION_URL_KEY)
+    this.storage.removeItem(RedirectService.SESSION_STORAGE_LATEST_SESSION_URL_KEY)
 
-          if (defaultRouteConfig) {
-            RedirectService.DEFAULT_ROUTE = defaultRouteConfig
-          }
-        })
+    logger('Loaded latest session URL %s', this.latestSessionUrl)
 
     // Track previous url
     this.currentUrl = this.router.url
     router.events.subscribe(event => {
-      if (event instanceof NavigationEnd) {
+      if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
         this.previousUrl = this.currentUrl
         this.currentUrl = event.url
+
+        logger('Previous URL is %s, current URL is %s', this.previousUrl, this.currentUrl)
+        logger('Setting %s as latest URL in session storage.', this.currentUrl)
+
+        this.storage.setItem(RedirectService.SESSION_STORAGE_LATEST_SESSION_URL_KEY, this.currentUrl)
       }
     })
   }
 
-  redirectToPreviousRoute () {
-    const exceptions = [
-      '/verify-account',
-      '/reset-password'
-    ]
+  getDefaultRoute () {
+    return this.defaultRoute
+  }
 
-    if (this.previousUrl) {
-      const isException = exceptions.find(e => this.previousUrl.startsWith(e))
-      if (!isException) return this.router.navigateByUrl(this.previousUrl)
-    }
+  getDefaultTrendingAlgorithm () {
+    return this.defaultTrendingAlgorithm
+  }
 
-    return this.redirectToHomepage()
+  redirectToLatestSessionRoute () {
+    return this.doRedirect(this.latestSessionUrl)
+  }
+
+  redirectToPreviousRoute (fallbackRoute?: string) {
+    return this.doRedirect(this.previousUrl, fallbackRoute)
+  }
+
+  getPreviousUrl () {
+    return this.previousUrl
   }
 
   redirectToHomepage (skipLocationChange = false) {
-    console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
+    if (this.redirectingToHomepage) return
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+    this.redirectingToHomepage = true
+
+    console.log('Redirecting to %s...', this.defaultRoute)
+
+    this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
+        .then(() => this.redirectingToHomepage = false)
         .catch(() => {
+          this.redirectingToHomepage = false
+
           console.error(
             'Cannot navigate to %s, resetting default route to %s.',
-            RedirectService.DEFAULT_ROUTE,
+            this.defaultRoute,
             RedirectService.INIT_DEFAULT_ROUTE
           )
 
-          RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
-          return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+          this.defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+          return this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
         })
 
   }
+
+  private doRedirect (redirectUrl: string, fallbackRoute?: string) {
+    logger('Redirecting on %s', redirectUrl)
+
+    if (this.isValidRedirection(redirectUrl)) {
+      return this.router.navigateByUrl(redirectUrl)
+    }
+
+    logger('%s is not a valid redirection, try fallback route %s', redirectUrl, fallbackRoute)
+    if (fallbackRoute) {
+      return this.router.navigateByUrl(fallbackRoute)
+    }
+
+    logger('There was no fallback route, redirecting to homepage')
+    return this.redirectToHomepage()
+  }
+
+  private isValidRedirection (redirectUrl: string) {
+    const exceptions = [
+      '/verify-account',
+      '/reset-password',
+      '/login'
+    ]
+
+    if (!redirectUrl || redirectUrl === '/') return false
+
+    return exceptions.every(e => !redirectUrl.startsWith(e))
+  }
 }