@gandalan/weblibs 0.0.6 → 0.0.10

package/README.md

@@ -1 +1,42 @@
 WebLibs for Gandalan JS/TS/Svelte projects
+
+## IDAS API mit JavaScript/TypeScript verwenden
+
+
+```js
+import { IDAS } from '@gandalan/weblibs/api/IDAS';
+let idas = new IDAS();
+
+// bei Bedarf wird der Client zur Anmeldung umgeleitet, danach wird die aktuelle Seite wieder aufgerufen
+idas.authenticateWithSSO(); 
+```
+
+Danach z.B. Zugriff auf die Mandant-Guid:
+
+```js
+let mandantGuid = idas.mandantGuid;
+```
+
+Datenzugriffe erfolgen über die Objekte innerhalb der IDAS-Klasse
+
+```js
+let loader = Promise.all([
+	idas.mandanten.getAll()
+		.then(d => mandanten = d.sort((a,b) => a.Name.localeCompare(b.Name)))
+		.catch(e => error = e),
+	idas.rollen.getAll()
+		.then(d => rollen = d.sort((a,b) => a.Name.localeCompare(b.Name)))
+		.catch(e => error = e)
+])
+	.then(_ => setMandant(mandantGuid));
+```
+
+der hier eingeführte `loader` kann mit dem `{#await}`-Svelte-Konstrukt verwendet werden:
+
+```js
+{#await loader}
+	<progress />
+{:then} 
+ ...
+{/await}
+```

package/api/IDAS.js

@@ -1,39 +1,66 @@
-import { get, writable } from "svelte/store";
 import { RESTClient } from "./RESTClient";
 
+if (window.location.search) {
+    var urlParams = new URLSearchParams(location.search);
+    if (urlParams.has("t")) 
+        localStorage.setItem("IDAS_AuthToken", urlParams.get("t"));
+    if (urlParams.has("m")) 
+        localStorage.setItem("IDAS_MandantGuid", urlParams.get("m"));
+    if (urlParams.has("a")) 	
+        localStorage.setItem("IDAS_ApiBaseUrl", urlParams.get("a"));
+    window.location = window.location.origin;
+}
+
 let appToken = localStorage.getItem("IDAS_AppToken") || "66B70E0B-F7C4-4829-B12A-18AD309E3970";
 let authToken = localStorage.getItem("IDAS_AuthToken");
-let mandantGuid = localStorage.getItem("IDAS_MandantGuid");
+//let mandantGuid = localStorage.getItem("IDAS_MandantGuid");
 let apiBaseUrl = localStorage.getItem("IDAS_ApiBaseUrl") || "https://api.dev.idas-cloudservices.net/api";
-let siteBaseUrl = localStorage.get("SiteBaseUrl") || window.location.protocol + "//" + window.location.host;
-let ssoAuthUrl = apiBaseUrl.replace("/api", "") + "/SSO?a=" + appToken + "&r=%target%?t=%token%%26m=%mandant%";
+//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");
+        var ssoURL = ssoAuthUrl.replace("%target%", window.location.origin);
+        window.location = ssoURL;
+    }
+}
 
 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 = get(ssoAuthUrl).replace("%target%", get(siteBaseUrl)).replace("%mandant%", get(mandantGuid));
-        window.location = ssoURL;
+        if (!authToken)
+        {
+            var ssoURL = ssoAuthUrl.replace("%target%", window.location.origin);
+            window.location = ssoURL;
+        }
     }
 
+    mandantGuid = localStorage.getItem("IDAS_MandantGuid");
+
     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() { return await restClient.get("/BenutzerListe"); },
+        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); }
     };

package/api/RESTClient.js

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios from "axios";
 
 /*export let AppToken = "66B70E0B-F7C4-4829-B12A-18AD309E3970";
 export let AuthToken = localStorage.getItem("AuthToken");
@@ -33,7 +33,7 @@ export class RESTClient
     async get(uri)
     {
         try {
-            const response = await axios.get(this.baseurl + uri);
+            const response = await axios.get(this.baseurl + uri, { withCredentials: false });
             this.lastError = '';
             return response.data;
         }
@@ -63,7 +63,7 @@ export class RESTClient
     {
         let response = {};
         try {
-            response = await axios.get(this.baseurl + uri, { withCredentials: true })
+            response = await axios.get(this.baseurl + uri, { withCredentials: false })
             this.lastError = '';
         }
         catch (error) {
@@ -75,7 +75,7 @@ export class RESTClient
     async post(uri, formData) 
     {
         try {
-            const response = await axios.post(this.baseurl + uri, formData, { withCredentials: true });
+            const response = await axios.post(this.baseurl + uri, formData, { withCredentials: false });
             this.lastError = '';
             return response;
         }
@@ -87,7 +87,7 @@ export class RESTClient
     async put(uri, formData) 
     {
         try {
-            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;
         }
@@ -100,7 +100,7 @@ export class RESTClient
     {
         try
         {
-            const response = await axios.delete(this.baseurl + uri, { withCredentials: true });
+            const response = await axios.delete(this.baseurl + uri, { withCredentials: false });
             this.lastError = '';
             return response;
         }
@@ -109,12 +109,14 @@ export class RESTClient
         }
     }
 
+    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;
+        this.onError(error, message);
         throw error;
     }
 }

package/api/index.js

@@ -0,0 +1,4 @@
+import { IDAS } from './IDAS';
+import { RESTClient } from './RESTClient';
+
+export { IDAS, RESTClient };

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/components/index.js

@@ -1,11 +1,12 @@
 import AddButton from './AddButton.svelte';
 import DataGrid from './DataGrid.svelte';
+import Dialog from './Datepicker.svelte';
 import Datepicker from './Datepicker.svelte';
 import Inputbox from './Inputbox.svelte';
 import RemoveButton from './RemoveButton.svelte';
 import SaveButton from './SaveButton.svelte';
 
 export {
-    DataGrid, Datepicker, Inputbox,
+    DataGrid, Datepicker, Inputbox, Dialog,
     AddButton, RemoveButton, SaveButton
 }

package/package.json

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