chayns-api 1.0.68 → 1.0.70

package/dist/cjs/calls/index.js

@@ -241,11 +241,13 @@ const storageSetItem = (...args) => _moduleWrapper.moduleWrapper.current.functio
  */
 exports.storageSetItem = storageSetItem;
 const vibrate = (...args) => _moduleWrapper.moduleWrapper.current.functions.vibrate(...args);
+
 /**
  * This method creates a dialog
  */
+// @ts-ignore
 exports.vibrate = vibrate;
-const createDialog = (...args) => _moduleWrapper.moduleWrapper.current.functions.createDialog(...args);
+const createDialog = config => _moduleWrapper.moduleWrapper.current.functions.createDialog(config);
 /**
  * Displays an overlay
  */

package/dist/cjs/constants/languages.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DeviceLanguage = void 0;
+let DeviceLanguage = exports.DeviceLanguage = /*#__PURE__*/function (DeviceLanguage) {
+  DeviceLanguage[DeviceLanguage["de"] = 1] = "de";
+  DeviceLanguage[DeviceLanguage["en"] = 2] = "en";
+  DeviceLanguage[DeviceLanguage["fr"] = 3] = "fr";
+  DeviceLanguage[DeviceLanguage["it"] = 4] = "it";
+  DeviceLanguage[DeviceLanguage["nl"] = 5] = "nl";
+  DeviceLanguage[DeviceLanguage["es"] = 6] = "es";
+  DeviceLanguage[DeviceLanguage["pt"] = 7] = "pt";
+  DeviceLanguage[DeviceLanguage["tr"] = 8] = "tr";
+  DeviceLanguage[DeviceLanguage["pl"] = 9] = "pl";
+  DeviceLanguage[DeviceLanguage["uk"] = 10] = "uk";
+  return DeviceLanguage;
+}({});

package/dist/cjs/wrapper/AppWrapper.js

@@ -12,6 +12,7 @@ var _deviceHelper = _interopRequireWildcard(require("../util/deviceHelper"));
 var _getUserInfo = _interopRequireDefault(require("../calls/getUserInfo"));
 var _sendMessage = require("../calls/sendMessage");
 var _apiListenerHelper = require("../helper/apiListenerHelper");
+var _languages = require("../constants/languages");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -26,7 +27,8 @@ class AppWrapper {
     var _window, _colorMode, _window2, _AppInfo$TappSelected;
     const {
       AppInfo,
-      AppUser
+      AppUser,
+      Device
     } = retVal;
     this.accessToken = AppUser.TobitAccessToken;
     const urlParams = new URLSearchParams(location.search);
@@ -60,6 +62,10 @@ class AppWrapper {
         // ignore
       }
     }
