@gandalan/weblibs 1.5.36 → 2.0.1

package/index.d.ts

@@ -1,6 +1,4 @@
 export * from "./index.js";
-export { IDASFactory } from "./api/IDAS.js";
-export { RESTClient } from "./api/RESTClient.js";
 export function createApi(): FluentApi;
 export function fluentApi(url: string, authManager: FluentAuthManager | null, serviceName: string): FluentApi;
 export function createIDASApi(): IDASFluentApi;
@@ -9,7 +7,6 @@ export function createAuthManager(): FluentAuthManager;
 export function fluentIdasAuthManager(appToken: string, authBaseUrl: string): FluentAuthManager;
 export function fetchEnvConfig(envConfig?: string): Promise<EnvironmentConfig>;
 export function restClient(): FluentRESTClient;
-export function initIDAS(appToken: string): Promise<Settings | null>;
 
 export type AblageApi = {
     get: (guid: string) => Promise<AblageDTO>;
@@ -856,8 +853,6 @@ export type CsvExportCombinationDTO = {
     ExportFarbArten: ExportFarbArt[];
 };
 
-export type DecodedToken = import("jwt-decode").JwtPayload & JwtUserInfo & { id?: string };
-
 export type DevOpsStatusDTO = {
     Env: string;
     DbInfo: string;
@@ -2657,13 +2652,6 @@ export type SetFakturaDTO = {
     Kennzeichen: string;
 };
 
-export type Settings = {
-    appToken: string;
-    mandantGuid: string;
-    apiBaseurl: string;
-    authUrl: string;
-};
-
 export type SettingsApi = {
     getAllSettings: () => Promise<Record<string, object>>;
     saveSetting: (key: string, value: object) => Promise<void>;

package/index.js

@@ -1,8 +1,3 @@
-import { IDASFactory } from "./api/IDAS";
-import { RESTClient } from "./api/RESTClient";
-import { initIDAS } from "./api/authUtils";
-export { IDASFactory, initIDAS, RESTClient };
-
 export { createApi, fluentApi } from "./api/fluentApi";
 export { createIDASApi, idasFluentApi } from "./api/idasFluentApi";
 export { createAuthManager, fluentIdasAuthManager } from "./api/fluentAuthManager";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "1.5.36",
+  "version": "2.0.1",
   "description": "WebLibs for Gandalan JS/TS projects",
   "keywords": [
     "gandalan"
@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "axios": "^1.8.2",
     "jwt-decode": "^4.0.0",
     "validator": "^13.12.0"
   },
@@ -34,6 +33,7 @@
     "globals": "^15.15.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   }
 }

package/scripts/generate-dts.mjs

@@ -21,10 +21,7 @@ const dtoRootMarkerEnd = "// END GENERATED ROOT DTO TYPEDEFS";
 const businessRootMarkerStart = "// BEGIN GENERATED ROOT BUSINESS TYPEDEFS";
 const businessRootMarkerEnd = "// END GENERATED ROOT BUSINESS TYPEDEFS";
 
-const rootValueExportStatements = [
-    "export { IDASFactory } from \"./api/IDAS.js\";",
-    "export { RESTClient } from \"./api/RESTClient.js\";"
-];
+const rootValueExportStatements = [];
 
 const rootFunctionDeclarationStatements = [
     "export function createApi(): FluentApi;",
@@ -34,8 +31,7 @@ const rootFunctionDeclarationStatements = [
     "export function createAuthManager(): FluentAuthManager;",
     "export function fluentIdasAuthManager(appToken: string, authBaseUrl: string): FluentAuthManager;",
     "export function fetchEnvConfig(envConfig?: string): Promise<EnvironmentConfig>;",
-    "export function restClient(): FluentRESTClient;",
-    "export function initIDAS(appToken: string): Promise<Settings | null>;"
+    "export function restClient(): FluentRESTClient;"
 ];
 
 const simpleImportTypePattern = /^import\((?:"|').+(?:"|')\)\.[A-Za-z0-9_$]+$/;

package/api/IDAS.js

@@ -1,152 +0,0 @@
-import { isInvalid, currentToken} from "./authUtils";
-import { RESTClient } from "./RESTClient";
-import { jwtDecode } from "jwt-decode";
-
-/** @typedef {import("jwt-decode").JwtPayload & import("./fluentAuthManager.js").JwtUserInfo & { id?: string }} DecodedToken */
-
-export function IDASFactory(settings)
-{
-    if (!isInvalid(settings))
-    {
-        return new IDAS(settings);
-    }
-
-    throw ("Invalid settings: call initIDAS() first to obtain a valid settings!");
-}
-
-class IDAS
-{
-    restClient = undefined;
-    mandantGuid = undefined;
-
-    constructor(settings)
-    {
-        this.settings = settings;
-        this.mandantGuid = settings.mandantGuid; // for backwards compatiblity only
-        this.restClient = new RESTClient(settings);
-    }
-
-    auth = {
-        _self: this,
-        getCurrentAuthToken()
-        {
-            return currentToken;
-        },
-        getRights()
-        {
-            if (!currentToken)
-            {
-                return [];
-            }
-
-            const decoded = /** @type {DecodedToken} */ (jwtDecode(currentToken));
-            if (!decoded.rights)
-            {
-                return [];
-            }
-
-            return Array.isArray(decoded.rights) ? decoded.rights : [decoded.rights];
-        },
-        getRoles()
-        {
-            if (!currentToken)
-            {
-                return [];
-            }
-
-            const decoded = /** @type {DecodedToken} */ (jwtDecode(currentToken));
-            if (!decoded.role)
-            {
-                return [];
-            }
-
-            return Array.isArray(decoded.role) ? decoded.role : [decoded.role];
-        },
-        hasRight(code)
-        {
-            return this.getRights().some(r => r === code);
-        },
-        hasRole(code)
-        {
-            return this.getRoles().some(r => r === code);
-        },
-        getUsername()
-        {
-            if (!currentToken)
-            {
-                return undefined;
-            }
-
-            const decoded = /** @type {DecodedToken} */ (jwtDecode(currentToken));
-            return decoded.id;
-        },
-    };
-
-    mandanten = {
-        _self: this,
-        async getAll()
-        {
-            return await this._self.restClient.get("/Mandanten");
-        },
-        async get(guid)
-        {
-            return await this._self.restClient.get(`/Mandanten/${guid}`);
-        },
-        async save(m)
-        {
-            await this._self.restClient.put("/Mandanten", m);
-        },
-    };
-
-    benutzer = {
-        _self: this,
-        async getAll(mandantGuid)
-        {
-            return await this._self.restClient.get(`/BenutzerListe/${mandantGuid}/?mitRollenUndRechten=true`);
-        },
-        async get(guid)
-        {
-            return await this._self.restClient.get(`/Benutzer/${guid}`);
-        },
-        async save(m)
-        {
-            await this._self.restClient.put("/Benutzer", m);
-        },
-    };
-
-    rollen = {
-        _self: this,
-        async getAll()
-        {
-            return await this._self.restClient.get("/Rollen");
-        },
-        async save(m)
-        {
-            await this._self.restClient.put("/Rollen", m);
-        },
-    };
-
-    vorgaenge = {
-        _self: this,
-        async getByVorgangsnummer(vorgangsNummer, jahr)
-        {
-            return await this._self.restClient.get(`/Vorgang/${vorgangsNummer}/${jahr}`);
-        },
-        async getByGuid(guid)
-        {
-            return await this._self.restClient.get(`/Vorgang/${guid}`);
-        },
-    };
-
-    positionen = {
-        _self: this,
-        async getByPcode(pcode)
-        {
-            return await this._self.restClient.get(`/BelegPositionen/GetByPcode/${pcode}`);
-        },
-        async get(guid)
-        {
-            return await this._self.restClient.get(`/BelegPositionen/Get/${guid}`);
-        },
-    };
-}

package/api/RESTClient.js

@@ -1,179 +0,0 @@
-import axios from "axios";
-import { currentToken } from "./authUtils";
-
-export class RESTClient
-{
-    lastError = "";
-    settings = {};
-    axiosInstance = null;
-
-    constructor(settings)
-    {
-        this.settings = settings;
-
-        this.axiosInstance = axios.create({
-            baseURL: settings.apiBaseurl,
-            headers: {
-                "Authorization": `Bearer ${currentToken}`,
-            },
-        });
-
-        /*this.axiosInstance.interceptors.request.use(async (config) =>
-        {
-            console.log("intercept", config.baseURL, config.url);
-            await this.checkTokenBeforeRequest(config);
-            return config;
-        });*/
-    }
-
-    /*async checkTokenBeforeRequest(config)
-    {
-        if (currentToken && isInvalid(this.settings))
-        { // ignore custom/different JWT tokens
-            await tryRenew(this.settings);
-            console.log(`Updating Header with new JWT Token: ${currentToken}`);
-            this.axiosInstance.headers = {
-                "Authorization": `Bearer ${currentToken}`,
-            }
-        }
-    }*/
-
-    getUrlOptions()
-    {
-        return { withCredentials: false };
-    }
-
-    async get(uri)
-    {
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            const response = await this.axiosInstance.get(uri, this.getUrlOptions());
-            this.lastError = "";
-            return response.data;
-        }
-        catch (error)
-        {
-            this.handleError(error);
-        }
-    }
-
-    async getFile(uri)
-    {
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            const response = await this.axiosInstance.get(uri, { responseType: "blob" });
-            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.handleError(error);
-        }
-    }
-
-    async getRaw(uri)
-    {
-        let response = {};
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            response = await this.axiosInstance.get(uri, this.getUrlOptions())
-            this.lastError = "";
-        }
-        catch (error)
-        {
-            this.handleError(error);
-        }
-
-        return response;
-    }
-
-    async post(uri, formData)
-    {
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            const response = await this.axiosInstance.post(uri, formData, this.getUrlOptions());
-            this.lastError = "";
-            return response;
-        }
-        catch (error)
-        {
-            this.handleError(error);
-        }
-    }
-
-    async put(uri, formData)
-    {
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            const response = await this.axiosInstance.put(uri, formData, this.getUrlOptions());
-            this.lastError = "";
-            return response;
-        }
-        catch (error)
-        {
-            this.handleError(error);
-        }
-    }
-
-    async delete(uri)
-    {
-        try
-        {
-            this.axiosInstance = this.getNewAxiosInstance();
-            const response = await this.axiosInstance.delete(uri, this.getUrlOptions());
-            this.lastError = "";
-            return response;
-        }
-        catch (error)
-        {
-            this.handleError(error);
-        }
-    }
-
-    getNewAxiosInstance()
-    {
-        return axios.create({
-            baseURL: this.settings.apiBaseurl,
-            headers: {
-                "Authorization": `Bearer ${currentToken}`,
-            },
-        });
-    }
-
-    handleError(error)
-    {
-        if (error.response)
-        {
-            // The request was made and the server responded with a status code
-            // that falls out of the range of 2xx
-            console.error(error.response.data, error.response.status, error.response.headers);
-        }
-        else if (error.request)
-        {
-            // The request was made but no response was received
-            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-            // http.ClientRequest in node.js
-            console.error("Request", error.request);
-        }
-        else
-        {
-            // Something happened in setting up the request that triggered an Error
-            console.error("Error", error.message);
-        }
-
-        console.info("Config", error.config);
-        this.lastError = error;
-    }
-}

