@gandalan/weblibs 0.0.1 → 0.0.7

package/README.md

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

package/api/IDAS.js

@@ -0,0 +1,55 @@
+import { RESTClient } from "./RESTClient";
+
+let appToken = localStorage.getItem("IDAS_AppToken") || "66B70E0B-F7C4-4829-B12A-18AD309E3970";
+let authToken = localStorage.getItem("IDAS_AuthToken");
+//let mandantGuid = localStorage.getItem("IDAS_MandantGuid");
+let apiBaseUrl = localStorage.getItem("IDAS_ApiBaseUrl") || "https://api.dev.idas-cloudservices.net/api";
+//let siteBaseUrl = localStorage.getItem("SiteBaseUrl") || window.location.protocol + "//" + window.location.host;
+let ssoAuthUrl = apiBaseUrl.replace(/\/api$/, "") + "/SSO?a=" + appToken + "&r=%target%?t=%token%%26m=%mandant%";
+let restClient = new RESTClient(apiBaseUrl, authToken);
+restClient.onError = (error, message) => {
+    if (message.indexOf("401") || message.indexOf("403"))
+    {    
+        //console.log(message+" would remove Token");
+        localStorage.removeItem("IDAS_AuthToken");
+        restClient.authenticateWithSSO();
+    }
+}
+
+export class IDAS 
+{
+    async authenticate(authDTO) { 
+        authDTO.AppToken = appToken;
+        var { data } = await restClient.post("/Login/Authenticate", authDTO); 
+        console.log(data);
+        if (data?.Token)
+        {
+            authToken = data.Token;
+            localStorage.setItem("IDAS_AuthToken", authToken);
+            restClient = new RESTClient(apiBaseUrl, authToken);
+        }
+        return data;
+    }
+
+    async authenticateWithSSO() { 
+        var ssoURL = ssoAuthUrl.replace("%target%", window.location.origin);
+        window.location = ssoURL;
+    }
+
+    mandanten = {
+        async getAll() { return await restClient.get("/Mandanten"); },
+        async get(guid) { return await restClient.get("/Mandanten/" + guid); },
+        async save(m) { await restClient.put("/Mandanten", m); }
+    };
+
+    benutzer = {
+        async getAll(mandantGuid) { return await restClient.get("/BenutzerListe/" + mandantGuid + "/?mitRollenUndRechten=true"); },
+        async get(guid) { return await restClient.get("/Benutzer/" + guid); },
+        async save(m) { await restClient.put("/Benutzer", m); }
+    };
+
+    rollen = {
+        async getAll() { return await restClient.get("/Rollen"); },
+        async save(m) { await restClient.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';
+import axios from "axios";
 
-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);
+            const response = await axios.get(this.baseurl + uri, { withCredentials: false });
             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);
         }
     }
 
@@ -57,12 +63,11 @@ export class API
     {
         let response = {};
         try {
-            response = await axios.get(this.baseurl + uri, { withCredentials: true })
-            console.log(response);
+            response = await axios.get(this.baseurl + uri, { withCredentials: false })
             this.lastError = '';
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
         return response;
     }
@@ -70,26 +75,24 @@ export class API
     async post(uri, formData) 
     {
         try {
-            const response = await axios.post(this.baseurl + uri, formData, { withCredentials: true });
-            //console.log(JSON.stringify(response));
+            const response = await axios.post(this.baseurl + uri, formData, { withCredentials: false });
             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 });
+            const response = await axios.put(this.baseurl + uri, formData, { withCredentials: false });
             this.lastError = '';
             return response;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
@@ -97,25 +100,23 @@ export class API
     {
         try
         {
-            console.log(`DELETE to ${this.baseurl}${uri}`);
-            const response = await axios.delete(this.baseurl + uri, { withCredentials: true });
+            const response = await axios.delete(this.baseurl + uri, { withCredentials: false });
             this.lastError = '';
             return response;
         }
         catch (error) {
-            this.checkError(error);
+            this.handleError(error);
         }
     }
 
-    checkError(error)
+    onError = (error, message) => {};
+
+    handleError(error)
     {
-        let status = error && error.response ? error.response.status : -1;
         let message = error ? error.message : "?";
-        console.log("API Error " + status + ": " + message);
+        console.log("API Error: " + message);
         this.lastError = message;
-        if (status === 401 || status === 403) {
-            AuthToken.set(null);
-            localStorage.setItem("AuthToken", null);
-        }
+        this.onError(error, message);
+        throw error;
     }
 }

package/components/Dialog.svelte

@@ -0,0 +1,20 @@
+<script>
+    export let isOpen = false;
+</script>
+
+{#if isOpen}
+    <div class="z-10 absolute w-screen h-screen bg-black left-0 top-0 bg-opacity-50">        
+    </div>
+
+    <div class="z-10 absolute left-[20vw] top-[10vw] w-[60vw] shadow-xl shadow-slate-700 bg-white p-8">
+        <div>
+            <h3 class="text-lg font-bold mb-2"><slot name="title"/></h3>
+        </div>
+        <div>
+            <slot />
+        </div>
+        <div class="mt-8">
+            <button class="float-right bg-gray-600 text-white p-4" on:click={() => isOpen = false}>Schließen</button>
+        </div>
+    </div>
+{/if}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "0.0.1",
+  "version": "0.0.7",
   "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;
-}