@kominal/common-nestjs 0.1.0 → 0.1.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.
- package/guards/user.guard.d.ts +2 -2
- package/guards/user.guard.js +10 -7
- package/guards/user.guard.js.map +1 -1
- package/helpers/entity-service.helper.d.ts +3 -0
- package/helpers/entity-service.helper.js +10 -1
- package/helpers/entity-service.helper.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/guards/user.guard.d.ts
CHANGED
|
@@ -4,10 +4,10 @@ import { UserModel } from '../entities/user.entity';
|
|
|
4
4
|
import { UserContext } from '../helpers/context.decorator';
|
|
5
5
|
import { AuthService } from '../services/auth.service';
|
|
6
6
|
export declare class UserGuard implements CanActivate {
|
|
7
|
-
private membershipModel;
|
|
8
7
|
private userModel;
|
|
9
8
|
private authService;
|
|
10
|
-
|
|
9
|
+
private membershipModel;
|
|
10
|
+
constructor(userModel: UserModel, authService: AuthService, membershipModel: MembershipModel);
|
|
11
11
|
populateUserContext(context: ExecutionContext): Promise<UserContext | undefined>;
|
|
12
12
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
13
13
|
}
|
package/guards/user.guard.js
CHANGED
|
@@ -20,10 +20,10 @@ const membership_entity_1 = require("../entities/membership.entity");
|
|
|
20
20
|
const user_entity_1 = require("../entities/user.entity");
|
|
21
21
|
const auth_service_1 = require("../services/auth.service");
|
|
22
22
|
let UserGuard = class UserGuard {
|
|
23
|
-
constructor(
|
|
24
|
-
this.membershipModel = membershipModel;
|
|
23
|
+
constructor(userModel, authService, membershipModel) {
|
|
25
24
|
this.userModel = userModel;
|
|
26
25
|
this.authService = authService;
|
|
26
|
+
this.membershipModel = membershipModel;
|
|
27
27
|
}
|
|
28
28
|
async populateUserContext(context) {
|
|
29
29
|
const req = context.switchToHttp().getRequest();
|
|
@@ -47,8 +47,10 @@ let UserGuard = class UserGuard {
|
|
|
47
47
|
updatedBy: userContext.email,
|
|
48
48
|
},
|
|
49
49
|
}, { upsert: true });
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
if (this.membershipModel) {
|
|
51
|
+
const invitations = await this.membershipModel.find({ email: userContext.email, status: membership_entity_1.MembershipStatus.INVITED });
|
|
52
|
+
await Promise.all(invitations.map(async (invitation) => invitation.updateOne({ userId: userContext.userId, status: membership_entity_1.MembershipStatus.ACTIVE })));
|
|
53
|
+
}
|
|
52
54
|
return userContext;
|
|
53
55
|
}
|
|
54
56
|
async canActivate(context) {
|
|
@@ -59,8 +61,9 @@ let UserGuard = class UserGuard {
|
|
|
59
61
|
exports.UserGuard = UserGuard;
|
|
60
62
|
exports.UserGuard = UserGuard = __decorate([
|
|
61
63
|
(0, common_1.Injectable)(),
|
|
62
|
-
__param(0, (0, mongoose_1.InjectModel)(
|
|
63
|
-
__param(
|
|
64
|
-
|
|
64
|
+
__param(0, (0, mongoose_1.InjectModel)(user_entity_1.User.name)),
|
|
65
|
+
__param(2, (0, common_1.Optional)()),
|
|
66
|
+
__param(2, (0, mongoose_1.InjectModel)(membership_entity_1.Membership.name)),
|
|
67
|
+
__metadata("design:paramtypes", [Object, auth_service_1.AuthService, Object])
|
|
65
68
|
], UserGuard);
|
|
66
69
|
//# sourceMappingURL=user.guard.js.map
|
package/guards/user.guard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.guard.js","sourceRoot":"","sources":["../../src/guards/user.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.guard.js","sourceRoot":"","sources":["../../src/guards/user.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqF;AACrF,+CAA+C;AAC/C,+BAA0B;AAC1B,qEAA8F;AAC9F,yDAA0D;AAE1D,2DAAuD;AAGhD,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACkC,SAAoB,EAC5C,WAAwB,EACkB,eAAgC;QAFlD,cAAS,GAAT,SAAS,CAAW;QAC5C,gBAAW,GAAX,WAAW,CAAa;QACkB,oBAAe,GAAf,eAAe,CAAiB;IACjF,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAAC,OAAyB;QACxD,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QAEhD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAE3E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,WAAW,GAAgB;YAC/B,MAAM,EAAE,MAAM,CAAC,GAAG;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;SAC7B,CAAC;QACF,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QAE9B,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAC5B,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,EAC9B;YACE,YAAY,EAAE,IAAI,IAAI,EAAE;YACxB,YAAY,EAAE;gBACZ,IAAI,EAAE,IAAA,SAAE,GAAE;gBACV,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,WAAW,CAAC,KAAK;gBAC5B,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,WAAW,CAAC,KAAK;aAC7B;SACF,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;QAEF,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,oCAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;YACpH,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,oCAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAClJ,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAyB;QAChD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC5D,OAAO,CAAC,CAAC,WAAW,CAAC;IACvB,CAAC;CACF,CAAA;AAlDY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,sBAAW,EAAC,kBAAI,CAAC,IAAI,CAAC,CAAA;IAEtB,WAAA,IAAA,iBAAQ,GAAE,CAAA;IAAE,WAAA,IAAA,sBAAW,EAAC,8BAAU,CAAC,IAAI,CAAC,CAAA;6CADpB,0BAAW;GAHvB,SAAS,CAkDrB"}
|
|
@@ -14,6 +14,9 @@ export declare class EntityPathParams {
|
|
|
14
14
|
export declare class GlobalEntityPathParams {
|
|
15
15
|
uuid: string;
|
|
16
16
|
}
|
|
17
|
+
export declare class OptionalGlobalEntityPathParams {
|
|
18
|
+
uuid?: string;
|
|
19
|
+
}
|
|
17
20
|
export declare class ListParams {
|
|
18
21
|
active?: string;
|
|
19
22
|
direction?: string;
|
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.EntityService = exports.ChangeContext = exports.OpenApiPaginationResponse = exports.ListResponse = exports.ListParams = exports.GlobalEntityPathParams = exports.EntityPathParams = exports.OptionalEntityPathParams = exports.EntitiesPathParams = void 0;
|
|
12
|
+
exports.EntityService = exports.ChangeContext = exports.OpenApiPaginationResponse = exports.ListResponse = exports.ListParams = exports.OptionalGlobalEntityPathParams = exports.GlobalEntityPathParams = exports.EntityPathParams = exports.OptionalEntityPathParams = exports.EntitiesPathParams = void 0;
|
|
13
13
|
exports.created = created;
|
|
14
14
|
exports.changed = changed;
|
|
15
15
|
const common_1 = require("@nestjs/common");
|
|
@@ -59,6 +59,15 @@ __decorate([
|
|
|
59
59
|
(0, class_validator_1.IsString)(),
|
|
60
60
|
__metadata("design:type", String)
|
|
61
61
|
], GlobalEntityPathParams.prototype, "uuid", void 0);
|
|
62
|
+
class OptionalGlobalEntityPathParams {
|
|
63
|
+
}
|
|
64
|
+
exports.OptionalGlobalEntityPathParams = OptionalGlobalEntityPathParams;
|
|
65
|
+
__decorate([
|
|
66
|
+
(0, swagger_1.ApiProperty)({ required: false }),
|
|
67
|
+
(0, class_validator_1.IsOptional)(),
|
|
68
|
+
(0, class_validator_1.IsString)(),
|
|
69
|
+
__metadata("design:type", String)
|
|
70
|
+
], OptionalGlobalEntityPathParams.prototype, "uuid", void 0);
|
|
62
71
|
class ListParams {
|
|
63
72
|
}
|
|
64
73
|
exports.ListParams = ListParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service.helper.js","sourceRoot":"","sources":["../../src/helpers/entity-service.helper.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"entity-service.helper.js","sourceRoot":"","sources":["../../src/helpers/entity-service.helper.ts"],"names":[],"mappings":"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"}
|