cloud logins

Author: Jonas Gauffin

src/Server/Coderr.Server.WebSite/ClientApp/src/api-authorization/authorize.guard.ts

@@ -21,7 +21,7 @@ export class AuthorizeGuard implements CanActivate {
 
     var loginUrl = localStorage.getItem('loginUrl');
     if (loginUrl) {
-      window.location = loginUrl;
+      window.location.href = loginUrl;
       return false;
     }
 

src/Server/Coderr.Server.WebSite/ClientApp/src/app/utils/HttpClient.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+declare var window: any;
 
 export interface IRequestOptions {
   method?: "GET" | "POST" | "PUT" | "DELETE",
@@ -68,6 +69,14 @@ export class ApiClient {
     var json = JSON.stringify(query);
     var response = await this.http.post(`${this.cqsUrl}?type=${query.constructor.TYPE_NAME}`, json, { headers: headers });
     if (response.statusCode === 401) {
+
+      // to support Cloud logins.
+      let url = localStorage.getItem('loginUrl');
+      if (url && url != '/account/login') {
+        window.location.href = url;
+        return null;
+      }
+
       this.router.navigate(['account/login'], { queryParams: { returnUrl: window.location.pathname + window.location.search } });
       throw new HttpError(response);
     }