npm - @minimaltech/node-infra - Versions diffs - 0.5.8-1 → 0.5.8-10 - Mend

@minimaltech/node-infra 0.5.8-1 → 0.5.8-10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (86) hide show

package/dist/base/repositories/base.repository.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AnyType, EntityClassType, EntityRelationType, IdType, ITzRepository } from '../../common/types';
+import { EntityClassType, EntityRelationType, IdType, ITzRepository } from '../../common/types';
 import { ApplicationLogger } from '../../helpers';
 import { AnyObject, WhereBuilder as BaseWhereBuilder, Command, Count, DataObject, DefaultCrudRepository as _DefaultCrudRepository, DefaultKeyValueRepository, IsolationLevel, juggler, NamedParameters, Options, PositionalParameters, Transaction, TransactionalEntityRepository, Where, HasManyRepositoryFactory, Getter, EntityCrudRepository } from '@loopback/repository';
 import { BaseEntity, BaseKVEntity, BaseTzEntity } from '../base.model';
@@ -17,7 +17,7 @@ export declare class DefaultCrudRepository<E extends BaseEntity, ID, Relations e
         targetRepositoryGetter: Getter<EntityCrudRepository<Target, TargetId>>;
     }): HasManyRepositoryFactory<Target, ForeignKeyType>;
 }
