@etsoo/appscript 1.6.4 → 1.6.6

package/lib/cjs/api/AuthApi.d.ts

@@ -6,7 +6,6 @@ import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
 import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
-import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
 import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
@@ -59,12 +58,11 @@ export declare class AuthApi extends BaseApi {
     exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
-     * @param rq Request data
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
+    getLogInUrl(payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data

package/lib/cjs/api/AuthApi.js

@@ -69,12 +69,15 @@ class AuthApi extends BaseApi_1.BaseApi {
     }
     /**
      * Get log in url
-     * @param rq Request data
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(rq, payload, apiHost) {
+    getLogInUrl(payload, apiHost) {
+        const rq = {
+            region: this.app.region,
+            device: this.app.deviceId
+        };
         return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
     }
     /**

package/lib/cjs/app/CoreApp.d.ts

@@ -595,6 +595,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url: string, targetOrigin?: string): void;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/cjs/app/CoreApp.js

@@ -1396,6 +1396,25 @@ class CoreApp {
     isManagerUser() {
         return this.hasMinPermission(UserRole_1.UserRole.Manager);
     }
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url, targetOrigin) {
+        // Is it embeded?
+        if (this.embedded && targetOrigin) {
+            globalThis.parent.postMessage([this.coreName + "Url", url], targetOrigin);
+        }
+        else {
+            if (BridgeUtils_1.BridgeUtils.host == null) {
+                globalThis.location.href = url;
+            }
+            else {
+                BridgeUtils_1.BridgeUtils.host.loadApp(this.coreName, url);
+            }
+        }
+    }
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/cjs/app/IApp.d.ts

@@ -542,6 +542,12 @@ export interface IApp {
      * @param password Input password
      */
     isValidPassword(password: string): boolean;
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url: string, targetOrigin?: string): void;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/mjs/api/AuthApi.d.ts

@@ -6,7 +6,6 @@ import { DataTypes, IActionResult } from "@etsoo/shared";
 import { RefreshTokenProps, RefreshTokenResult } from "../app/IApp";
 import { TokenInputRQ } from "./rq/TokenRQ";
 import { ApiRefreshTokenDto } from "./dto/ApiRefreshTokenDto";
-import { GetLogInUrlRQ } from "./rq/GetLogInUrlRQ";
 import { LoginRQ } from "./rq/LoginRQ";
 import { ResetPasswordInputRQ } from "./rq/ResetPasswordRQ";
 import { SignoutRQ } from "./rq/SignoutRQ";
@@ -59,12 +58,11 @@ export declare class AuthApi extends BaseApi {
     exchangeToken(rq: TokenInputRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
     /**
      * Get log in url
-     * @param rq Request data
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(rq: GetLogInUrlRQ, payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
+    getLogInUrl(payload?: IApiPayload<string>, apiHost?: string): Promise<string | undefined>;
     /**
      * Login
      * @param rq Request data

package/lib/mjs/api/AuthApi.js

@@ -66,12 +66,15 @@ export class AuthApi extends BaseApi {
     }
     /**
      * Get log in url
-     * @param rq Request data
      * @param payload Payload
      * @param apiHost API host
      * @returns Result
      */
-    getLogInUrl(rq, payload, apiHost) {
+    getLogInUrl(payload, apiHost) {
+        const rq = {
+            region: this.app.region,
+            device: this.app.deviceId
+        };
         return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
     }
     /**

package/lib/mjs/app/CoreApp.d.ts

@@ -595,6 +595,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url: string, targetOrigin?: string): void;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/mjs/app/CoreApp.js

@@ -1393,6 +1393,25 @@ export class CoreApp {
     isManagerUser() {
         return this.hasMinPermission(UserRole.Manager);
     }
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url, targetOrigin) {
+        // Is it embeded?
+        if (this.embedded && targetOrigin) {
+            globalThis.parent.postMessage([this.coreName + "Url", url], targetOrigin);
+        }
+        else {
+            if (BridgeUtils.host == null) {
+                globalThis.location.href = url;
+            }
+            else {
+                BridgeUtils.host.loadApp(this.coreName, url);
+            }
+        }
+    }
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/lib/mjs/app/IApp.d.ts

@@ -542,6 +542,12 @@ export interface IApp {
      * @param password Input password
      */
     isValidPassword(password: string): boolean;
+    /**
+     * Load URL
+     * @param url URL
+     * @param targetOrigin Target origin
+     */
+    loadUrl(url: string, targetOrigin?: string): void;
     /**
      * Navigate to Url or delta
      * @param url Url or delta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/api/AuthApi.ts

@@ -101,16 +101,15 @@ export class AuthApi extends BaseApi {
 
   /**
    * Get log in url
-   * @param rq Request data
    * @param payload Payload
    * @param apiHost API host
    * @returns Result
    */
-  getLogInUrl(
-    rq: GetLogInUrlRQ,
-    payload?: IApiPayload<string>,
-    apiHost?: string
-  ) {
+  getLogInUrl(payload?: IApiPayload<string>, apiHost?: string) {
+    const rq: GetLogInUrlRQ = {
+      region: this.app.region,
+      device: this.app.deviceId
+    };
     return this.api.get(`${apiHost ?? ""}Auth/GetLogInUrl`, rq, payload);
   }
 

package/src/app/CoreApp.ts

@@ -1913,6 +1913,24 @@ export abstract class CoreApp<
     return this.hasMinPermission(UserRole.Manager);
   }
 
+  /**
+   * Load URL
+   * @param url URL
+   * @param targetOrigin Target origin
+   */
+  loadUrl(url: string, targetOrigin?: string) {
+    // Is it embeded?
+    if (this.embedded && targetOrigin) {
+      globalThis.parent.postMessage([this.coreName + "Url", url], targetOrigin);
+    } else {
+      if (BridgeUtils.host == null) {
+        globalThis.location.href = url;
+      } else {
+        BridgeUtils.host.loadApp(this.coreName, url);
+      }
+    }
+  }
+
   /**
    * Navigate to Url or delta
    * @param url Url or delta

package/src/app/IApp.ts

@@ -715,6 +715,13 @@ export interface IApp {
    */
   isValidPassword(password: string): boolean;
 
+  /**
+   * Load URL
+   * @param url URL
+   * @param targetOrigin Target origin
+   */
+  loadUrl(url: string, targetOrigin?: string): void;
+
   /**
    * Navigate to Url or delta
    * @param url Url or delta