package/api/authUtils.js

@@ -1,251 +0,0 @@
-import { jwtDecode } from "jwt-decode";
-import validator from "validator";
-
-/**
- * @typedef {Object} Settings
- * @property {string} appToken - The application token.
- * @property {string} mandantGuid - The mandant GUID.
- * @property {string} apiBaseurl - The base URL for the API.
- * @property {string} authUrl - The authentication URL.
- */
-
-/**
- * the current JWT token (encoded)
- *
- * @type {string}
- */
-export let currentToken = undefined;
-
-/**
- * the current refresh token (UUID v4)
- *
- * @type {string}
- */
-export let currentRefreshToken = undefined;
-
-/**
- * initializes the API client with the given appToken
- *
- * @export
- * @async
- * @param {string} appToken, UUID v4 format
- * @returns {Promise<Settings|null>} settings object
- */
-export async function initIDAS(appToken)
-{
-    if (!validator.isUUID(appToken))
-    {
-        console.error("AppToken is not valid GUID");
-        return null;
-    }
-
-    let jwtToken = "";
-    let mandantGuid = "";
-    let apiBaseurl = window.document.body.dataset.apiBaseUrl || "https://api.dev.idas-cloudservices.net/api/";
-    let authUrl = apiBaseurl;
-    let jwtRefreshToken = localStorage.getItem("IDAS_AuthJwtRefreshToken");
-
-    let urlParams = new URLSearchParams(location.search);
-    if (urlParams.has("m"))
-    {
-        mandantGuid = urlParams.get("m");
-    }
-
-    if (urlParams.has("a"))
-    {
-        apiBaseurl = urlParams.get("a");
-    }
-
-    if (urlParams.has("j"))
-    {
-        jwtToken = urlParams.get("j");
-    }
-
-    if (urlParams.has("t"))
-    {
-        jwtRefreshToken = urlParams.get("t");
-    }
-
-    authUrl = apiBaseurl;
-    currentToken = jwtToken;
-    currentRefreshToken = jwtRefreshToken;
-    localStorage.setItem("IDAS_AuthJwtRefreshToken", jwtRefreshToken);
-
-    let settings = { appToken, mandantGuid, apiBaseurl, authUrl };
-    try
-    {
-        await setup(settings);
-        if (isInvalid(settings))
-        {
-            redirectToLogin(settings, "/");
-        }
-    }
-    catch
-    {
-        redirectToLogin(settings, "/");
-    }
-
-    return settings;
-}
-
-/**
- * sets up authentication
- *
- * @export
- * @async
- * @param {Settings} settings
- */
-export async function setup(settings)
-{
-    console.log("Setup IDAS");
-    if (!currentToken && !currentRefreshToken)
-    {
-        throw ("Either currentToken or currentRefreshToken must be set to authenticate");
-    }
-
-    if (currentRefreshToken && isInvalid(settings))
-    {
-        await tryRenew(settings);
-        if (isInvalid(settings))
-        {
-            console.error("Refresh failed, invalid JWT token!");
-        }
-    }
-    else
-    {
-        console.log("Settings already have a valid JWT token, nothing to do");
-        let decoded = jwtDecode(currentToken);
-        let refreshToken = decoded["refreshToken"] || "";
-        if (refreshToken)
-        {
-            console.log("Got new refresh token:", refreshToken);
-            localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
-            currentRefreshToken = refreshToken;
-            startRefreshTimer(settings);
-        }
-
-        let mandantGuid = decoded["mandantGuid"] || "";
-        if (mandantGuid)
-        {
-            settings.mandantGuid = mandantGuid;
-        }
-    }
-
-    console.log("Setup finished", settings);
-}
-
-/**
- * starts a timer to refresh the JWT token before it expires
- *
- * @private
- * @type {*}
- */
-let timerRef = undefined;
-function startRefreshTimer(settings)
-{
-    if (timerRef)
-    {
-        clearInterval(timerRef);
-    }
-
-    timerRef = setInterval(() =>
-    {
-        if (currentToken)
-        {
-            let decoded = jwtDecode(currentToken);
-            const utcNow = Date.parse(new Date().toUTCString()) / 1000;
-            if (decoded && utcNow > decoded.exp - 120)
-            {
-                tryRenew(settings); // fire & forget/don't await --pr
-            }
-        }
-    }, 5000);
-}
-
-/**
- * checks if the current JWT token is invalid
- *
- * @export
- * @param {Settings} settings
- * @returns {boolean}
- */
-export function isInvalid(settings)
-{
-    if (!currentToken)
-    {
-        return true;
-    }
-
-    let decoded = jwtDecode(currentToken);
-    const utcNow = Date.parse(new Date().toUTCString()) / 1000;
-    if (decoded && decoded.exp > utcNow)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * tries to renew the JWT token
- *
- * @export
- * @async
- * @param {Settings} settings
- */
-export async function tryRenew(settings)
-{
-    console.log("Try to refresh");
-
-    const url = settings.authUrl || settings.apiBaseurl;
-    const payload = { "Token": currentRefreshToken };
-    const response = await fetch(`${url}LoginJwt/Refresh`, {
-        method: "PUT",
-        body: JSON.stringify(payload),
-        headers: { "Content-Type": "application/json" },
-    });
-    const token = await response.json();
-    currentToken = token;
-    //console.log("Got JWT token:", currentToken);
-
-    let decoded = jwtDecode(currentToken);
-    let refreshToken = decoded["refreshToken"] || "";
-    if (refreshToken)
-    {
-        console.log("Got new refresh token:", refreshToken);
-        currentRefreshToken = refreshToken;
-        localStorage.setItem("IDAS_AuthJwtRefreshToken", refreshToken);
-        startRefreshTimer(settings);
-    }
-
-    let mandantGuid = decoded["mandantGuid"] || "";
-    if (mandantGuid)
-    {
-        settings.mandantGuid = mandantGuid;
-    }
-
-    if (isInvalid(settings))
-    {
-        console.warn("Token is already expired!");
-    }
-}
-
-/**
- * redirects to the login page
- *
- * @export
- * @param {Settings} settings
- */
-export function redirectToLogin(settings, authPath)
-{
-    const authEndpoint = (new URL(window.location.href).origin) + authPath;
-    let authUrlCallback = `${authEndpoint}?r=%target%&j=%jwt%&m=%mandant%`;
-    authUrlCallback = authUrlCallback.replace("%target%", encodeURIComponent(window.location.href));
-
-    const url = new URL(settings.authUrl || settings.apiBaseurl);
-    url.pathname = "/Session";
-    url.search = `?a=${settings.appToken}&r=${encodeURIComponent(authUrlCallback)}`;
-    let jwtUrl = url.toString();
-
-    window.location.href = jwtUrl;
-}