-export declare abstract class AbstractTzRepository<E extends BaseTzEntity, R extends EntityRelationType = AnyType> extends DefaultCrudRepository<E, IdType, R> implements ITzRepository<E>, TransactionalEntityRepository<E, IdType, R> {
+export declare abstract class AbstractTzRepository<E extends BaseTzEntity, R extends EntityRelationType = EntityRelationType> extends DefaultCrudRepository<E, IdType, R> implements ITzRepository<E>, TransactionalEntityRepository<E, IdType, R> {
     protected logger: ApplicationLogger;
     constructor(entityClass: EntityClassType<E>, dataSource: juggler.DataSource, scope?: string);
     beginTransaction(options?: IsolationLevel | Options): Promise<Transaction>;
@@ -48,7 +48,7 @@ export declare abstract class AbstractKVRepository<E extends BaseKVEntity> exten
 export declare abstract class KVRepository<E extends BaseKVEntity> extends AbstractKVRepository<E> {
     constructor(entityClass: EntityClassType<E>, dataSource: juggler.DataSource);
 }
-export declare abstract class ViewRepository<E extends BaseEntity, R extends EntityRelationType = AnyType> extends DefaultCrudRepository<E, IdType, R> {
+export declare abstract class ViewRepository<E extends BaseEntity, R extends EntityRelationType = EntityRelationType> extends DefaultCrudRepository<E, IdType, R> {
     constructor(entityClass: EntityClassType<E>, dataSource: juggler.DataSource);
     existsWith(where?: Where<E>, options?: Options): Promise<boolean>;
     create(_data: DataObject<E>, _options?: Options): Promise<E>;

package/dist/base/repositories/base.repository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/base.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;~~AAOA~~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"}
1	+ {"version":3,"file":"base.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/base.repository.ts"],"names":[],"mappings":"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"}

package/dist/base/repositories/searchable-tz-crud.repository.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { AnyType, EntityClassType, EntityRelationType, IdType, TRelationType } from '../../common/types';
+import { EntityClassType, EntityRelationType, IdType, TRelationType } from '../../common/types';
 import { DataObject, Getter, Inclusion, juggler, Options, Where } from '@loopback/repository';
 import { BaseObjectSearchTzEntity, BaseSearchableTzEntity, BaseTextSearchTzEntity, BaseTzEntity } from '../base.model';
 import { TzCrudRepository } from './tz-crud.repository';
-export declare abstract class SearchableTzCrudRepository<E extends BaseTextSearchTzEntity | BaseObjectSearchTzEntity | BaseSearchableTzEntity, R extends EntityRelationType = AnyType> extends TzCrudRepository<E, R> {
+export declare abstract class SearchableTzCrudRepository<E extends BaseTextSearchTzEntity | BaseObjectSearchTzEntity | BaseSearchableTzEntity, R extends EntityRelationType = EntityRelationType> extends TzCrudRepository<E, R> {
     protected readonly searchableInclusions: Inclusion[];
     protected readonly isInclusionRelations: boolean;
     constructor(entityClass: EntityClassType<E>, dataSource: juggler.DataSource, opts: {

package/dist/base/repositories/tz-crud.repository.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { AnyType, EntityClassType, EntityRelationType, IdType } from '../../common/types';
+import { EntityClassType, EntityRelationType, IdType } from '../../common/types';
 import { Count, DataObject, juggler, Options, Where } from '@loopback/repository';
 import { BaseTzEntity } from '../base.model';
 import { AbstractTzRepository } from './base.repository';
-export declare abstract class TzCrudRepository<E extends BaseTzEntity, R extends EntityRelationType = AnyType> extends AbstractTzRepository<E, R> {
+export declare abstract class TzCrudRepository<E extends BaseTzEntity, R extends EntityRelationType = EntityRelationType> extends AbstractTzRepository<E, R> {
     constructor(entityClass: EntityClassType<E>, dataSource: juggler.DataSource, scope?: string);
     existsWith(where?: Where<E>, options?: Options): Promise<boolean>;
     create(data: DataObject<E>, options?: Options & {

package/dist/components/authenticate/oauth2-handlers/base.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { BaseTzEntity } from '../../../base/base.model';
 import { AnyObject, TInjectionGetter } from '../../../common';
 import { ApplicationLogger } from '../../../helpers';
 import { BaseModel, Client, Falsey, RequestAuthenticationModel, Token, User } from '@node-oauth/oauth2-server';
-import { OAuth2Token } from '../models';
+import { OAuth2Client, OAuth2Token } from '../models';
 export interface IOAuth2AuthenticationHandler extends BaseModel, RequestAuthenticationModel {
 }
 export declare abstract class AbstractOAuth2AuthenticationHandler implements IOAuth2AuthenticationHandler {
@@ -29,7 +29,7 @@ export declare abstract class AbstractOAuth2AuthenticationHandler implements IOA
         token: string;
     }): Promise<{
         token: OAuth2Token;
-        client: any;
+        client: OAuth2Client;
         user: BaseTzEntity;
     }>;
     getAccessToken(accessToken: string): Promise<Token | Falsey>;

package/dist/components/authenticate/oauth2-handlers/base.js CHANGED Viewed

@@ -46,8 +46,14 @@ class AbstractOAuth2AuthenticationHandler {
                     'endpoints',
                 ],
             })
-                .then((oauth2Client) => {
+                .then(oauth2Client => {
                 var _a, _b, _c, _d;
+                if (!oauth2Client) {
+                    reject((0, utilities_1.getError)({
+                        message: `[getClient] OAuth2 client NOT FOUND | clientId: ${clientId}`,
+                    }));
+                    return;
+                }
                 resolve({
                     id: oauth2Client.id.toString(),
                     identifier: oauth2Client.identifier,
@@ -189,7 +195,9 @@ class AbstractOAuth2AuthenticationHandler {
             return {
                 accessToken,
                 accessTokenExpiresAt: new Date((0, utilities_1.int)(tokenPayload['exp']) * 1000),
-                client: oauth2Client,
+                client: Object.assign({}, oauth2Client.toObject(), {
+                    id: oauth2Client.id.toString(),
+                }),
                 user: { id: tokenPayload.userId },
             };
         });

package/dist/components/authenticate/oauth2-handlers/base.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAA2F;AAC3F,uCAA6D;AAC7D,2CAA4C;AAC5C,iDAAgD;AAchD,qDAA6B;AAC7B,sCAAmF;AAInF,MAAsB,mCAAmC;IAKvD,YAAY,IAAmF;;QAC7F,IAAI,CAAC,MAAM,GAAG,uBAAa,CAAC,SAAS,CAAC;YACpC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,mCAAmC,CAAC,IAAI;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC5C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;IAC5C,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,YAAoB;QAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+EAA+E,EAC/E,QAAQ,EACR,YAAY,CACb,CAAC;YAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAC3C,qCAAqC,CACtC,CAAC;YACF,gBAAgB;iBACb,OAAO,CAAC;gBACP,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE;gBACzD,MAAM,EAAE;oBACN,IAAI;oBACJ,YAAY;oBACZ,UAAU;oBACV,MAAM;oBACN,aAAa;oBACb,QAAQ;oBACR,QAAQ;oBACR,WAAW;iBACZ;aACF,CAAC;iBACD,IAAI,CAAC,CAAC,~~YAA0B~~,EAAE,EAAE~~;;gBACnC~~,OAAO,CAAC;oBACN,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE;oBAC9B,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,WAAW,EAAE,YAAY,CAAC,WAAW;oBACrC,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,YAAY,EAAE,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,0CAAE,YAAY,mCAAI,EAAE;oBACzD,YAAY,EAAE,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,0CAAE,YAAY,mCAAI,EAAE;iBAC1D,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAEK,mBAAmB,CAAC,MAAc,EAAE,IAAU,EAAE,MAAgB;;;YACpE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAkB,0BAA0B,CAAC,CAAC;YAElF,MAAM,MAAM,GAAG,IAAA,aAAG,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAE/B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EACL,mFAAmF;iBACtF,CAAC,CAAC;YACL,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAe,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5E,MAAM,eAAe,GAAG,MAAM,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,kBAAkB,4DAAG,EAAE,MAAM,EAAE,CAAC,CAAA,CAAC;YAE5E,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAClC,OAAO,EAAE;oBACP,CAAC,qBAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE;oBAC/B,MAAM,EAAE,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,mCAAI,MAAM,CAAC,QAAQ,EAAE;oBACpD,KAAK,EAAE,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,mCAAI,EAAE;oBACnC,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,MAAM;iBACP;aACF,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,UAAU,CAAC,IAMV;QACC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACpD,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAChD,oCAAoC,CACrC,CAAC;QAEF,OAAO,qBAAqB,CAAC,MAAM,CAAC;YAClC,KAAK;YACL,IAAI;YACJ,MAAM,EAAE,4BAAmB,CAAC,SAAS;YACrC,QAAQ,EAAE,IAAA,eAAG,EAAC,MAAM,CAAC,EAAE,CAAC;YACxB,MAAM,EAAE,IAAA,eAAG,EAAC,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,KAAY,EAAE,MAAc,EAAE,IAAU;QAChD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,UAAU,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,WAAW;gBACxB,IAAI,EAAE,iCAAwB,CAAC,iBAAiB;gBAChD,MAAM;gBACN,IAAI;gBACJ,OAAO,EAAE,KAAK;aACf,CAAC;iBACC,IAAI,CAAC,GAAG,EAAE;gBACT,OAAO,iCAAM,KAAK,KAAE,MAAM,EAAE,IAAI,IAAG,CAAC;YACtC,CAAC,CAAC;iBACD,KAAK,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAEK,SAAS,CAAC,IAAqC;;YACnD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAE7B,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAChD,oCAAoC,CACrC,CAAC;YACF,MAAM,WAAW,GAAuB,MAAM,qBAAqB,CAAC,OAAO,CAAC;gBAC1E,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC3F,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,oDAAoD,IAAI,aAAa,KAAK,EAAE;iBACtF,CAAC,CAAC;YACL,CAAC;YAED,IAAI,WAAW,CAAC,MAAM,KAAK,4BAAmB,CAAC,SAAS,EAAE,CAAC;gBACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,WAAW,CAAC,CAAC;gBACrF,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,2CAA2C,WAAW,CAAC,MAAM,EAAE;iBACzE,CAAC,CAAC;YACL,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CACzC,6BAA6B,CAC9B,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;gBACxC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,eAAG,EAAC,WAAW,CAAC,MAAM,CAAC,EAAE;gBACtC,MAAM,EAAE,CAAC,IAAI,CAAC;aACf,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qEAAqE,EACrE,IAAI,EACJ,KAAK,EACL,WAAW,CACZ,CAAC;gBACF,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,6CAA6C,IAAI,aAAa,KAAK,EAAE;iBAC/E,CAAC,CAAC;YACL,CAAC;YAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,eAAe,CACjD,qCAAqC,CACtC,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,eAAG,EAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;gBACxC,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC;aAC9D,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6EAA6E,EAC7E,IAAI,EACJ,KAAK,EACL,WAAW,CACZ,CAAC;gBACF,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,qDAAqD,IAAI,aAAa,KAAK,EAAE;iBACvF,CAAC,CAAC;YACL,CAAC;YAED,OAAO;gBACL,KAAK,EAAE,WAAW;gBAClB,MAAM,EAAE,YAAY;gBACpB,IAAI;aACL,CAAC;QACJ,CAAC;KAAA;IAEK,cAAc,CAAC,WAAmB;;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAkB,0BAA0B,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;gBAClC,IAAI,EAAE,uBAAc,CAAC,WAAW;gBAChC,KAAK,EAAE,WAAW;aACnB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;YAE1C,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sEAAsE,EACtE,YAAY,CACb,CAAC;gBACF,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,qDAAqD;iBAC/D,CAAC,CAAC;YACL,CAAC;YAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,eAAe,CACjD,qCAAqC,CACtC,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE;gBAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC;aAC9D,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,wDAAwD,QAAQ,EAAE;iBAC5E,CAAC,CAAC;YACL,CAAC;YAED,OAAO;gBACL,WAAW;gBACX,oBAAoB,EAAE,IAAI,IAAI,CAAC,IAAA,eAAG,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;gBAC/D,MAAM,EAAE,YAAY;~~gBACpB~~,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE;aAClC,CAAC;QACJ,CAAC;KAAA;IAED,WAAW,CAAC,KAAY,EAAE,MAAgB;QACxC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACxE,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;~~AA1OD~~,~~kFA0OC~~"}
1	+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/components/authenticate/oauth2-handlers/base.ts"],"names":[],"mappings":"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"}

package/dist/components/authenticate/services/oauth2.service.js CHANGED Viewed

@@ -138,6 +138,9 @@ let OAuth2Service = OAuth2Service_1 = class OAuth2Service extends services_1.Bas
                 where: { clientId: signInRequest.clientId },
                 fields: ['id', 'clientId', 'clientSecret'],
             });
+            if (!client) {
+                throw (0, utilities_1.getError)({ message: `[auth] Invalid client to create auth request!` });
+            }
             const oauth2TokenRequest = new oauth2_server_1.Request(context.request);
             oauth2TokenRequest.body = {
                 client_id: client.clientId, // eslint-disable-line @typescript-eslint/naming-convention

package/dist/components/authenticate/services/oauth2.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth2.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"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~~YAEH~~,MAAM,kBAAkB,GAAG,IAAI,uBAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxD,kBAAkB,CAAC,IAAI,GAAG;gBACxB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,2DAA2D;gBACvF,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE,2DAA2D;gBAC/F,IAAI,EAAE,mBAAmB,CAAC,iBAAiB;gBAC3C,UAAU,EAAE,oBAAoB,EAAE,2DAA2D;aAC9F,CAAC;YAEF,IAAI,WAAW,EAAE,CAAC;gBAChB,kBAAkB,CAAC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YACrD,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;gBAC7C,OAAO,EAAE,kBAAkB;gBAC3B,QAAQ,EAAE,IAAI,wBAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;aACzC,CAAC,CAAC;YAEH,OAAO;gBACL,WAAW,EAAE,mBAAmB,CAAC,WAAW;gBAC5C,aAAa;aACd,CAAC;QACJ,CAAC;KAAA;IAED,mFAAmF;IAC7E,gBAAgB,CAAC,IAAuC;;;YAC5D,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,GAC7E,IAAI,CAAC,WAAW,CAAC;YAEnB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,EAAE,MAAM,CAAC,CAAC;gBAC5E,OAAO;YACT,CAAC;YAED,MAAM,YAAY,GAAkB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,EAAE,CAAC;YAC/D,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG;gBACd,CAAC;gBACD,WAAW;gBACX,iBAAiB;gBACjB,oBAAoB;gBACpB,IAAI;aACL,CAAC;YAEF,MAAM,OAAO,CAAC,GAAG,CACf,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,KAAK,CAAC,WAAW,EAAE;wBACjB,MAAM,EAAE,MAAM;wBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;wBAC7B,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,mCAAmC,EAAE;qBACnE,CAAC;yBACC,IAAI,CAAC,EAAE,CAAC,EAAE;wBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,EAAE,WAAW,CAAC,CAAC;wBACtF,OAAO,CAAC,EAAE,CAAC,CAAC;oBACd,CAAC,CAAC;yBACD,KAAK,CAAC,KAAK,CAAC,EAAE;wBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6DAA6D,EAC7D,WAAW,EACX,KAAK,CACN,CAAC;wBACF,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;CACF,CAAA;~~AAzOY~~,sCAAa;wBAAb,aAAa;IAIrB,WAAA,IAAA,aAAM,EAAC,mBAAY,CAAC,oBAAoB,CAAC,CAAA;IAEzC,WAAA,IAAA,aAAM,EAAC,yBAAgB,CAAC,cAAc,CAAC,CAAA;IACvC,WAAA,IAAA,aAAM,EAAC,qCAAqC,CAAC,CAAA;qCAFzB,8BAAe;QACsB,+BAAa;QAEvC,qCAAsB;GAR7C,aAAa,~~CAyOzB~~"}
1	+ {"version":3,"file":"oauth2.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"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"}

package/dist/components/authenticate/services/oauth2.strategy.d.ts CHANGED Viewed

@@ -1,8 +1,6 @@
-import { BaseNetworkRequest } from '../../../helpers/network';
+import { AxiosNetworkRequest } from '../../../helpers/network';
 import { Context } from '@loopback/core';
 import { Request } from '@loopback/rest';
-declare class AuthProviderNetworkRequest extends BaseNetworkRequest {
-}
 export declare const defineOAuth2Strategy: (opts: {
     name: string;
     baseURL: string;
@@ -10,7 +8,7 @@ export declare const defineOAuth2Strategy: (opts: {
 }) => {
     new (): {
         name: string;
-        authProvider: AuthProviderNetworkRequest;
+        authProvider: AxiosNetworkRequest;
         authPath: string;
         authenticate(request: Request): Promise<any>;
     };
@@ -20,4 +18,3 @@ export declare const registerOAuth2Strategy: (context: Context, options: {
     authenticateUrl: string;
     authenticatePath?: string;
 }) => void;
-export {};

package/dist/components/authenticate/services/oauth2.strategy.js CHANGED Viewed

@@ -13,35 +13,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerOAuth2Strategy = exports.defineOAuth2Strategy = void 0;
+const common_1 = require("../../../common");
 const network_1 = require("../../../helpers/network");
 const utilities_1 = require("../../../utilities");
 const authentication_1 = require("@loopback/authentication");
 const security_1 = require("@loopback/security");
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-class AuthProviderNetworkRequest extends network_1.BaseNetworkRequest {
-}
 const defineOAuth2Strategy = (opts) => {
     class Strategy {
         constructor() {
             var _a;
             this.name = opts.name;
-            const baseURL = opts.baseURL;
-            if (!baseURL || (0, isEmpty_1.default)(baseURL)) {
+            const baseUrl = opts.baseURL;
+            if (!baseUrl || (0, isEmpty_1.default)(baseUrl)) {
                 throw (0, utilities_1.getError)({
                     message: `[RemoteAuthenticationStrategy][DANGER] INVALID baseURL | Missing env: APP_ENV_REMOTE_AUTH_SERVER_URL`,
                 });
             }
             this.authPath = (_a = opts.authPath) !== null && _a !== void 0 ? _a : '/auth/who-am-i';
-            this.authProvider = new AuthProviderNetworkRequest({
-                name: AuthProviderNetworkRequest.name,
-                scope: `${Strategy.name}_${opts.name}`,
-                networkOptions: { baseURL },
+            this.authProvider = new network_1.AxiosNetworkRequest({
+                name: `${Strategy.name}_${opts.name}`,
+                networkOptions: { baseUrl },
             });
         }
         authenticate(request) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 const networkService = this.authProvider.getNetworkService();
+                if (!request.headers['authorization']) {
+                    throw (0, utilities_1.getError)({
+                        statusCode: common_1.ResultCodes.RS_4.Unauthorized,
+                        message: 'No authorization token',
+                    });
+                }
                 const rs = yield networkService.send({
                     url: this.authProvider.getRequestUrl({ paths: [this.authPath] }),
                     headers: { Authorization: request.headers['authorization'] },

package/dist/components/authenticate/services/oauth2.strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth2.strategy.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+~~CAAuD~~;~~AACvD~~,2CAAuC;AACvC,6DAAkG;AAGlG,iDAAgD;AAChD,6DAAqC;~~AAErC~~,MAAM,~~0BAA2B,SAAQ,4BAAkB;CAAG;AAEvD,MAAM,~~oBAAoB,GAAG,CAAC,IAIpC,EAAE,EAAE;IACH,MAAM,QAAQ;QAMZ;;YALA,SAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAMf,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,sGAAsG;iBAChH,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,gBAAgB,CAAC;YAElD,IAAI,CAAC,YAAY,GAAG,IAAI,~~0BAA0B~~,CAAC;~~gBACjD~~,IAAI,EAAE,~~0BAA0B,CAAC,IAAI;gBACrC,KAAK,EAAE,~~GAAG,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;~~gBACtC~~,cAAc,EAAE,EAAE,OAAO,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC;QAEK,YAAY,CAAC,OAAgB;;;gBACjC,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;~~gBAC7D~~,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC;oBACnC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAChE,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;iBAC7D,CAAC,CAAC;gBAEH,IAAI,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,KAAK,EAAE,CAAC;oBACpB,MAAM,IAAA,oBAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChC,CAAC;gBAED,uCAAY,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,KAAE,CAAC,qBAAU,CAAC,EAAE,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,MAAM,0CAAE,QAAQ,EAAE,IAAG;YACrE,CAAC;SAAA;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;~~AA5CW~~,QAAA,oBAAoB,~~wBA4C~~/B;AAEK,MAAM,sBAAsB,GAAG,CACpC,OAAgB,EAChB,OAIC,EACD,EAAE;;IACF,MAAM,oBAAoB,GAAG,IAAA,4BAAoB,EAAC;QAChD,IAAI,EAAE,OAAO,CAAC,YAAY;QAC1B,OAAO,EAAE,OAAO,CAAC,eAAe;QAChC,QAAQ,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,gBAAgB;KACvD,CAAC,CAAC;IACH,IAAA,+CAA8B,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;AAChE,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC"}
1	+ {"version":3,"file":"oauth2.strategy.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAuC;AACvC,+CAAwD;AACxD,2CAAuC;AACvC,6DAAkG;AAGlG,iDAAgD;AAChD,6DAAqC;AAE9B,MAAM,oBAAoB,GAAG,CAAC,IAIpC,EAAE,EAAE;IACH,MAAM,QAAQ;QAMZ;;YALA,SAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAMf,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAA,oBAAQ,EAAC;oBACb,OAAO,EAAE,sGAAsG;iBAChH,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,gBAAgB,CAAC;YAElD,IAAI,CAAC,YAAY,GAAG,IAAI,6BAAmB,CAAC;gBAC1C,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;gBACrC,cAAc,EAAE,EAAE,OAAO,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC;QAEK,YAAY,CAAC,OAAgB;;;gBACjC,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;gBAE7D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;oBACtC,MAAM,IAAA,oBAAQ,EAAC;wBACb,UAAU,EAAE,oBAAW,CAAC,IAAI,CAAC,YAAY;wBACzC,OAAO,EAAE,wBAAwB;qBAClC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC;oBACnC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAChE,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;iBAC7D,CAAC,CAAC;gBAEH,IAAI,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,KAAK,EAAE,CAAC;oBACpB,MAAM,IAAA,oBAAQ,EAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChC,CAAC;gBAED,uCAAY,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,KAAE,CAAC,qBAAU,CAAC,EAAE,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,0CAAE,MAAM,0CAAE,QAAQ,EAAE,IAAG;YACrE,CAAC;SAAA;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAnDW,QAAA,oBAAoB,wBAmD/B;AAEK,MAAM,sBAAsB,GAAG,CACpC,OAAgB,EAChB,OAIC,EACD,EAAE;;IACF,MAAM,oBAAoB,GAAG,IAAA,4BAAoB,EAAC;QAChD,IAAI,EAAE,OAAO,CAAC,YAAY;QAC1B,OAAO,EAAE,OAAO,CAAC,eAAe;QAChC,QAAQ,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,gBAAgB;KACvD,CAAC,CAAC;IACH,IAAA,+CAA8B,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;AAChE,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC"}

package/dist/components/authorize/models/defs.d.ts CHANGED Viewed

@@ -32,7 +32,7 @@ export declare const defineUser: () => {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare const defineRole: () => {
@@ -66,7 +66,7 @@ export declare const defineRole: () => {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare const definePermission: <T extends AnyObject = AnyObject>() => {
@@ -106,7 +106,7 @@ export declare const definePermission: <T extends AnyObject = AnyObject>() => {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare const definePermissionMapping: () => {
@@ -138,7 +138,7 @@ export declare const definePermissionMapping: () => {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare const defineUserRole: () => {
@@ -168,6 +168,6 @@ export declare const defineUserRole: () => {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };

package/dist/components/authorize/models/permission-mapping.model.d.ts CHANGED Viewed

@@ -27,7 +27,7 @@ declare const BasePermissionMapping: {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare class PermissionMapping extends BasePermissionMapping {

package/dist/components/authorize/models/permission.model.d.ts CHANGED Viewed

@@ -35,7 +35,7 @@ declare const BasePermission: {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare class Permission extends BasePermission {

package/dist/components/authorize/models/role.model.d.ts CHANGED Viewed

@@ -30,7 +30,7 @@ declare const BaseRole: {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare class Role extends BaseRole {

package/dist/components/authorize/models/user-role.model.d.ts CHANGED Viewed

@@ -25,7 +25,7 @@ declare const BaseUserRole: {
     getIdProperties(): string[];
     getIdOf(entityOrData: import("@loopback/repository").AnyObject): any;
     buildWhereForId(id: any): any;
-    get modelName(): string;
+    readonly modelName: string;
     definition: import("@loopback/repository").ModelDefinition;
 };
 export declare class UserRole extends BaseUserRole {

package/dist/components/crash-report/services/mt-crash-report.service.js CHANGED Viewed

@@ -10,7 +10,7 @@ const get_1 = __importDefault(require("lodash/get"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const common_1 = require("../common");
 const providers_1 = require("../providers");
-class CrashReportNetworkRequest extends network_1.BaseNetworkRequest {
+class CrashReportNetworkRequest extends network_1.AxiosNetworkRequest {
 }
 class MTCrashReportService extends providers_1.BaseCrashReportProvider {
     constructor() {
@@ -18,9 +18,8 @@ class MTCrashReportService extends providers_1.BaseCrashReportProvider {
         this.rsa = crypto_1.RSA.withAlgorithm();
         this.crashReportNetworkRequest = new CrashReportNetworkRequest({
             name: CrashReportNetworkRequest.name,
-            scope: MTCrashReportService.name,
             networkOptions: {
-                baseURL: common_1.MTEndpoints.BASE_URL,
+                baseUrl: common_1.MTEndpoints.BASE_URL,
             },
         });
     }

package/dist/components/crash-report/services/mt-crash-report.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mt-crash-report.service.js","sourceRoot":"","sources":["../../../../src/components/crash-report/services/mt-crash-report.service.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAuC;AACvC,+~~CAAuD~~;~~AACvD~~,qDAA6B;AAC7B,6DAAqC;AACrC,sCAAqD;AACrD,4CAAuD;AAEvD,MAAM,yBAA0B,SAAQ,~~4BAAkB~~;CAAG;~~AAE7D~~,MAAa,oBAAqB,SAAQ,mCAAuB;IAI/D;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;QAHtC,QAAG,GAAG,YAAG,CAAC,aAAa,EAAE,CAAC;QAIhC,IAAI,CAAC,yBAAyB,GAAG,IAAI,yBAAyB,CAAC;YAC7D,IAAI,EAAE,yBAAyB,CAAC,IAAI;YACpC,~~KAAK,EAAE,oBAAoB,CAAC,IAAI;YAChC,~~cAAc,EAAE;gBACd,OAAO,EAAE,oBAAW,CAAC,QAAQ;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,IAAiB;;QAC1B,MAAM,EACJ,OAAO,EAAE,EACP,SAAS,EACT,SAAS,EACT,SAAS,EACT,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAClC,cAAc,GACf,EACD,KAAK,GACN,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,SAAS,IAAI,IAAA,iBAAO,EAAC,SAAS,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC3E,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAClE,uCAAY,IAAI,KAAE,CAAC,EAAE,CAAC,EAAE,IAAA,aAAG,EAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,IAAG;QACjD,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,IAAI,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,EAAI,mCAAI;YACjC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC3C,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,KAAK;YACL,SAAS;YACT,WAAW;SACZ,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAE/D,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;aACtD,IAAI,CAAC,SAAS,CAAC,EAAE;YAChB,IAAI,CAAC,yBAAyB;iBAC3B,iBAAiB,EAAE;iBACnB,IAAI,CAAC;gBACJ,GAAG,EAAE,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC;oBAChD,KAAK,EAAE,CAAC,oBAAW,CAAC,MAAM,CAAC;iBAC5B,CAAC;gBACF,MAAM,EAAE,MAAM;gBACd,IAAI,kCAAO,IAAI,KAAE,SAAS,GAAE;aAC7B,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wEAAwE,EACxE,iBAAiB,CAClB,CAAC;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iFAAiF,EACjF,iBAAiB,EACjB,GAAG,CACJ,CAAC;YACJ,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wEAAwE,EACxE,iBAAiB,EACjB,GAAG,CACJ,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;CACF;~~AAhFD~~,~~oDAgFC~~"}
1	+ {"version":3,"file":"mt-crash-report.service.js","sourceRoot":"","sources":["../../../../src/components/crash-report/services/mt-crash-report.service.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAuC;AACvC,+CAAwD;AACxD,qDAA6B;AAC7B,6DAAqC;AACrC,sCAAqD;AACrD,4CAAuD;AAEvD,MAAM,yBAA0B,SAAQ,6BAAmB;CAAG;AAE9D,MAAa,oBAAqB,SAAQ,mCAAuB;IAI/D;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC;QAHtC,QAAG,GAAG,YAAG,CAAC,aAAa,EAAE,CAAC;QAIhC,IAAI,CAAC,yBAAyB,GAAG,IAAI,yBAAyB,CAAC;YAC7D,IAAI,EAAE,yBAAyB,CAAC,IAAI;YACpC,cAAc,EAAE;gBACd,OAAO,EAAE,oBAAW,CAAC,QAAQ;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,IAAiB;;QAC1B,MAAM,EACJ,OAAO,EAAE,EACP,SAAS,EACT,SAAS,EACT,SAAS,EACT,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAClC,cAAc,GACf,EACD,KAAK,GACN,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,SAAS,IAAI,IAAA,iBAAO,EAAC,SAAS,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC3E,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAClE,uCAAY,IAAI,KAAE,CAAC,EAAE,CAAC,EAAE,IAAA,aAAG,EAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,IAAG;QACjD,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,IAAI,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,EAAI,mCAAI;YACjC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC3C,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,KAAK;YACL,SAAS;YACT,WAAW;SACZ,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAE/D,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;aACtD,IAAI,CAAC,SAAS,CAAC,EAAE;YAChB,IAAI,CAAC,yBAAyB;iBAC3B,iBAAiB,EAAE;iBACnB,IAAI,CAAC;gBACJ,GAAG,EAAE,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC;oBAChD,KAAK,EAAE,CAAC,oBAAW,CAAC,MAAM,CAAC;iBAC5B,CAAC;gBACF,MAAM,EAAE,MAAM;gBACd,IAAI,kCAAO,IAAI,KAAE,SAAS,GAAE;aAC7B,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wEAAwE,EACxE,iBAAiB,CAClB,CAAC;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iFAAiF,EACjF,iBAAiB,EACjB,GAAG,CACJ,CAAC;YACJ,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wEAAwE,EACxE,iBAAiB,EACjB,GAAG,CACJ,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;CACF;AA/ED,oDA+EC"}

package/dist/helpers/logger/default-logger.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import 'winston-daily-rotate-file';
 import { IDgramTransportOptions } from './transports';
 export declare const defineCustomLoggerFormatter: (opts: {
     label: string;
-}) => ReturnType<typeof winston.format.combine>;
+}) => winston.Logform.Format;
 export declare const applicationLogFormatter: winston.Logform.Format;
 export declare const defineCustomLogger: (opts: {
     logLevels?: {

package/dist/helpers/logger/default-logger.js CHANGED Viewed

@@ -13,9 +13,12 @@ const transports_1 = require("./transports");
 const utilities_1 = require("../../utilities");
 const LOGGER_FOLDER_PATH = (_a = process.env.APP_ENV_LOGGER_FOLDER_PATH) !== null && _a !== void 0 ? _a : './';
 const LOGGER_PREFIX = common_1.App.APPLICATION_NAME;
+const f = winston_1.default.format;
 // -------------------------------------------------------------------------------------------
 const defineCustomLoggerFormatter = (opts) => {
-    return winston_1.default.format.combine(winston_1.default.format.label({ label: opts.label }), winston_1.default.format.splat(), winston_1.default.format.align(), winston_1.default.format.timestamp(), winston_1.default.format.simple(), winston_1.default.format.colorize(), winston_1.default.format.printf(({ level, message, label, timestamp }) => `${timestamp} [${label}] ${level}: ${message}`), winston_1.default.format.errors({ stack: true }));
+    return f.combine(f.simple(), f.label({ label: opts.label }), f.timestamp(), f.splat(), f.align(), f.colorize(), f.printf(({ level, message, label, timestamp }) => {
+        return `${timestamp} [${label}] ${level}: ${message}`;
+    }), f.errors({ stack: true }));
 };
 exports.defineCustomLoggerFormatter = defineCustomLoggerFormatter;
 // -------------------------------------------------------------------------------------------
@@ -23,15 +26,15 @@ exports.applicationLogFormatter = (0, exports.defineCustomLoggerFormatter)({ lab
 // -------------------------------------------------------------------------------------------
 const defineCustomLogger = (opts) => {
     const { logLevels = {
-        error: 1,
-        alert: 1,
-        emerg: 1,
-        warn: 2,
-        info: 3,
-        http: 4,
-        verbose: 5,
-        debug: 6,
-        silly: 7,
+        error: 0,
+        alert: 0,
+        emerg: 0,
+        warn: 1,
+        info: 2,
+        http: 3,
+        verbose: 4,
+        debug: 5,
+        silly: 6,
     }, logColors = {
         error: 'red',
         alert: 'red',

package/dist/helpers/logger/default-logger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"default-logger.js","sourceRoot":"","sources":["../../../src/helpers/logger/default-logger.ts"],"names":[],"mappings":";;;;;;;AAAA,qCAA+B;AAC/B,0DAA6B;AAE7B,sDAA8B;AAC9B,qCAAmC;AACnC,6CAAsE;AACtE,2CAAkC;AAElC,MAAM,kBAAkB,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,mCAAI,IAAI,CAAC;AAC1E,MAAM,aAAa,GAAG,YAAG,CAAC,gBAAgB,CAAC;~~AAE3C~~,8FAA8F;AACvF,MAAM,2BAA2B,GAAG,CAAC,~~IAE3C~~,~~EAA6C~~,EAAE;~~IAC9C~~,OAAO,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,OAAO,~~CAC3B~~,~~iBAAO~~,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,~~EAC3C~~,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,~~KAAK~~,EAAE,~~EACtB~~,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,KAAK,EAAE,~~EACtB~~,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,~~SAAS~~,EAAE,~~EAC1B~~,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,~~MAAM~~,EAAE,~~EACvB~~,~~iBAAO,~~CAAC,~~MAAM,~~CAAC,~~QAAQ,EAAE,EACzB,iBAAO,CAAC,~~MAAM,CAAC,~~MAAM,CACnB,~~CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,~~CAAC~~,GAAG,SAAS,KAAK,KAAK,KAAK,KAAK,KAAK,OAAO,EAAE,~~CACzF~~,~~EACD~~,~~iBAAO,~~CAAC,~~MAAM~~,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,~~CACvC~~,CAAC;AACJ,CAAC,CAAC;~~AAfW~~,QAAA,2BAA2B,+~~BAetC~~;AAEF,8FAA8F;AACjF,QAAA,uBAAuB,GAAG,IAAA,mCAA2B,EAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;AAE7F,8FAA8F;AACvF,MAAM,kBAAkB,GAAG,CAAC,IAclC,EAAE,EAAE;IACH,MAAM,EACJ,SAAS,GAAG;QACV,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;KACT,EACD,SAAS,GAAG;QACV,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;KACd,EACD,eAAe,GAAG,+BAAuB,EACzC,UAAU,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,qBAAqB,EAAE,GACzE,GAAG,IAAI,CAAC;IAET,MAAM,mBAAmB,GAAG,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/E,MAAM,UAAU,~~GAA+E~~;~~QAC7F~~,OAAO,EAAE,CAAC,mBAAmB,CAAC;QAC9B,SAAS,EAAE,CAAC,mBAAmB,CAAC;KACjC,CAAC;IAEF,iBAAiB;IACjB,IAAI,oBAAoB,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,iBAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YACvD,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,aAAa;YAC1B,QAAQ,EAAE,mBAAI,CAAC,IAAI,CACjB,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAChC,IAAI,oBAAoB,CAAC,IAAI,CAAC,MAAM,kBAAkB,CACvD;YACD,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,IAAI,iBAAO,CAAC,UAAU,CAAC,eAAe,CAAC;YACvD,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,aAAa;YAC1B,QAAQ,EAAE,mBAAI,CAAC,IAAI,CACjB,qBAAqB,CAAC,IAAI,CAAC,MAAM,EACjC,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,mBAAmB,CACzD;YACD,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;QAEH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,mBAAmB;IACnB,IAAI,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,2BAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACzE,IAAI,SAAS,EAAE,CAAC;YACd,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,IAAI,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,2BAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,SAAS,EAAE,CAAC;YACd,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,iBAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7B,SAAS;IACT,OAAO,iBAAO,CAAC,YAAY,CAAC;QAC1B,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,eAAe;QACvB,WAAW,EAAE,KAAK;QAClB,UAAU,EAAE,UAAU,CAAC,OAAO;QAC9B,iBAAiB,EAAE,UAAU,CAAC,SAAS;KACxC,CAAC,CAAC;AACL,CAAC,CAAC;~~AA5GW~~,QAAA,kBAAkB,~~sBA4G7B~~;AAEF,8FAA8F;AAC9F,MAAM,WAAW,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AAC1E,MAAM,YAAY,GAAoC;IACpD,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC/B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAC3C,IAAI,EAAE,IAAA,eAAG,EAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAChD,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAC7C,MAAM,EAAE,MAAA,MAAA,OAAO,CAAC,GAAG,CAAC,2BAA2B,0CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,mCAAI,EAAE;CACvF,CAAC;AAEF,8FAA8F;AACjF,QAAA,iBAAiB,GAAG,IAAA,0BAAkB,EAAC;IAClD,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE;QAChD,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE;KAClD;CACF,CAAC,CAAC"}
1	+ {"version":3,"file":"default-logger.js","sourceRoot":"","sources":["../../../src/helpers/logger/default-logger.ts"],"names":[],"mappings":"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"}

package/dist/helpers/network/http-request/base-network-request.helper.d.ts ADDED Viewed

@@ -0,0 +1,38 @@
+import { BaseHelper } from '../../../base/base.helper';
+import { AnyObject } from '../../../common/types';
+import { IFetchable, IRequestOptions } from './fetcher';
+import { TFetcherResponse, TFetcherVariant } from './types';
+export interface IFetcherRequestOptions<T extends TFetcherVariant> {
+    name: string;
+    variant: TFetcherVariant;
+    networkOptions: {
+        baseUrl?: string;
+        headers?: AnyObject;
+    };
+    fetcher: IFetchable<T, IRequestOptions, TFetcherResponse<T>>;
+}
+export interface IAxiosNetworkOptions extends IFetcherRequestOptions<'axios'> {
+    variant: 'axios';
+}
+export interface INodeFetchNetworkOptions extends IFetcherRequestOptions<'node-fetch'> {
+    variant: 'node-fetch';
+}
+export declare class BaseNetworkRequest<T extends TFetcherVariant> extends BaseHelper {
+    protected baseUrl: string;
+    protected fetcher: IFetchable<T, IRequestOptions, TFetcherResponse<T>>;
+    constructor(opts: IFetcherRequestOptions<T>);
+    getRequestPath(opts: {
+        paths: Array<string>;
+    }): string;
+    getRequestUrl(opts: {
+        baseUrl?: string;
+        paths: Array<string>;
+    }): string;
+    getNetworkService(): IFetchable<T, IRequestOptions, TFetcherResponse<T>>;
+}
+export declare class AxiosNetworkRequest extends BaseNetworkRequest<'axios'> {
+    constructor(opts: Omit<IAxiosNetworkOptions, 'fetcher' | 'variant'>);
+}
+export declare class NodeFetchNetworkRequest extends BaseNetworkRequest<'node-fetch'> {
+    constructor(opts: Omit<INodeFetchNetworkOptions, 'fetcher' | 'variant'>);
+}

package/dist/helpers/network/{base-network-request.js → http-request/base-network-request.helper.js} RENAMED Viewed

@@ -14,27 +14,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseNetworkRequest = void 0;
-const utilities_1 = require("../../utilities");
-const get_1 = __importDefault(require("lodash/get"));
+exports.NodeFetchNetworkRequest = exports.AxiosNetworkRequest = exports.BaseNetworkRequest = void 0;
+const base_helper_1 = require("../../../base/base.helper");
+const utilities_1 = require("../../../utilities");
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-const network_helper_1 = require("./network.helper");
-const base_helper_1 = require("../../base/base.helper");
+const axios_fetcher_1 = require("./fetcher/axios-fetcher");
+const node_fetcher_1 = require("./fetcher/node-fetcher");
+// -----------------------------------------------------------------------------
 class BaseNetworkRequest extends base_helper_1.BaseHelper {
     constructor(opts) {
-        var _a;
         super({ scope: opts.name, identifier: opts.name });
-        const { name, networkOptions } = opts;
-        const { headers = {} } = networkOptions, rest = __rest(networkOptions, ["headers"]);
-        const requestConfigs = Object.assign(Object.assign({}, rest), { withCredentials: true, timeout: 60 * 1000, validateStatus: (status) => {
-                return status < 500;
-            }, headers });
-        const defaultHeader = (0, get_1.default)(requestConfigs, "headers['Content-Type']");
-        if (!defaultHeader) {
-            requestConfigs.headers['Content-Type'] = 'application/json; charset=utf-8';
-        }
-        this.baseUrl = (_a = networkOptions === null || networkOptions === void 0 ? void 0 : networkOptions.baseURL) !== null && _a !== void 0 ? _a : '';
-        this.networkService = new network_helper_1.NetworkHelper({ name, requestConfigs });
+        const { networkOptions } = opts;
+        const { baseUrl = '' } = networkOptions;
+        this.baseUrl = baseUrl;
+        this.fetcher = opts.fetcher;
     }
     getRequestPath(opts) {
         var _a;
@@ -66,8 +59,34 @@ class BaseNetworkRequest extends base_helper_1.BaseHelper {
         return `${baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.baseUrl}${joined}`;
     }
     getNetworkService() {
-        return this.networkService;
+        return this.fetcher;
     }
 }
 exports.BaseNetworkRequest = BaseNetworkRequest;
-//# sourceMappingURL=base-network-request.js.map
+// -----------------------------------------------------------------------------
+class AxiosNetworkRequest extends BaseNetworkRequest {
+    constructor(opts) {
+        var _a;
+        const { name, networkOptions } = opts;
+        const { headers = {} } = networkOptions, rest = __rest(networkOptions, ["headers"]);
+        const defaultConfigs = Object.assign(Object.assign({}, rest), { withCredentials: true, timeout: 60 * 1000, validateStatus: (status) => status < 500, headers: Object.assign({}, headers, {
+                ['content-type']: (_a = headers['content-type']) !== null && _a !== void 0 ? _a : 'application/json; charset=utf-8',
+            }) });
+        super(Object.assign(Object.assign({}, opts), { variant: 'axios', fetcher: new axios_fetcher_1.AxiosFetcher({ name, defaultConfigs }) }));
+    }
+}
+exports.AxiosNetworkRequest = AxiosNetworkRequest;
+// -----------------------------------------------------------------------------
+class NodeFetchNetworkRequest extends BaseNetworkRequest {
+    constructor(opts) {
+        var _a;
+        const { name, networkOptions } = opts;
+        const { headers = {} } = networkOptions, rest = __rest(networkOptions, ["headers"]);
+        const defaultConfigs = Object.assign(Object.assign({}, rest), { headers: Object.assign({}, headers, {
+                ['content-type']: (_a = headers['content-type']) !== null && _a !== void 0 ? _a : 'application/json; charset=utf-8',
+            }) });
+        super(Object.assign(Object.assign({}, opts), { variant: 'node-fetch', fetcher: new node_fetcher_1.NodeFetcher({ name, defaultConfigs }) }));
+    }
+}
+exports.NodeFetchNetworkRequest = NodeFetchNetworkRequest;
+//# sourceMappingURL=base-network-request.helper.js.map

package/dist/helpers/network/http-request/base-network-request.helper.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"base-network-request.helper.js","sourceRoot":"","sources":["../../../../src/helpers/network/http-request/base-network-request.helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAgD;AAEhD,2CAAuC;AACvC,6DAAqC;AAErC,2DAA6E;AAC7E,yDAAqD;AAmBrD,gFAAgF;AAChF,MAAa,kBAA8C,SAAQ,wBAAU;IAI3E,YAAY,IAA+B;QACzC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEnD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,cAAc,CAAC;QAExC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,cAAc,CAAC,IAA8B;;QAC3C,MAAM,KAAK,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE,CAAC;QAEhC,MAAM,EAAE,GAAG,KAAK;aACb,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;YACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,iCAAiC;YACtD,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC,CAAC;QAEZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,aAAa,CAAC,IAAgD;;QAC5D,IAAI,OAAO,GAAG,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,mCAAI,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE,CAAC;QAEhC,IAAI,CAAC,OAAO,IAAI,IAAA,iBAAO,EAAC,OAAO,CAAC,EAAE,CAAC;YACjC,MAAM,IAAA,oBAAQ,EAAC;gBACb,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,yEAAyE;aACnF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9C,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC;IAC/C,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AApDD,gDAoDC;AAED,gFAAgF;AAChF,MAAa,mBAAoB,SAAQ,kBAA2B;IAClE,YAAY,IAAuD;;QACjE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QACtC,MAAM,EAAE,OAAO,GAAG,EAAE,KAAc,cAAc,EAAvB,IAAI,UAAK,cAAc,EAA1C,WAAyB,CAAiB,CAAC;QAEjD,MAAM,cAAc,mCACf,IAAI,KACP,eAAe,EAAE,IAAI,EACrB,OAAO,EAAE,EAAE,GAAG,IAAI,EAClB,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,GAAG,GAAG,EAChD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;gBAClC,CAAC,cAAc,CAAC,EAAE,MAAA,OAAO,CAAC,cAAc,CAAC,mCAAI,iCAAiC;aAC/E,CAAC,GACH,CAAC;QAEF,KAAK,iCACA,IAAI,KACP,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,IAAI,4BAAY,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,IACnD,CAAC;IACL,CAAC;CACF;AArBD,kDAqBC;AAED,gFAAgF;AAChF,MAAa,uBAAwB,SAAQ,kBAAgC;IAC3E,YAAY,IAA2D;;QACrE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QACtC,MAAM,EAAE,OAAO,GAAG,EAAE,KAAc,cAAc,EAAvB,IAAI,UAAK,cAAc,EAA1C,WAAyB,CAAiB,CAAC;QAEjD,MAAM,cAAc,mCACf,IAAI,KACP,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;gBAClC,CAAC,cAAc,CAAC,EAAE,MAAA,OAAO,CAAC,cAAc,CAAC,mCAAI,iCAAiC;aAC/E,CAAC,GACH,CAAC;QAEF,KAAK,iCACA,IAAI,KACP,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,IAAI,0BAAW,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,IAClD,CAAC;IACL,CAAC;CACF;AAlBD,0DAkBC"}