@kominal/common-nestjs 0.1.1 → 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/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"}
|