npm - @lenne.tech/nest-server - Versions diffs - 9.2.1 → 9.2.2 - Mend

@lenne.tech/nest-server 9.2.1 → 9.2.2

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 (66) hide show

package/README.md CHANGED Viewed

@@ -10,8 +10,7 @@ In combination with Angular (see [lenne.Tech Angular example](https://github.com
 incl. [ng-base](https://github.com/lenneTech/ng-base/tree/main/projects/ng-base/README.md)) the Nest Server is an ideal
 basis for your next project.
-[![License](https://img.shields.io/github/license/lenneTech/nest-server)](/LICENSE) [![CircleCI](https://circleci.com/gh/lenneTech/nest-server/tree/master.svg?style=shield)](https://circleci.com/gh/lenneTech/nest-server/tree/master)
-[![Dependency Status](https://david-dm.org/lenneTech/nest-server.svg)](https://david-dm.org/lenneTech/nest-server) [![devDependency Status](https://david-dm.org/lenneTech/nest-server/dev-status.svg)](https://david-dm.org/lenneTech/nest-server?type=dev)
+[![License](https://img.shields.io/github/license/lenneTech/nest-server)](/LICENSE)
 ## Set up your server

package/dist/config.env.js CHANGED Viewed

@@ -56,6 +56,7 @@ const config = {
                 expiresIn: '15m',
             },
             refresh: {
+                renewal: true,
                 secret: 'SECRET_OR_PRIVATE_KEY_LOCAL_REFRESH',
                 signInOptions: {
                     expiresIn: '7d',
@@ -124,6 +125,7 @@ const config = {
                 expiresIn: '15m',
             },
             refresh: {
+                renewal: true,
                 secret: 'SECRET_OR_PRIVATE_KEY_DEV_REFRESH',
                 signInOptions: {
                     expiresIn: '7d',
@@ -192,6 +194,7 @@ const config = {
                 expiresIn: '15m',
             },
             refresh: {
+                renewal: true,
                 secret: 'SECRET_OR_PRIVATE_KEY_PROD_REFRESH',
                 signInOptions: {
                     expiresIn: '7d',

package/dist/config.env.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,+BAA4B;AAC5B,uEAA4D;AAM5D,MAAM,MAAM,GAAsC;IAIhD,KAAK,EAAE;QACL,0BAA0B,EAAE,IAAI;QAChC,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE;YACR,QAAQ,EAAE;gBACR,QAAQ,EAAE,yBAAc,CAAC,gBAAgB;gBACzC,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,CAAC;gBACd,QAAQ,EAAE,eAAe;gBACzB,cAAc,EAAE,KAAK;aACtB;SACF;QACD,KAAK,EAAE;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,IAAI,EAAE,iCAAiC;oBACvC,IAAI,EAAE,oBAAoB;iBAC3B;gBACD,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;aACd;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,wBAAwB;gBACxC,eAAe,EAAE,yBAAyB;aAC3C;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,iCAAiC;gBACxC,IAAI,EAAE,mBAAmB;aAC1B;YACD,gBAAgB,EAAE,yCAAyC;YAC3D,iBAAiB,EAAE,2CAA2C;SAC/D;QACD,GAAG,EAAE,OAAO;QACZ,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;SACf;QACD,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI;gBACX,aAAa,EAAE,IAAI;aACpB;YACD,aAAa,EAAE,EAAE;SAClB;QACD,GAAG,EAAE;YACH,MAAM,EAAE,6BAA6B;YACrC,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK;aACjB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,qCAAqC;gBAC7C,aAAa,EAAE;oBACb,SAAS,EAAE,IAAI;iBAChB;aACF;SACF;QACD,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,MAAM,EAAE,IAAI;aACb;YACD,GAAG,EAAE,uCAAuC;SAC7C;QACD,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE;YACZ,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC;YACrC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACxB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,CAAC;YAClC,MAAM,EAAE,KAAK;SACd;KACF;IAKD,WAAW,EAAE;QACX,0BAA0B,EAAE,IAAI;QAChC,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,IAAI,EAAE,iCAAiC;oBACvC,IAAI,EAAE,oBAAoB;iBAC3B;gBACD,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;aACd;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,wBAAwB;gBACxC,eAAe,EAAE,yBAAyB;aAC3C;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,iCAAiC;gBACxC,IAAI,EAAE,yBAAyB;aAChC;YACD,gBAAgB,EAAE,yCAAyC;YAC3D,iBAAiB,EAAE,2CAA2C;SAC/D;QACD,GAAG,EAAE,aAAa;QAClB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;SACf;QACD,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI;gBACX,aAAa,EAAE,IAAI;aACpB;YACD,aAAa,EAAE,EAAE;SAClB;QACD,GAAG,EAAE;YACH,MAAM,EAAE,2BAA2B;YACnC,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK;aACjB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,mCAAmC;gBAC3C,aAAa,EAAE;oBACb,SAAS,EAAE,IAAI;iBAChB;aACF;SACF;QACD,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,MAAM,EAAE,IAAI;aACb;YACD,GAAG,EAAE,qCAAqC;SAC3C;QACD,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE;YACZ,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC;YACrC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACxB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,CAAC;YAClC,MAAM,EAAE,KAAK;SACd;KACF;IAKD,UAAU,EAAE;QACV,0BAA0B,EAAE,IAAI;QAChC,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,IAAI,EAAE,iCAAiC;oBACvC,IAAI,EAAE,oBAAoB;iBAC3B;gBACD,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;aACd;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,wBAAwB;gBACxC,eAAe,EAAE,yBAAyB;aAC3C;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,iCAAiC;gBACxC,IAAI,EAAE,wBAAwB;aAC/B;YACD,gBAAgB,EAAE,yCAAyC;YAC3D,iBAAiB,EAAE,2CAA2C;SAC/D;QACD,GAAG,EAAE,YAAY;QACjB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;SACf;QACD,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,IAAI;aACpB;YACD,aAAa,EAAE,EAAE;SAClB;QACD,GAAG,EAAE;YACH,MAAM,EAAE,4BAA4B;YACpC,aAAa,EAAE;gBACb,SAAS,EAAE,KAAK;aACjB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,oCAAoC;gBAC5C,aAAa,EAAE;oBACb,SAAS,EAAE,IAAI;iBAChB;aACF;SACF;QACD,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,MAAM,EAAE,IAAI;aACb;YACD,GAAG,EAAE,sCAAsC;SAC5C;QACD,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE;YACZ,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC;YACrC,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;SACxB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,CAAC;YAClC,MAAM,EAAE,KAAK;SACd;KACF;CACF,CAAC;AAOF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,aAAa,CAAC;AAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC;AACpD,OAAO,CAAC,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAG9G,IAAI,SAAS,CAAC,eAAe,EAAE;IAC7B,IAAI,WAAW,CAAC;IAChB,IAAI,OAAO,SAAS,CAAC,eAAe,KAAK,QAAQ,EAAE;QACjD,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACjD,IAAA,qBAAK,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;KAC/B;SAAM;QACL,IAAI;YAEF,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,CAAC;YAClD,IAAA,qBAAK,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;SAC/B;QAAC,MAAM;YACN,IAAI;gBAEF,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC;gBACrD,IAAA,qBAAK,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aAC/B;YAAC,OAAO,CAAC,EAAE;aAEX;SACF;KACF;CACF;AAKD,kBAAe,SAAS,CAAC"}

package/dist/core/common/helpers/context.helper.d.ts CHANGED Viewed

@@ -1,15 +1,18 @@
 import { ExecutionContext } from '@nestjs/common';
+import { Request as RequestType } from 'express';
 export default class Context {
     static getData(context: ExecutionContext): {
+        args: any;
         currentUser: {
             [key: string]: any;
         };
-        args: any;
+        request: RequestType;
     };
 }
 export declare function getContextData(context: ExecutionContext): {
+    args: any;
     currentUser: {
         [key: string]: any;
     };
-    args: any;
+    request: RequestType;
 };

package/dist/core/common/helpers/context.helper.js CHANGED Viewed

@@ -10,32 +10,38 @@ class Context {
 exports.default = Context;
 function getContextData(context) {
     if (!context) {
-        return { currentUser: null, args: null };
+        return { currentUser: null, args: null, request: null };
     }
     let user;
+    let rawContext = null;
     let ctx = null;
+    let request;
     try {
-        ctx = graphql_1.GqlExecutionContext.create(context)?.getContext();
+        rawContext = graphql_1.GqlExecutionContext.create(context);
+        ctx = rawContext?.getContext();
+        request = ctx.req;
     }
     catch (e) {
     }
     let args;
-    try {
-        args = graphql_1.GqlExecutionContext.create(context)?.getArgs();
-    }
-    catch (e) {
+    if (rawContext) {
+        try {
+            args = rawContext.getArgs();
+        }
+        catch (e) {
+        }
     }
     if (ctx) {
         user = ctx?.user || ctx?.req?.user;
     }
     else {
-        const request = context?.switchToHttp ? context.switchToHttp()?.getRequest() : null;
+        request = context?.switchToHttp ? context.switchToHttp()?.getRequest() : null;
         if (request) {
             args = request.body;
             user = request.user;
         }
     }
-    return { currentUser: user, args };
+    return { args, currentUser: user, request };
 }
 exports.getContextData = getContextData;
 //# sourceMappingURL=context.helper.js.map

package/dist/core/common/helpers/context.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/context.helper.ts"],"names":[],"mappings":";;;AACA,6CAAsD;~~AAMtD~~,MAAqB,OAAO;IAKnB,MAAM,CAAC,OAAO,CAAC,OAAyB;~~QAC7C~~,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACF;~~AARD~~,~~0BAQC~~;AAKD,SAAgB,cAAc,CAAC,OAAyB;~~IAEtD~~,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;~~KAC1C~~;IAGD,IAAI,IAA4B,CAAC;IACjC,IAAI,GAAG,GAAQ,IAAI,CAAC;IACpB,IAAI;QACF,~~GAAG~~,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;~~KACzD~~;IAAC,OAAO,CAAC,EAAE;KAEX;IAED,IAAI,IAAS,CAAC;IACd,IAAI;~~QACF~~,IAAI,GAAG,~~6BAAmB~~,CAAC,~~MAAM,CAAC,~~OAAO,~~CAAC,~~EAAE,~~OAAO,EAAE,~~CAAC;~~KACvD~~;~~IAAC~~,OAAO,CAAC,EAAE;~~KAEX~~;IAGD,IAAI,GAAG,EAAE;QAEP,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;KACpC;SAAM;QACL,~~MAAM,~~OAAO,GAAG,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;~~QACpF~~,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAGpB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SACrB;KACF;IAGD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,~~IAAI~~,EAAE,CAAC;~~AACrC~~,CAAC;~~AAtCD~~,~~wCAsCC~~"}
1	+ {"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/context.helper.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAOtD,MAAqB,OAAO;IAKnB,MAAM,CAAC,OAAO,CAAC,OAAyB;QAK7C,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;CACF;AAZD,0BAYC;AAKD,SAAgB,cAAc,CAAC,OAAyB;IAMtD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KACzD;IAGD,IAAI,IAA4B,CAAC;IACjC,IAAI,UAAU,GAAQ,IAAI,CAAC;IAC3B,IAAI,GAAG,GAAQ,IAAI,CAAC;IACpB,IAAI,OAAY,CAAC;IACjB,IAAI;QACF,UAAU,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,GAAG,GAAG,UAAU,EAAE,UAAU,EAAE,CAAC;QAC/B,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC;KACnB;IAAC,OAAO,CAAC,EAAE;KAEX;IAED,IAAI,IAAS,CAAC;IACd,IAAI,UAAU,EAAE;QACd,IAAI;YACF,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;SAEX;KACF;IAGD,IAAI,GAAG,EAAE;QAEP,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;KACpC;SAAM;QACL,OAAO,GAAG,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAGpB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SACrB;KACF;IAGD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC9C,CAAC;AAhDD,wCAgDC"}

package/dist/core/common/interfaces/server-options.interface.d.ts CHANGED Viewed

@@ -47,7 +47,9 @@ export interface IServerOptions {
     };
     ignoreSelectionsForPopulate?: boolean;
     jwt?: {
-        refresh?: IJwt;
+        refresh?: {
+            renewal?: boolean;
+        } & IJwt;
     } & IJwt & JwtModuleOptions;
     loadLocalConfig?: boolean | string;
     logExceptions?: boolean;

package/dist/core/common/pipes/check-input.pipe.js CHANGED Viewed

@@ -23,8 +23,8 @@ let CheckInputPipe = class CheckInputPipe {
     }
     async transform(value, metadata) {
         const metatype = metadata?.metatype;
-        const { user } = (0, context_helper_1.getContextData)(this.context);
-        return (0, input_helper_1.check)(value, user, { metatype });
+        const { currentUser } = (0, context_helper_1.getContextData)(this.context);
+        return (0, input_helper_1.check)(value, currentUser, { metatype });
     }
 };
 CheckInputPipe = __decorate([

package/dist/core/common/pipes/check-input.pipe.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"check-input.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/check-input.pipe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqF;AACrF,6CAA0C;AAC1C,8DAA2D;AAC3D,0DAAgD;AAUzC,IAAM,cAAc,GAApB,MAAM,cAAc;IAIzB,YAAgD,OAAO;QAAP,YAAO,GAAP,OAAO,CAAA;IAAG,CAAC;IAK3D,KAAK,CAAC,SAAS,CAAC,KAAU,EAAE,QAA0B;QAEpD,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;QAGpC,MAAM,EAAE,~~IAAI~~,EAAE,GAAQ,IAAA,+BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;~~QAGnD~~,OAAO,IAAA,oBAAK,EAAC,KAAK,EAAE,~~IAAI~~,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;~~IAC1C~~,CAAC;CACF,CAAA;AAnBY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAKE,WAAA,IAAA,eAAM,EAAC,iBAAO,CAAC,CAAA;;GAJjB,cAAc,CAmB1B;AAnBY,wCAAc"}
1	+ {"version":3,"file":"check-input.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/check-input.pipe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqF;AACrF,6CAA0C;AAC1C,8DAA2D;AAC3D,0DAAgD;AAUzC,IAAM,cAAc,GAApB,MAAM,cAAc;IAIzB,YAAgD,OAAO;QAAP,YAAO,GAAP,OAAO,CAAA;IAAG,CAAC;IAK3D,KAAK,CAAC,SAAS,CAAC,KAAU,EAAE,QAA0B;QAEpD,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;QAGpC,MAAM,EAAE,WAAW,EAAE,GAAQ,IAAA,+BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAG1D,OAAO,IAAA,oBAAK,EAAC,KAAK,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAnBY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAKE,WAAA,IAAA,eAAM,EAAC,iBAAO,CAAC,CAAA;;GAJjB,cAAc,CAmB1B;AAnBY,wCAAc"}

package/dist/core/modules/auth/core-auth.module.js CHANGED Viewed

@@ -20,7 +20,11 @@ const core_auth_service_1 = require("./services/core-auth.service");
 const graphql_subscriptions_1 = require("graphql-subscriptions");
 let CoreAuthModule = CoreAuthModule_1 = class CoreAuthModule {
     static forRoot(UserModule, UserService, options) {
-        let imports = [UserModule, passport_1.PassportModule.register({ defaultStrategy: 'jwt' }), jwt_1.JwtModule.register(options)];
+        let imports = [
+            UserModule,
+            passport_1.PassportModule.register({ defaultStrategy: ['jwt', 'jwt-refresh'] }),
+            jwt_1.JwtModule.register(options),
+        ];
         if (Array.isArray(options?.imports)) {
             imports = imports.concat(options.imports);
         }

package/dist/core/modules/auth/core-auth.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-auth.module.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAyF;AACzF,uCAAyC;AACzC,qCAA0D;AAC1D,+CAAkD;AAClD,sDAAkD;AAClD,4EAAuE;AACvE,4DAAwD;AACxD,8EAAwE;AACxE,oEAA+D;AAC/D,iEAA+C;AAMxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,MAAM,CAAC,OAAO,CACZ,UAAqB,EACrB,WAAsC,EACtC,OAMC;QAGD,IAAI,OAAO,GAAU,~~CAAC,~~UAAU,~~EAAE,~~yBAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,eAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC~~,CAAC~~;~~QACpH~~,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YACnC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3C;QAGD,IAAI,SAAS,GAAG;YAEd;gBACE,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,wBAAU;aACrB;YACD;gBACE,OAAO,EAAE,4CAAmB;gBAC5B,QAAQ,EAAE,WAAW;aACtB;YACD;gBACE,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,IAAI,8BAAM,EAAE;aACvB;YACD;gBACE,OAAO,EAAE,mCAAe;gBACxB,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,mCAAe;aACjD;YACD;gBACE,OAAO,EAAE,0BAAW;gBACpB,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,0BAAW;aAC7C;YACD;gBACE,OAAO,EAAE,yCAAkB;gBAC3B,QAAQ,EAAE,OAAO,CAAC,kBAAkB,IAAI,yCAAkB;aAC3D;SACF,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;YACrC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAC/C;QAGD,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,CAAC,mCAAe,EAAE,eAAS,EAAE,0BAAW,EAAE,yCAAkB,EAAE,yBAAc,EAAE,UAAU,CAAC;SACnG,CAAC;IACJ,CAAC;CACF,CAAA;~~AA9DY~~,cAAc;IAD1B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,cAAc,~~CA8D1B~~;~~AA9DY~~,wCAAc"}
1	+ {"version":3,"file":"core-auth.module.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAyF;AACzF,uCAAyC;AACzC,qCAA0D;AAC1D,+CAAkD;AAClD,sDAAkD;AAClD,4EAAuE;AACvE,4DAAwD;AACxD,8EAAwE;AACxE,oEAA+D;AAC/D,iEAA+C;AAMxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,MAAM,CAAC,OAAO,CACZ,UAAqB,EACrB,WAAsC,EACtC,OAMC;QAGD,IAAI,OAAO,GAAU;YACnB,UAAU;YACV,yBAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC;YACpE,eAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;SAC5B,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YACnC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3C;QAGD,IAAI,SAAS,GAAG;YAEd;gBACE,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,wBAAU;aACrB;YACD;gBACE,OAAO,EAAE,4CAAmB;gBAC5B,QAAQ,EAAE,WAAW;aACtB;YACD;gBACE,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,IAAI,8BAAM,EAAE;aACvB;YACD;gBACE,OAAO,EAAE,mCAAe;gBACxB,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,mCAAe;aACjD;YACD;gBACE,OAAO,EAAE,0BAAW;gBACpB,QAAQ,EAAE,OAAO,CAAC,WAAW,IAAI,0BAAW;aAC7C;YACD;gBACE,OAAO,EAAE,yCAAkB;gBAC3B,QAAQ,EAAE,OAAO,CAAC,kBAAkB,IAAI,yCAAkB;aAC3D;SACF,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;YACrC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAC/C;QAGD,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,CAAC,mCAAe,EAAE,eAAS,EAAE,0BAAW,EAAE,yCAAkB,EAAE,yBAAc,EAAE,UAAU,CAAC;SACnG,CAAC;IACJ,CAAC;CACF,CAAA;AAlEY,cAAc;IAD1B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,cAAc,CAkE1B;AAlEY,wCAAc"}

package/dist/core/modules/auth/core-auth.resolver.d.ts CHANGED Viewed

@@ -10,15 +10,15 @@ export declare class CoreAuthResolver {
     protected readonly authService: CoreAuthService;
     protected readonly configService: ConfigService;
     constructor(authService: CoreAuthService, configService: ConfigService);
-    signIn(info: GraphQLResolveInfo, ctx: {
-        res: ResponseType;
-    }, input: CoreAuthSignInInput): Promise<CoreAuthModel>;
     logout(currentUser: ICoreAuthUser, ctx: {
         res: ResponseType;
-    }, deviceId?: string): Promise<boolean>;
-    refreshToken(user: ICoreAuthUser, ctx: {
+    }, token: string, allDevices?: boolean): Promise<boolean>;
+    refreshToken(user: ICoreAuthUser, refreshToken: string, ctx: {
         res: ResponseType;
-    }, deviceId?: string): Promise<CoreAuthModel>;
+    }): Promise<CoreAuthModel>;
+    signIn(info: GraphQLResolveInfo, ctx: {
+        res: ResponseType;
+    }, input: CoreAuthSignInInput): Promise<CoreAuthModel>;
     signUp(info: GraphQLResolveInfo, ctx: {
         res: ResponseType;
     }, input: CoreAuthSignUpInput): Promise<CoreAuthModel>;

package/dist/core/modules/auth/core-auth.resolver.js CHANGED Viewed

@@ -22,21 +22,22 @@ const auth_guard_1 = require("./guards/auth.guard");
 const core_auth_sign_in_input_1 = require("./inputs/core-auth-sign-in.input");
 const core_auth_sign_up_input_1 = require("./inputs/core-auth-sign-up.input");
 const core_auth_service_1 = require("./services/core-auth.service");
+const tokens_decorator_1 = require("./tokens.decorator");
 let CoreAuthResolver = class CoreAuthResolver {
     constructor(authService, configService) {
         this.authService = authService;
         this.configService = configService;
     }
-    async signIn(info, ctx, input) {
-        const result = await this.authService.signIn(input, { fieldSelection: { info, select: 'signIn' } });
+    async logout(currentUser, ctx, token, allDevices) {
+        const result = await this.authService.logout(token, { currentUser, allDevices });
         return this.processCookies(ctx, result);
     }
-    async logout(currentUser, ctx, deviceId) {
-        const result = await this.authService.logout({ currentUser, deviceId });
+    async refreshToken(user, refreshToken, ctx) {
+        const result = await this.authService.refreshTokens(user, refreshToken);
         return this.processCookies(ctx, result);
     }
-    async refreshToken(user, ctx, deviceId) {
-        const result = await this.authService.refreshTokens(user, deviceId);
+    async signIn(info, ctx, input) {
+        const result = await this.authService.signIn(input, { fieldSelection: { info, select: 'signIn' } });
         return this.processCookies(ctx, result);
     }
     async signUp(info, ctx, input) {
@@ -63,35 +64,37 @@ let CoreAuthResolver = class CoreAuthResolver {
     }
 };
 __decorate([
-    (0, graphql_1.Mutation)((returns) => core_auth_model_1.CoreAuthModel, {
-        description: 'Sign in user via email and password and get JWT tokens (for specific device)',
-    }),
-    __param(0, (0, graphql_1.Info)()),
-    __param(1, (0, graphql_1.Context)()),
-    __param(2, (0, graphql_1.Args)('input')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, core_auth_sign_in_input_1.CoreAuthSignInInput]),
-    __metadata("design:returntype", Promise)
-], CoreAuthResolver.prototype, "signIn", null);
-__decorate([
+    (0, common_1.UseGuards)((0, auth_guard_1.AuthGuard)('jwt')),
     (0, graphql_1.Mutation)((returns) => core_auth_model_1.CoreAuthModel, { description: 'Logout user (from specific device)' }),
     __param(0, (0, graphql_user_decorator_1.GraphQLUser)()),
     __param(1, (0, graphql_1.Context)()),
-    __param(2, (0, graphql_1.Args)('deviceId', { nullable: true })),
+    __param(2, (0, tokens_decorator_1.Tokens)('token')),
+    __param(3, (0, graphql_1.Args)('allDevices', { nullable: true })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:paramtypes", [Object, Object, String, Boolean]),
     __metadata("design:returntype", Promise)
 ], CoreAuthResolver.prototype, "logout", null);
 __decorate([
     (0, common_1.UseGuards)((0, auth_guard_1.AuthGuard)('jwt-refresh')),
     (0, graphql_1.Mutation)((returns) => core_auth_model_1.CoreAuthModel, { description: 'Refresh tokens (for specific device)' }),
     __param(0, (0, graphql_user_decorator_1.GraphQLUser)()),
-    __param(1, (0, graphql_1.Context)()),
-    __param(2, (0, graphql_1.Args)('deviceId', { nullable: true })),
+    __param(1, (0, tokens_decorator_1.Tokens)('refreshToken')),
+    __param(2, (0, graphql_1.Context)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", Promise)
 ], CoreAuthResolver.prototype, "refreshToken", null);
+__decorate([
+    (0, graphql_1.Mutation)((returns) => core_auth_model_1.CoreAuthModel, {
+        description: 'Sign in user via email and password and get JWT tokens (for specific device)',
+    }),
+    __param(0, (0, graphql_1.Info)()),
+    __param(1, (0, graphql_1.Context)()),
+    __param(2, (0, graphql_1.Args)('input')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, core_auth_sign_in_input_1.CoreAuthSignInInput]),
+    __metadata("design:returntype", Promise)
+], CoreAuthResolver.prototype, "signIn", null);
 __decorate([
     (0, graphql_1.Mutation)((returns) => core_auth_model_1.CoreAuthModel, { description: 'Register a new user account (on specific device)' }),
     __param(0, (0, graphql_1.Info)()),

package/dist/core/modules/auth/core-auth.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-auth.resolver.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,6CAA0E;AAG1E,2FAA6E;AAC7E,yEAAqE;AACrE,uDAAkD;AAClD,oDAAgD;AAChD,8EAAuE;AACvE,8EAAuE;AAEvE,oEAA+D;~~AAMxD~~,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAI3B,YAA+B,WAA4B,EAAqB,aAA4B;QAA7E,gBAAW,GAAX,WAAW,CAAiB;QAAqB,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;~~IAY1G~~,AAAN,KAAK,CAAC,MAAM,~~CACF~~,~~IAAwB~~,~~EACrB~~,GAA0B,~~EACtB~~,~~KAA0B~~;~~QAEzC~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,~~cAAc~~,EAAE,~~EAAE~~,~~IAAI,~~EAAE,~~MAAM,EAAE,QAAQ,EAAE,EAAE,~~CAAC,CAAC;~~QACpG~~,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;~~IAMK~~,AAAN,KAAK,CAAC,~~MAAM~~,~~CACK~~,~~WAA0B~~,~~EAC9B~~,~~GAA0B~~,~~EACC~~,~~QAAiB~~;~~QAEvD~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~MAAM~~,CAAC,~~EAAE~~,~~WAAW,~~EAAE,~~QAAQ~~,~~EAAE,~~CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;~~IAOK~~,AAAN,KAAK,CAAC,~~YAAY~~,~~CACD~~,~~IAAmB~~,~~EACvB~~,GAA0B,~~EACC~~,~~QAAiB~~;~~QAEvD~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~aAAa~~,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;~~QACpE~~,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAMK,AAAN,KAAK,CAAC,MAAM,CACF,IAAwB,EACrB,GAA0B,EACtB,KAA0B;QAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IASS,cAAc,CAAC,GAA0B,EAAE,MAAW;QAE9D,IAAI,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE;YAEpD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvD,OAAO,MAAM,CAAC;aACf;YACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YAG/E,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,MAAM,CAAC,KAAK,CAAC;aACrB;YACD,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,OAAO,MAAM,CAAC,YAAY,CAAC;aAC5B;SACF;QAGD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;~~AAhFO~~;~~IAHL~~,IAAA,~~kBAAQ~~,EAAC,~~CAAC,OAAO,EAAE,EAAE,CAAC,+BAAa,EAAE;QACpC,WAAW,EAAE,8EAA8E;KAC5F,CAAC;IAEC,WAAA,~~IAAA,~~cAAI~~,~~GAAE,CAAA;IACN,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,~~EAAC,~~OAAO~~,CAAC,~~CAAA;;qDAAQ,6CAAmB;;8CAI1C~~;~~AAMK;IADL~~,IAAA,kBAAQ,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,+BAAa,EAAE,EAAE,WAAW,EAAE,oCAAoC,EAAE,CAAC;IAEzF,WAAA,IAAA,oCAAW,GAAE,CAAA;IACb,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,~~UAAU~~,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;;;;~~8CAItC~~;AAOK;IAFL,IAAA,kBAAS,EAAC,IAAA,sBAAS,EAAC,aAAa,CAAC,CAAC;IACnC,IAAA,kBAAQ,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,+BAAa,EAAE,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IAE3F,WAAA,IAAA,oCAAW,GAAE,CAAA;IACb,WAAA,IAAA,~~iBAAO~~,~~GAAE~~,CAAA;~~IACT~~,WAAA,IAAA,~~cAAI~~,EAAC,~~UAAU~~,EAAE,EAAE,~~QAAQ~~,EAAE,~~IAAI~~,EAAE,CAAC,CAAA~~;;;;oDAItC~~;AAMK;IADL,IAAA,kBAAQ,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,+BAAa,EAAE,EAAE,WAAW,EAAE,kDAAkD,EAAE,CAAC;IAEvG,WAAA,IAAA,cAAI,GAAE,CAAA;IACN,WAAA,IAAA,iBAAO,GAAE,CAAA;IACT,WAAA,IAAA,cAAI,EAAC,OAAO,CAAC,CAAA;;qDAAQ,6CAAmB;;8CAI1C;~~AA/DU~~,gBAAgB;IAD5B,IAAA,kBAAQ,EAAC,CAAC,EAAE,EAAE,EAAE,CAAC,+BAAa,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;qCAKR,mCAAe,EAAoC,8BAAa;GAJjG,gBAAgB,~~CAgG5B~~;~~AAhGY~~,4CAAgB"}
1	+ {"version":3,"file":"core-auth.resolver.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.resolver.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/auth/guards/auth.guard.js CHANGED Viewed

@@ -18,6 +18,7 @@ const graphql_1 = require("@nestjs/graphql");
 const passport_1 = require("@nestjs/passport");
 const options_1 = require("@nestjs/passport/dist/options");
 const memoize_util_1 = require("@nestjs/passport/dist/utils/memoize.util");
+const jwt = require("jsonwebtoken");
 const passport = require("passport");
 const NO_STRATEGY_ERROR = 'In order to use "defaultStrategy", please, ensure to import PassportModule in each ' +
     "place where AuthGuard() is being used. Otherwise, passport won't work correctly.";
@@ -67,8 +68,14 @@ function createAuthGuard(type) {
             await new Promise((resolve, reject) => request.logIn(user, (err) => (err ? reject(err) : resolve())));
         }
         handleRequest(err, user, info, context) {
-            if (err || !user) {
-                throw err || new common_1.UnauthorizedException();
+            if (err) {
+                if (err instanceof jwt.JsonWebTokenError) {
+                    throw new common_1.UnauthorizedException('Invalid token');
+                }
+                throw err;
+            }
+            if (!user) {
+                throw new common_1.UnauthorizedException('Invalid token');
             }
             return user;
         }

package/dist/core/modules/auth/guards/auth.guard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":"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~~IAAI~~,EAAE;~~gBAChB~~,MAAM,GAAG,IAAI,IAAI,8BAAqB,~~EAAE~~,CAAC;~~aAC1C~~;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAA;~~IAhEK~~,cAAc;QAIL,WAAA,IAAA,iBAAQ,GAAE,CAAA;yCAA8B,4BAAiB;OAJlE,cAAc,~~CAgEnB~~;IAED,MAAM,KAAK,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,CAAC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC;AAKY,QAAA,SAAS,GAAmD,IAAA,sBAAO,EAAC,eAAe,CAAC,CAAC"}
1	+ {"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/auth/inputs/core-auth-sign-in.input.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { CoreInput } from '../../../common/inputs/core-input.input';
 export declare class CoreAuthSignInInput extends CoreInput {
     deviceId?: string;
+    deviceDescription?: string;
     email: string;
     password: string;
 }

package/dist/core/modules/auth/inputs/core-auth-sign-in.input.js CHANGED Viewed

@@ -16,14 +16,19 @@ let CoreAuthSignInInput = class CoreAuthSignInInput extends core_input_input_1.C
     constructor() {
         super(...arguments);
         this.deviceId = undefined;
+        this.deviceDescription = undefined;
         this.email = undefined;
         this.password = undefined;
     }
 };
 __decorate([
-    (0, graphql_1.Field)({ description: 'Device ID', nullable: true }),
+    (0, graphql_1.Field)({ description: 'Device ID (is created automatically if it is not set)', nullable: true }),
     __metadata("design:type", String)
 ], CoreAuthSignInInput.prototype, "deviceId", void 0);
+__decorate([
+    (0, graphql_1.Field)({ description: 'Device description', nullable: true }),
+    __metadata("design:type", String)
+], CoreAuthSignInInput.prototype, "deviceDescription", void 0);
 __decorate([
     (0, graphql_1.Field)({ description: 'Email', nullable: false }),
     __metadata("design:type", String)

package/dist/core/modules/auth/inputs/core-auth-sign-in.input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-auth-sign-in.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/inputs/core-auth-sign-in.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;AACnD,8EAAoE;AAM7D,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAAS;IAA3C;;QAML,aAAQ,GAAY,SAAS,CAAC;QAG9B,UAAK,GAAW,SAAS,CAAC;QAG1B,aAAQ,GAAW,SAAS,CAAC;IAC/B,CAAC;CAAA,CAAA;~~AARC~~;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,~~WAAW~~,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;~~qDACtB~~;AAE9B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;kDACvB;AAE1B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;qDACvB;~~AAZlB~~,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;GAC/B,mBAAmB,~~CAa~~/B;~~AAbY~~,kDAAmB"}
1	+ {"version":3,"file":"core-auth-sign-in.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/inputs/core-auth-sign-in.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmD;AACnD,8EAAoE;AAM7D,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,4BAAS;IAA3C;;QAML,aAAQ,GAAY,SAAS,CAAC;QAG9B,sBAAiB,GAAY,SAAS,CAAC;QAGvC,UAAK,GAAW,SAAS,CAAC;QAG1B,aAAQ,GAAW,SAAS,CAAC;IAC/B,CAAC;CAAA,CAAA;AAXC;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,uDAAuD,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAClE;AAE9B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DACtB;AAEvC;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;kDACvB;AAE1B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;qDACvB;AAflB,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;GAC/B,mBAAmB,CAgB/B;AAhBY,kDAAmB"}

package/dist/core/modules/auth/inputs/core-auth-sign-up.input.d.ts CHANGED Viewed

@@ -1,6 +1,3 @@
-import { CoreInput } from '../../../common/inputs/core-input.input';
-export declare class CoreAuthSignUpInput extends CoreInput {
-    deviceId?: string;
-    email: string;
-    password: string;
+import { CoreAuthSignInInput } from './core-auth-sign-in.input';
+export declare class CoreAuthSignUpInput extends CoreAuthSignInInput {
 }

package/dist/core/modules/auth/inputs/core-auth-sign-up.input.js CHANGED Viewed

@@ -5,33 +5,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreAuthSignUpInput = void 0;
 const graphql_1 = require("@nestjs/graphql");
-const core_input_input_1 = require("../../../common/inputs/core-input.input");
-let CoreAuthSignUpInput = class CoreAuthSignUpInput extends core_input_input_1.CoreInput {
-    constructor() {
-        super(...arguments);
-        this.deviceId = undefined;
-        this.email = undefined;
-        this.password = undefined;
-    }
+const core_auth_sign_in_input_1 = require("./core-auth-sign-in.input");
+let CoreAuthSignUpInput = class CoreAuthSignUpInput extends core_auth_sign_in_input_1.CoreAuthSignInInput {
 };
-__decorate([
-    (0, graphql_1.Field)({ description: 'Device ID', nullable: true }),
-    __metadata("design:type", String)
-], CoreAuthSignUpInput.prototype, "deviceId", void 0);
-__decorate([
-    (0, graphql_1.Field)({ description: 'Email', nullable: false }),
-    __metadata("design:type", String)
-], CoreAuthSignUpInput.prototype, "email", void 0);
-__decorate([
-    (0, graphql_1.Field)({ description: 'Password', nullable: false }),
-    __metadata("design:type", String)
-], CoreAuthSignUpInput.prototype, "password", void 0);
 CoreAuthSignUpInput = __decorate([
     (0, graphql_1.InputType)({ description: 'Sign-up input' })
 ], CoreAuthSignUpInput);

package/dist/core/modules/auth/inputs/core-auth-sign-up.input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-auth-sign-up.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/inputs/core-auth-sign-up.input.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;~~AAAA,~~6CAAmD~~;~~AACnD~~,~~8EAAoE~~;~~AAM7D~~,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,~~4BAAS~~;~~IAA3C;;QAML~~,~~aAAQ,GAAY,SAAS,CAAC;QAG9B,UAAK,GAAW,SAAS,CAAC;QAG1B,aAAQ,GAAW,SAAS,CAAC;IAC/B,CAAC;~~CAAA~~,CAAA~~;~~AARC;IAAC~~,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACtB;AAE9B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;kDACvB;AAE1B;IAAC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;qDACvB;AAZlB,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;GAC/B,mBAAmB,~~CAa/~~B;~~AAbY~~,kDAAmB"}
1	+ {"version":3,"file":"core-auth-sign-up.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/inputs/core-auth-sign-up.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAA4C;AAC5C,uEAAgE;AAMzD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,6CAAmB;CAAG,CAAA;AAAlD,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;GAC/B,mBAAmB,CAA+B;AAAlD,kDAAmB"}

package/dist/core/modules/auth/interfaces/core-auth-user.interface.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
+import { CoreTokenData } from './core-token-data.interface';
 export interface ICoreAuthUser {
     id: string;
     email: string;
     password: string;
-    refreshToken?: string;
-    refreshTokens?: Record<string, string>;
+    refreshTokens?: Record<string, CoreTokenData>;
 }

package/dist/core/modules/auth/interfaces/core-token-data.interface.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export interface CoreTokenData {
+    deviceId?: string;
+    deviceDescription?: string;
+    tokenId: string;
+}

package/dist/core/modules/auth/interfaces/core-token-data.interface.js ADDED Viewed

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=core-token-data.interface.js.map

package/dist/core/modules/auth/interfaces/core-token-data.interface.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"core-token-data.interface.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/interfaces/core-token-data.interface.ts"],"names":[],"mappings":""}

package/dist/core/modules/auth/interfaces/jwt-payload.interface.d.ts CHANGED Viewed

@@ -1,3 +1,6 @@
 export interface JwtPayload {
+    [key: string]: any;
     id: string;
+    deviceId: string;
+    tokenId: string;
 }

package/dist/core/modules/auth/services/core-auth.service.d.ts CHANGED Viewed

@@ -13,22 +13,24 @@ export declare class CoreAuthService {
     protected readonly configService: ConfigService;
     constructor(userService: CoreAuthUserService, jwtService: JwtService, configService: ConfigService);
     decodeJwt(token: string): JwtPayload;
-    logout(serviceOptions: ServiceOptions & {
-        deviceId?: string;
+    logout(tokenOrRefreshToken: string, serviceOptions: ServiceOptions & {
+        allDevices?: boolean;
     }): Promise<boolean>;
-    refreshTokens(user: ICoreAuthUser, deviceId?: string): Promise<CoreAuthModel>;
+    refreshTokens(user: ICoreAuthUser, currentRefreshToken: string): Promise<CoreAuthModel>;
     signIn(input: CoreAuthSignInInput, serviceOptions?: ServiceOptions): Promise<CoreAuthModel>;
     signUp(input: CoreAuthSignUpInput, serviceOptions?: ServiceOptions): Promise<CoreAuthModel>;
     validateUser(payload: JwtPayload): Promise<any>;
-    protected getResult(user: ICoreAuthUser, serviceOptions: ServiceOptions & {
+    protected getResult(user: ICoreAuthUser, data?: {
+        [key: string]: any;
         deviceId?: string;
-    }): Promise<CoreAuthModel>;
+    }, currentRefreshToken?: string): Promise<CoreAuthModel>;
     protected getSecretFromConfig(refresh?: boolean): any;
-    protected getTokens(userId: string): Promise<{
+    protected createTokens(userId: string, data?: {
+        [key: string]: any;
+        deviceId?: string;
+    }): Promise<{
         token: string;
         refreshToken: string;
     }>;
-    protected updateRefreshToken(user: ICoreAuthUser, refreshToken: string, serviceOptions?: ServiceOptions & {
-        deviceId?: string;
-    }): Promise<ICoreAuthUser>;
+    protected updateRefreshToken(user: ICoreAuthUser, currentRefreshToken: string, newRefreshToken: string, data?: Record<string, any>): Promise<string>;
 }