@etsoo/appscript 1.5.12 → 1.5.14

package/__tests__/app/CoreApp.ts

@@ -98,9 +98,6 @@ class CoreAppTest extends CoreApp<
                  */
                 webUrl: 'http://localhost',
 
-                // Authorization scheme
-                authScheme: ApiAuthorizationScheme.Bearer,
-
                 // Detected culture
                 detectedCulture,
 

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

@@ -1,4 +1,3 @@
-import { ApiAuthorizationScheme } from '@etsoo/restclient';
 import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IExternalSettings } from './ExternalSettings';
@@ -6,10 +5,6 @@ import { IExternalSettings } from './ExternalSettings';
  * App settings interface
  */
 export interface IAppSettings extends IExternalSettings {
-    /**
-     * Authorization scheme
-     */
-    readonly authScheme: ApiAuthorizationScheme | string;
     /**
      * Supported country/region ids
      */

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

@@ -249,10 +249,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     alertResult(result: IActionResult, callback?: NotificationReturn<void>, forceToLocal?: FormatResultCustomCallback): void;
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string): void;
+    authorize(token?: string, schema?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param regionId New country or region

package/lib/cjs/app/CoreApp.js

@@ -534,14 +534,16 @@ class CoreApp {
     }
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token, refreshToken) {
+    authorize(token, schema, refreshToken) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
-        this.api.authorize(this.settings.authScheme, token);
+        schema ?? (schema = 'Bearer');
+        this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== '') {
             if (refreshToken != null)
@@ -1391,11 +1393,11 @@ class CoreApp {
         // Cache the encrypted serverside device id
         this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         if (keep) {
-            this.authorize(user.token, refreshToken);
+            this.authorize(user.token, user.tokenScheme, refreshToken);
         }
         else {
             this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, undefined);
+            this.authorize(user.token, user.tokenScheme, undefined);
         }
     }
     /**
@@ -1404,7 +1406,7 @@ class CoreApp {
      * @param noTrigger No trigger for state change
      */
     userLogout(clearToken = true, noTrigger = false) {
-        this.authorize(undefined, clearToken ? undefined : '');
+        this.authorize(undefined, undefined, clearToken ? undefined : '');
     }
     /**
      * User unauthorized

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

@@ -178,10 +178,11 @@ export interface IApp {
     alertResult(result: IActionResult, callback?: NotificationReturn<void>, forceToLocal?: FormatResultCustomCallback): void;
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string): void;
+    authorize(token?: string, schema?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param region New country or region

package/lib/cjs/i18n/en.json

@@ -122,6 +122,7 @@
     "no": "No",
     "noChanges": "No changes yet",
     "noData": "No valid data",
+    "noDataReturned": "No data returned",
     "noMatches": "No matches",
     "none": "None yet",
     "noOptions": "No options",

package/lib/cjs/i18n/zh-Hans.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "还没有任何修改",
     "noData": "没有有效数据",
+    "noDataReturned": "没有返回数据",
     "noMatches": "没有匹配项",
     "none": "暂时没有",
     "noOptions": "没有选项",

package/lib/cjs/i18n/zh-Hant.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "還沒有任何修改",
     "noData": "沒有有效數據",
+    "noDataReturned": "沒有回傳數據",
     "noMatches": "没有匹配项",
     "none": "暫時沒有",
     "noOptions": "沒有選項",

package/lib/cjs/state/User.d.ts

@@ -22,6 +22,16 @@ export interface IUserData {
      * 机构编号
      */
     readonly organization?: number;
+    /**
+     * Is from the channel organization
+     * 是否来自渠道机构
+     */
+    readonly isChannel?: boolean;
+    /**
+     * Is from the parent organization
+     * 是否来自父级机构
+     */
+    readonly isParent?: boolean;
     /**
      * User role value
      * 用户角色值
@@ -37,6 +47,11 @@ export interface IUserData {
      * 访问令牌
      */
     readonly token: string;
