User navigation #657

* User navigation * regex
adshares · May 15, 2019 · 3ab28a6 · 3ab28a6
1 parent 197bce1
commit 3ab28a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/app/admin/admin.service.ts b/src/app/admin/admin.service.ts
@@ -17,8 +17,10 @@ export class AdminService {
   }
 
   getUsers(nextPage?: string): Observable<UserInfoStats[]> {
-    const url = (nextPage && nextPage.replace('http', 'https')) ||
-      `${environment.serverUrl}/admin/users`;
+    const url = (
+      nextPage && (environment.serverUrl.search(/^https:/) >= 0 && nextPage.replace(/^http:/, 'https:'))
+      || nextPage
+    ) || `${environment.serverUrl}/admin/users`;
     return this.http.get<UserInfoStats[]>(url);
   }
 

diff --git a/src/app/common/request.interceptor.ts b/src/app/common/request.interceptor.ts
@@ -14,8 +14,6 @@ import { ErrorResponseDialogComponent } from "common/dialog/error-response-dialo
 import { PushNotificationsService } from 'common/components/push-notifications/push-notifications.service';
 import { pushNotificationTypesEnum } from 'models/enum/push-notification.enum';
 import { environment } from "environments/environment.ts";
-import { AppState } from "models/app-state.model";
-import { Store } from "@ngrx/store";
 import { HandleSubscription } from "common/handle-subscription";
 import { ImpersonationService } from "../impersonation/impersonation.service";