+    let language = AppInfo.Language;
+    if (!language) {
+      language = _languages.DeviceLanguage[Number.parseInt(Device === null || Device === void 0 ? void 0 : Device.LanguageID, 10)] || 'de';
+    }
     return {
       device: (0, _deviceHelper.default)(navigator.userAgent, 'image/webp'),
       environment: {
@@ -67,12 +73,11 @@ class AppWrapper {
         runtimeEnvironment: _IChaynsReact.RuntimeEnviroment.Unknown
       },
       language: {
-        site: urlParamsLowerCase.get('lang') || AppInfo.Language,
+        site: language,
         translation: null,
-        device: urlParamsLowerCase.get('lang') || AppInfo.Language,
-        active: urlParamsLowerCase.get('lang') || AppInfo.Language
+        device: language,
+        active: language
       },
-      // ToDo: Find better way to detect
       site: {
         id: AppInfo.SiteID,
         locationId: AppInfo.LocationID,
@@ -573,12 +578,14 @@ class AppWrapper {
     this.values = this.mapOldApiToNew(await this.appCall(18));
     this.appCall(66, {
       enabled: true,
-      callback: value => {
-        if ('tobitAccessToken' in value) {
-          this.accessToken = value.tobitAccessToken;
-        } else {
-          this.mapOldApiToNew(value);
-        }
+      callback: async () => {
+        this.values = this.mapOldApiToNew(await this.appCall(18));
+        document.dispatchEvent(new CustomEvent('chayns_api_data', {
+          detail: {
+            type: 'user',
+            value: this.values.user
+          }
+        }));
       }
     });
     return undefined;

package/dist/esm/calls/index.js

@@ -282,12 +282,12 @@ export const storageSetItem = function () {
 export const vibrate = function () {
   return moduleWrapper.current.functions.vibrate(...arguments);
 };
+
 /**
  * This method creates a dialog
  */
-export const createDialog = function () {
-  return moduleWrapper.current.functions.createDialog(...arguments);
-};
+// @ts-ignore
+export const createDialog = config => moduleWrapper.current.functions.createDialog(config);
 /**
  * Displays an overlay
  */

package/dist/esm/constants/languages.js

@@ -0,0 +1,13 @@
+export let DeviceLanguage = /*#__PURE__*/function (DeviceLanguage) {
+  DeviceLanguage[DeviceLanguage["de"] = 1] = "de";
+  DeviceLanguage[DeviceLanguage["en"] = 2] = "en";
+  DeviceLanguage[DeviceLanguage["fr"] = 3] = "fr";
+  DeviceLanguage[DeviceLanguage["it"] = 4] = "it";
+  DeviceLanguage[DeviceLanguage["nl"] = 5] = "nl";
+  DeviceLanguage[DeviceLanguage["es"] = 6] = "es";
+  DeviceLanguage[DeviceLanguage["pt"] = 7] = "pt";
+  DeviceLanguage[DeviceLanguage["tr"] = 8] = "tr";
+  DeviceLanguage[DeviceLanguage["pl"] = 9] = "pl";
+  DeviceLanguage[DeviceLanguage["uk"] = 10] = "uk";
+  return DeviceLanguage;
+}({});

package/dist/esm/wrapper/AppWrapper.js

@@ -12,13 +12,15 @@ import getDeviceInfo, { getScreenSize } from '../util/deviceHelper';
 import getUserInfo from '../calls/getUserInfo';
 import { sendMessageToGroup, sendMessageToPage, sendMessageToUser } from '../calls/sendMessage';
 import { addApiListener, dispatchApiEvent, removeApiListener } from '../helper/apiListenerHelper';
+import { DeviceLanguage } from "../constants/languages";
 let appWrapperDialogId = 0;
 export class AppWrapper {
   mapOldApiToNew(retVal) {
     var _window, _colorMode, _window2, _AppInfo$TappSelected;
     const {
       AppInfo,
-      AppUser
+      AppUser,
+      Device
     } = retVal;
     this.accessToken = AppUser.TobitAccessToken;
     const urlParams = new URLSearchParams(location.search);
@@ -52,6 +54,10 @@ export class AppWrapper {
         // ignore
       }
     }
+    let language = AppInfo.Language;
+    if (!language) {
+      language = DeviceLanguage[Number.parseInt(Device === null || Device === void 0 ? void 0 : Device.LanguageID, 10)] || 'de';
+    }
     return {
       device: getDeviceInfo(navigator.userAgent, 'image/webp'),
       environment: {
@@ -59,12 +65,11 @@ export class AppWrapper {
         runtimeEnvironment: RuntimeEnviroment.Unknown
       },
       language: {
-        site: urlParamsLowerCase.get('lang') || AppInfo.Language,
+        site: language,
         translation: null,
-        device: urlParamsLowerCase.get('lang') || AppInfo.Language,
-        active: urlParamsLowerCase.get('lang') || AppInfo.Language
+        device: language,
+        active: language
       },
-      // ToDo: Find better way to detect
       site: {
         id: AppInfo.SiteID,
         locationId: AppInfo.LocationID,
@@ -571,12 +576,14 @@ export class AppWrapper {
     this.values = this.mapOldApiToNew(await this.appCall(18));
     this.appCall(66, {
       enabled: true,
-      callback: value => {
-        if ('tobitAccessToken' in value) {
-          this.accessToken = value.tobitAccessToken;
-        } else {
-          this.mapOldApiToNew(value);
-        }
+      callback: async () => {
+        this.values = this.mapOldApiToNew(await this.appCall(18));
+        document.dispatchEvent(new CustomEvent('chayns_api_data', {
+          detail: {
+            type: 'user',
+            value: this.values.user
+          }
+        }));
       }
     });
     return undefined;

package/dist/types/calls/index.d.ts

@@ -200,7 +200,7 @@ export declare const vibrate: (value: import("../types/IChaynsReact").Vibrate) =
 /**
  * This method creates a dialog
  */
-export declare const createDialog: (config: import("../types/IChaynsReact").Dialog) => import("..").DialogHandler;
+export declare const createDialog: ChaynsReactFunctions["createDialog"];
 /**
  * Displays an overlay
  */
@@ -233,9 +233,7 @@ export declare const getParameters: () => {
 export declare const getPages: () => import("../types/IChaynsReact").Page[];
 export declare const getEnvironment: () => {
     buildEnvironment: import("../types/IChaynsReact").Environment;
-    runtimeEnvironment: string | import("../types/IChaynsReact").RuntimeEnviroment; /**
-     * Refresh accesstoken, should only be used when user object changes, not when token is invalid
-     */
+    runtimeEnvironment: string | import("../types/IChaynsReact").RuntimeEnviroment;
 };
 export declare const user: UserInfo;
 export declare const site: ChaynsApiSite;
@@ -253,7 +251,5 @@ export declare const parameters: {
 export declare const pages: import("../types/IChaynsReact").Page[];
 export declare const environment: {
     buildEnvironment: import("../types/IChaynsReact").Environment;
-    runtimeEnvironment: string | import("../types/IChaynsReact").RuntimeEnviroment; /**
-     * Refresh accesstoken, should only be used when user object changes, not when token is invalid
-     */
+    runtimeEnvironment: string | import("../types/IChaynsReact").RuntimeEnviroment;
 };

package/dist/types/constants/languages.d.ts

@@ -0,0 +1,12 @@
+export declare enum DeviceLanguage {
+    de = 1,
+    en = 2,
+    fr = 3,
+    it = 4,
+    nl = 5,
+    es = 6,
+    pt = 7,
+    tr = 8,
+    pl = 9,
+    uk = 10
+}

package/dist/types/handler/DialogHandler.d.ts

@@ -1,4 +1,4 @@
-export default class DialogHandler {
+export default class DialogHandler<S = void, T extends any = void> {
     private dialogId;
     private isOpen;
     private result;
@@ -9,10 +9,13 @@ export default class DialogHandler {
     private readonly _addDataListener;
     private readonly listeners;
     constructor(config: any, open: any, close: any, dispatchEvent: any, addDataListener: any);
-    open(): Promise<unknown>;
+    open(): Promise<{
+        buttonType: number;
+        value: T extends undefined ? S : T;
+    }>;
     close(buttonType: any, data: any): void;
     dispatchEvent(data: object): void;
     addDataListener(listener: (data: any) => void): void;
     removeDataListener(listener: (data: any) => void): void;
-    getResult(): any;
+    getResult(): T;
 }

package/dist/types/types/IChaynsReact.d.ts

@@ -61,23 +61,23 @@ export interface BaseDialog {
         config?: any;
     };
 }
-export type Dialog = BaseDialog & (DialogAlert | DialogConfirm | DialogInput | DialogModule | DialogIFrame | DialogSelect | DialogDate | DialogToast | DialogFileSelect | DialogSignature);
+export type Dialog<T extends any = object> = BaseDialog & (DialogAlert | DialogConfirm | DialogInput | DialogModule<T> | DialogIFrame<T> | DialogSelect | DialogDate | DialogToast);
 export interface DialogSignature {
     type: DialogType.SIGNATURE;
 }
-export interface DialogModule {
+export interface DialogModule<T extends any = object> {
     type: DialogType.MODULE;
     system: {
         url: string;
         module: string;
         scope: string;
     };
-    dialogInput: object;
+    dialogInput?: T;
 }
-export interface DialogIFrame {
+export interface DialogIFrame<T extends any = object> {
     type: DialogType.IFRAME;
     url: string;
-    dialogInput: object;
+    dialogInput?: T;
 }
 export declare enum DialogInputType {
     NUMBER = "number",
@@ -88,8 +88,8 @@ export declare enum DialogInputType {
 }
 export interface DialogInput {
     type: DialogType.INPUT;
-    placeholder: string;
-    inputType: DialogInputType;
+    placeholder?: string;
+    inputType?: DialogInputType;
     defaultValue?: string;
     formatter?: (input: string) => string;
 }
@@ -216,6 +216,30 @@ export interface ChaynsReactValues {
         isClosingRequested: boolean;
     };
 }
+export interface DialogResultFile {
+    blockDownload?: boolean;
+    contentType: string;
+    filename: string;
+    id: number;
+    key: string;
+    modifyTime: string;
+    personId: string;
+    protected?: boolean;
+    size: number;
+    url: string;
+}
+type DialogResultValue<T> = {
+    [DialogType.INPUT]: string;
+    [DialogType.SELECT]: number[];
+    [DialogType.CONFIRM]: void;
+    [DialogType.ALERT]: void;
+    [DialogType.DATE]: Date;
+    [DialogType.FILE_SELECT]: DialogResultFile[];
+    [DialogType.IFRAME]: T;
+    [DialogType.MODULE]: T;
+    [DialogType.SIGNATURE]: string;
+    [DialogType.TOAST]: void;
+};
 /**
  * @ignore
  */
@@ -275,7 +299,7 @@ export interface ChaynsReactFunctions {
     vibrate: (value: Vibrate) => Promise<void>;
     scrollByY: (position: number, duration?: number) => Promise<void>;
     setOverlay: (value: ShowOverlay, callback: () => void) => Promise<void>;
-    createDialog: (config: Dialog) => DialogHandler;
+    createDialog: <I extends any = undefined, T extends any = undefined, Z extends Dialog<I> = Dialog<I>>(config: Z) => DialogHandler<DialogResultValue<T>[Z["type"]], T>;
     openDialog: (value: any, callback: (data: any) => any) => Promise<any>;
     closeDialog: (dialogId: number) => Promise<void>;
     setDialogResult: (buttonType: DialogButtonType, result: any) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chayns-api",
-    "version": "1.0.68",
+    "version": "1.0.70",
     "description": "new chayns api",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",