@gandalan/weblibs 0.0.1 → 0.0.2

package/README.md

@@ -0,0 +1 @@
+WebLibs for Gandalan JS/TS/Svelte projects

package/api/IDAS.js

@@ -0,0 +1,41 @@
+import { get, writable } from "svelte/store";
+import { RESTClient } from "./RESTClient";
+
+export const APP_TOKEN = "66B70E0B-F7C4-4829-B12A-18AD309E3970";
+export const AuthToken = writable(localStorage.getItem("AuthToken"));
+export const MandantGuid = writable(localStorage.getItem("MandantGuid"));
+export const ApiBaseUrl = writable(localStorage.getItem("ApiBaseUrl") || "https://api.dev.idas-cloudservices.net/api");
+export const SiteBaseUrl = writable(window.location.protocol + "//" + window.location.host);
+export const SSOAuthUrl = writable(get(ApiBaseUrl).replace("/api", "") + "/SSO?a=" + APP_TOKEN + "&r=%target%?t=%token%%26m=%mandant%");
+
+export class IDAS 
+{
+    authToken = {};
+    api = new RESTClient(get(ApiBaseUrl), get(AuthToken));
+
+    async authenticate(authDTO) { 
+        var { data } = await this.api.post("/Login/Authenticate", authDTO); 
+        this.authToken = data;
+        return data;
+    }
+
+    async authenticateWithSSO() { 
+        var ssoURL = get(SSOAuthUrl).replace("%target%", get(SiteBaseUrl)).replace("%mandant%", get(MandantGuid));
+        window.location = ssoURL;
+    }
+
+    mandanten = {
+        async getAll() { return await this.api.get("/Mandanten"); },
+        async save(m) { await this.api.put("/Mandanten", m); }
+    };
+
+    benutzer = {
+        async getAll() { return await this.api.get("/Benutzer"); },
+        async save(m) { await this.api.put("/Benutzer", m); }
+    };
+
+    rollen = {
+        async getAll() { return await this.api.get("/Rollen"); },
+        async save(m) { await this.api.put("/Rollen", m); }
+    };
+}

package/api/{api.js → RESTClient.js}

@@ -1,35 +1,44 @@
 import axios from 'axios';
-import { AuthToken, ApiBaseUrl } from "./AuthStore";
-import { get } from 'svelte/store';
 
