ichec-angular-core 0.3.6 → 0.3.7

package/fesm2022/ichec-angular-core.mjs

@@ -1,7 +1,7 @@
 import { BehaviorSubject, map, catchError, mergeMap, throwError, tap, of, debounceTime, distinctUntilChanged, merge, Subscription, finalize } from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, signal, DOCUMENT, Injectable, Component, computed, input, output, viewChild } from '@angular/core';
+import { InjectionToken, inject, DOCUMENT, signal, Injectable, Component, computed, input, output, viewChild } from '@angular/core';
 import { CookieService } from 'ngx-cookie-service';
 import * as i1$2 from '@angular/forms';
 import { FormControl, Validators, FormGroup, ReactiveFormsModule, FormBuilder } from '@angular/forms';
@@ -183,9 +183,11 @@ class FileRecord {
 const REST_SERVICE_CONFIG = new InjectionToken("Config for the rest service");
 class RestService {
     manifest = new BehaviorSubject(null);
+    loggedInUser = new BehaviorSubject(null);
     _url = "";
     userQuery = "user";
     config = inject(REST_SERVICE_CONFIG);
+    document = inject(DOCUMENT);
     _http = inject(HttpClient);
     cookieService = inject(CookieService);
     deleteItem(id) {
@@ -223,16 +225,16 @@ class RestService {
         if (query.filter) {
             params.set('search', query.filter);
         }
-        return this._http.get(this.baseUrl, this.getRequestBase("json", new HttpParams({ fromObject: Object.fromEntries(params) }))).pipe(catchError(this.handleError));
+        return this._http.get(this.baseUrl, this.getRequestBase("json", new HttpParams({ fromObject: Object.fromEntries(params) }), "", true)).pipe(catchError(this.handleError));
     }
     getItem(id) {
-        return this._http.get(this.baseUrl + id + "/", this.getRequestBase()).pipe(catchError(this.handleError));
+        return this._http.get(this.baseUrl + id + "/", this.getRequestBase("json", new HttpParams(), "", true)).pipe(catchError(this.handleError));
     }
     getUrl(url) {
-        return this._http.get(url, this.getRequestBase()).pipe(catchError(this.handleError));
+        return this._http.get(url, this.getRequestBase("json", new HttpParams(), "", true)).pipe(catchError(this.handleError));
     }
     getPaginatedUrl(url) {
-        return this._http.get(url, this.getRequestBase()).pipe(catchError(this.handleError));
+        return this._http.get(url, this.getRequestBase("json", new HttpParams(), "", true)).pipe(catchError(this.handleError));
     }
     getOptions() {
         return this._http.options(this.baseUrl, this.getRequestBase()).pipe(catchError(this.handleError));
@@ -271,7 +273,7 @@ class RestService {
     postItem(item) {
         return this._http.post(this.baseUrl, item, this.getRequestBase()).pipe(catchError(this.handleError));
     }
-    getHeaders(content_type = "json", file = "") {
+    getHeaders(content_type = "json", file = "", xhr = false) {
         let headers = new HttpHeaders({ 'Accept': 'application/json' });
         if (this.config.auth_type === "token") {
             headers = headers.set('Authorization', "Token " + localStorage.getItem("api_token"));
@@ -288,6 +290,9 @@ class RestService {
         else if (content_type) {
             headers = headers.set('Content-Type', content_type);
         }
+        if (xhr) {
+            headers = headers.set("x-requested-with", "XMLHttpRequest");
+        }
         return headers;
     }
     get baseUrl() {
@@ -296,12 +301,12 @@ class RestService {
     get mediaUrl() {
         return this.config.endpoint_url + "/api/" + this._url.slice(0, -1) + "_media/";
     }
-    getRequestBase(content_type = "json", params = new HttpParams(), file = "") {
+    getRequestBase(content_type = "json", params = new HttpParams(), file = "", xhr = false) {
         let supports_cors = "same-origin";
         if (this.manifest.value && this.manifest.value.supports_cors) {
             supports_cors = 'include';
         }
-        return { headers: this.getHeaders(content_type, file),
+        return { headers: this.getHeaders(content_type, file, xhr),
             credentials: supports_cors ? 'include' : 'same-origin',
             params: params };
     }
@@ -310,6 +315,11 @@ class RestService {
             // A client-side or network error occurred. Handle it accordingly.
             console.error('Client side or network error:', error.error);
         }
+        else if (error.status === 403 && "refresh_url" in error.error) {
+            // This is a special case in the backend - our session has timed out
+            // so we need to reload that page to reflect the user's current status
+            window.location.reload();
+        }
         else {
             console.error(`Backend returned code ${error.status}, body was: `, error.error);
         }
@@ -348,9 +358,7 @@ class UserService extends ItemService {
     /**
     Service to handle IPortalMember via REST and also handle logins.
     */
-    loggedInUser = new BehaviorSubject(null);
     canInvite = signal(false, ...(ngDevMode ? [{ debugName: "canInvite" }] : []));
-    document = inject(DOCUMENT);
     _url = PortalMember.plural;
     typename = PortalMember.typename;
     permissions = new Map();
@@ -376,22 +384,25 @@ class UserService extends ItemService {
         if (next) {
             suffix = "?next=" + next;
         }
-        console.log("posting logout to: ", prefix + this.manifest.value.logout_url + "/" + suffix);
-        this._http.post(prefix + this.manifest.value.logout_url + "/" + suffix, "", {
+        else {
+            suffix = "?next=/home";
+        }
+        const logout_url = prefix + this.manifest.value.logout_url + "/" + suffix;
+        console.log("posting logout to: ", logout_url);
+        this._http.post(logout_url, "", {
             headers: new HttpHeaders({
                 'X-CSRFToken': this.cookieService.get("csrftoken")
             }),
             responseType: 'text',
             credentials: this.manifest.value.supports_cors ? 'include' : 'same-origin'
-        }).pipe(
-        // The backend can return an error as it tries to redirect to a non-existing url.
-        catchError(_ => this.document.location.href = prefix + "/" + suffix)).subscribe(_ => {
+        }).pipe(map(m => this._logout_redirect(JSON.parse(m)))).subscribe(_ => {
             console.log("Logged Out");
-            // Force a page reload
-            this.document.location.href = prefix + "/" + suffix;
-            //this.login(next)
         });
     }
+    _logout_redirect(manifest) {
+        console.log("Redirecting logout to: ", manifest.url);
+        this.document.location.href = manifest.url;
+    }
     canCreate() {
         return this.canInvite();
     }
@@ -424,7 +435,8 @@ class UserService extends ItemService {
         if (this.config.endpoint_url) {
             prefix = this.config.endpoint_url + "/";
         }
-        this.document.location.href = prefix + this.manifest.value.login_url + "/?next=" + next;
+        const suffix = "/?next=" + next;
+        this.document.location.href = prefix + this.manifest.value.login_url + suffix;
     }
     hasAddPermission(feature) {
         const perm = this.permissions.get(feature);