+    /**
+     * Access token scheme
+     * 访问令牌方案
+     */
+    readonly tokenScheme?: string;
 }
 /**
  * User data property keys

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

@@ -1,4 +1,3 @@
-import { ApiAuthorizationScheme } from '@etsoo/restclient';
 import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IExternalSettings } from './ExternalSettings';
@@ -6,10 +5,6 @@ import { IExternalSettings } from './ExternalSettings';
  * App settings interface
  */
 export interface IAppSettings extends IExternalSettings {
-    /**
-     * Authorization scheme
-     */
-    readonly authScheme: ApiAuthorizationScheme | string;
     /**
      * Supported country/region ids
      */

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

@@ -249,10 +249,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     alertResult(result: IActionResult, callback?: NotificationReturn<void>, forceToLocal?: FormatResultCustomCallback): void;
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string): void;
+    authorize(token?: string, schema?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param regionId New country or region

package/lib/mjs/app/CoreApp.js

@@ -531,14 +531,16 @@ export class CoreApp {
     }
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token, refreshToken) {
+    authorize(token, schema, refreshToken) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
-        this.api.authorize(this.settings.authScheme, token);
+        schema ?? (schema = 'Bearer');
+        this.api.authorize(schema, token);
         // Overwrite the current value
         if (refreshToken !== '') {
             if (refreshToken != null)
@@ -1388,11 +1390,11 @@ export class CoreApp {
         // Cache the encrypted serverside device id
         this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
         if (keep) {
-            this.authorize(user.token, refreshToken);
+            this.authorize(user.token, user.tokenScheme, refreshToken);
         }
         else {
             this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, undefined);
+            this.authorize(user.token, user.tokenScheme, undefined);
         }
     }
     /**
@@ -1401,7 +1403,7 @@ export class CoreApp {
      * @param noTrigger No trigger for state change
      */
     userLogout(clearToken = true, noTrigger = false) {
-        this.authorize(undefined, clearToken ? undefined : '');
+        this.authorize(undefined, undefined, clearToken ? undefined : '');
     }
     /**
      * User unauthorized

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

@@ -178,10 +178,11 @@ export interface IApp {
     alertResult(result: IActionResult, callback?: NotificationReturn<void>, forceToLocal?: FormatResultCustomCallback): void;
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string): void;
+    authorize(token?: string, schema?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param region New country or region

package/lib/mjs/i18n/en.json

@@ -122,6 +122,7 @@
     "no": "No",
     "noChanges": "No changes yet",
     "noData": "No valid data",
+    "noDataReturned": "No data returned",
     "noMatches": "No matches",
     "none": "None yet",
     "noOptions": "No options",

package/lib/mjs/i18n/zh-Hans.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "还没有任何修改",
     "noData": "没有有效数据",
+    "noDataReturned": "没有返回数据",
     "noMatches": "没有匹配项",
     "none": "暂时没有",
     "noOptions": "没有选项",

package/lib/mjs/i18n/zh-Hant.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "還沒有任何修改",
     "noData": "沒有有效數據",
+    "noDataReturned": "沒有回傳數據",
     "noMatches": "没有匹配项",
     "none": "暫時沒有",
     "noOptions": "沒有選項",

package/lib/mjs/state/User.d.ts

@@ -22,6 +22,16 @@ export interface IUserData {
      * 机构编号
      */
     readonly organization?: number;
+    /**
+     * Is from the channel organization
+     * 是否来自渠道机构
+     */
+    readonly isChannel?: boolean;
+    /**
+     * Is from the parent organization
+     * 是否来自父级机构
+     */
+    readonly isParent?: boolean;
     /**
      * User role value
      * 用户角色值
@@ -37,6 +47,11 @@ export interface IUserData {
      * 访问令牌
      */
     readonly token: string;
+    /**
+     * Access token scheme
+     * 访问令牌方案
+     */
+    readonly tokenScheme?: string;
 }
 /**
  * User data property keys

package/package.json

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

package/src/app/AppSettings.ts

@@ -1,4 +1,3 @@
-import { ApiAuthorizationScheme } from '@etsoo/restclient';
 import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IExternalSettings } from './ExternalSettings';
@@ -7,11 +6,6 @@ import { IExternalSettings } from './ExternalSettings';
  * App settings interface
  */
 export interface IAppSettings extends IExternalSettings {
-    /**
-     * Authorization scheme
-     */
-    readonly authScheme: ApiAuthorizationScheme | string;
-
     /**
      * Supported country/region ids
      */

package/src/app/CoreApp.ts

@@ -847,15 +847,17 @@ export abstract class CoreApp<
 
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string) {
+    authorize(token?: string, schema?: string, refreshToken?: string) {
         // State, when token is null, means logout
         this.authorized = token != null;
 
         // Token
-        this.api.authorize(this.settings.authScheme, token);
+        schema ??= 'Bearer';
+        this.api.authorize(schema, token);
 
         // Overwrite the current value
         if (refreshToken !== '') {
@@ -1892,10 +1894,10 @@ export abstract class CoreApp<
         this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
 
         if (keep) {
-            this.authorize(user.token, refreshToken);
+            this.authorize(user.token, user.tokenScheme, refreshToken);
         } else {
             this.cachedRefreshToken = this.encrypt(refreshToken);
-            this.authorize(user.token, undefined);
+            this.authorize(user.token, user.tokenScheme, undefined);
         }
     }
 
@@ -1905,7 +1907,7 @@ export abstract class CoreApp<
      * @param noTrigger No trigger for state change
      */
     userLogout(clearToken: boolean = true, noTrigger: boolean = false) {
-        this.authorize(undefined, clearToken ? undefined : '');
+        this.authorize(undefined, undefined, clearToken ? undefined : '');
     }
 
     /**

package/src/app/IApp.ts

@@ -243,10 +243,11 @@ export interface IApp {
 
     /**
      * Authorize
-     * @param token New token
+     * @param token New access token
+     * @param schema Access token schema
      * @param refreshToken Refresh token
      */
-    authorize(token?: string, refreshToken?: string): void;
+    authorize(token?: string, schema?: string, refreshToken?: string): void;
 
     /**
      * Change country or region

package/src/i18n/en.json

@@ -122,6 +122,7 @@
     "no": "No",
     "noChanges": "No changes yet",
     "noData": "No valid data",
+    "noDataReturned": "No data returned",
     "noMatches": "No matches",
     "none": "None yet",
     "noOptions": "No options",

package/src/i18n/zh-Hans.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "还没有任何修改",
     "noData": "没有有效数据",
+    "noDataReturned": "没有返回数据",
     "noMatches": "没有匹配项",
     "none": "暂时没有",
     "noOptions": "没有选项",

package/src/i18n/zh-Hant.json

@@ -122,6 +122,7 @@
     "no": "否",
     "noChanges": "還沒有任何修改",
     "noData": "沒有有效數據",
+    "noDataReturned": "沒有回傳數據",
     "noMatches": "没有匹配项",
     "none": "暫時沒有",
     "noOptions": "沒有選項",

package/src/state/User.ts

@@ -27,6 +27,18 @@ export interface IUserData {
      */
     readonly organization?: number;
 
+    /**
+     * Is from the channel organization
+     * 是否来自渠道机构
+     */
+    readonly isChannel?: boolean;
+
+    /**
+     * Is from the parent organization
+     * 是否来自父级机构
+     */
+    readonly isParent?: boolean;
+
     /**
      * User role value
      * 用户角色值
@@ -44,6 +56,12 @@ export interface IUserData {
      * 访问令牌
      */
     readonly token: string;
+
+    /**
+     * Access token scheme
+     * 访问令牌方案
+     */
+    readonly tokenScheme?: string;
 }
 
 /**