-export class API 
+/*export let AppToken = "66B70E0B-F7C4-4829-B12A-18AD309E3970";
+export let AuthToken = localStorage.getItem("AuthToken");
+export let MandantGuid = localStorage.getItem("MandantGuid");
+export let ApiBaseUrl = localStorage.getItem("ApiBaseUrl") || "https://api.dev.idas-cloudservices.net/api";
+export let SiteBaseUrl = window.location.origin;
+export let SSOAuthUrl = ApiBaseUrl.replace("/api", "") + "/SSO?a=" + AppToken + "&r=%target%?t=%token%%26m=%mandant%";*/
+
+export class RESTClient 
 {
     lastError = '';
     token = "";
     baseurl = "";
 
-    constructor()
+    constructor(url, token)
     {
         this.lastError = "";
-        this.baseurl = get(ApiBaseUrl);
-        this.token = get(AuthToken);
+        this.baseurl = url;
+        this.token = token;
         console.log("Base: " + this.baseurl + " Token: " + this.token);
 
         if (this.token) {
             axios.defaults.headers.common['X-Gdl-AuthToken'] = this.token;
         }
+
+        axios.interceptors.request.use(req => {
+            console.log(`${req.method} ${req.url}`);
+            return req;
+        });
     }
 
     async get(uri)
     {
         try {
-            console.log("GET " + this.baseurl + uri);
             const response = await axios.get(this.baseurl + uri);
             this.lastError = '';
             return response.data;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
@@ -37,19 +46,16 @@ export class API
     {
         try {
             const response = await axios.get(this.baseurl + uri, { responseType: 'blob' });
-            console.log(response);
-
             let fileName = "1000.pdf";
             if (response.headers["content-disposition"]) {
                 fileName = response.headers["content-disposition"].split(';')[1];
                 fileName = fileName.replace("filename=", "").trim();
             }
-
             this.lastError = '';
             return { data: response.data, filename: fileName, contentType: "application/pdf" };
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
@@ -58,11 +64,10 @@ export class API
         let response = {};
         try {
             response = await axios.get(this.baseurl + uri, { withCredentials: true })
-            console.log(response);
             this.lastError = '';
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
         return response;
     }
@@ -71,25 +76,23 @@ export class API
     {
         try {
             const response = await axios.post(this.baseurl + uri, formData, { withCredentials: true });
-            //console.log(JSON.stringify(response));
             this.lastError = '';
             return response;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
     async put(uri, formData) 
     {
         try {
-            console.log(`PUT to ${this.baseurl}${uri}`);
             const response = await axios.put(this.baseurl + uri, formData, { withCredentials: true });
             this.lastError = '';
             return response;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
@@ -97,25 +100,21 @@ export class API
     {
         try
         {
-            console.log(`DELETE to ${this.baseurl}${uri}`);
             const response = await axios.delete(this.baseurl + uri, { withCredentials: true });
             this.lastError = '';
             return response;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
-    checkError(error)
+    handleError(error)
     {
         let status = error && error.response ? error.response.status : -1;
         let message = error ? error.message : "?";
         console.log("API Error " + status + ": " + message);
         this.lastError = message;
-        if (status === 401 || status === 403) {
-            AuthToken.set(null);
-            localStorage.setItem("AuthToken", null);
-        }
+        throw error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "WebLibs for Gandalan JS/TS/Svelte projects",
   "author": "Philipp Reif",
   "license": "ISC",

package/api/AuthStore.js

@@ -1,8 +0,0 @@
-import { get, writable } from "svelte/store";
-
-export const APP_TOKEN = "66B70E0B-F7C4-4829-B12A-18AD309E3970";
-export const AuthToken = writable(localStorage.getItem("AuthToken"));
-export const MandantGuid = writable(localStorage.getItem("MandantGuid"));
-export const ApiBaseUrl = writable(localStorage.getItem("ApiBaseUrl") || "https://api.dev.idas-cloudservices.net/api");
-export const SiteBaseUrl = writable(window.location.protocol + "//" + window.location.host);
-export const SSOAuthUrl = writable(get(ApiBaseUrl).replace("/api", "") + "/SSO?a=" + APP_TOKEN + "&r=%target%?t=%token%%26m=%mandant%");

package/api/mandantenApi.js

@@ -1,12 +0,0 @@
-import { API } from './api';
-import { AuthToken } from "./AuthStore";
-//import mandanten from '../data/mandanten.json';
-
-export function getAll()
-{
-    //return mandanten;
-    if (AuthToken)
-        return new API().get('/Mandanten');
-    else
-        return [];
-}

package/api/nachrichtenApi.js

@@ -1,46 +0,0 @@
-import { API } from './api';
-import { get } from 'svelte/store'
-import { MandantGuid } from "./AuthStore";
-
-const niceContextNames = new Map();
-niceContextNames.set("position", "Positionserfassung");
-niceContextNames.set("start", "Programmstart");
-
-export async function getAll()
-{
-    let api = getNewAPI();
-    let result = await api.get('/NachrichtenKonfig?besitzerMandantGuid=' + get(MandantGuid));     
-    result = result || [];
-    result.forEach(n => {
-        n.anzeigeText = n.nachricht && n.nachricht.length > 30 ? n.nachricht.substr(0,30) + "..." : n.nachricht;
-        if (n.context && niceContextNames.has(n.context))
-        {            
-            n.anzeigeText += " (Anzeige bei " + niceContextNames.get(n.context) + ")";
-        }        
-    });
-    return result;
-}
-
-export async function addNachricht(nachricht)
-{
-    nachricht.besitzerMandantGuid = get(MandantGuid);
-    if (!nachricht.gueltigAb) nachricht.gueltigAb = null;
-    if (!nachricht.gueltigBis) nachricht.gueltigBis = null;
-
-    let api = getNewAPI();
-    console.log(nachricht);
-    return await api.post('/NachrichtenKonfig', nachricht);        
-}
-
-export async function removeNachricht(nachricht)
-{
-    let api = getNewAPI();
-    return await api.delete('/NachrichtenKonfig?nachrichtGuid=' + nachricht.nachrichtGuid);
-}
-
-function getNewAPI()
-{
-    let api = new API();
-    api.baseurl = "";
-    return api;
-}