@zorionapp/gg-core 5.0.8 → 5.0.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.
package/package.json
CHANGED
|
@@ -75,12 +75,14 @@ let AuthGuard = class AuthGuard {
|
|
|
75
75
|
}
|
|
76
76
|
async handleHttp(context) {
|
|
77
77
|
const contextTargets = [context.getHandler(), context.getClass()];
|
|
78
|
+
this.user.setIp(this.cls.get(nestjs_cls_1.CLS_REQ));
|
|
79
|
+
if (this.shouldSkipAuth(contextTargets))
|
|
80
|
+
return true;
|
|
78
81
|
const roles = this.getRoles(contextTargets);
|
|
79
82
|
const authType = this.getAuthType(contextTargets);
|
|
80
83
|
const allowedUserStatuses = this.getAllowedUserStatuses(contextTargets);
|
|
81
84
|
await this.authAttempt(authType);
|
|
82
|
-
|
|
83
|
-
return true;
|
|
85
|
+
this.user.setIp(this.cls.get(nestjs_cls_1.CLS_REQ));
|
|
84
86
|
if (this.isAuthenticated())
|
|
85
87
|
this.checkUserStatus(allowedUserStatuses);
|
|
86
88
|
if (this.merchant.isAuthenticated)
|
|
@@ -106,7 +108,6 @@ let AuthGuard = class AuthGuard {
|
|
|
106
108
|
if (fulfilled.length === 0) {
|
|
107
109
|
this.merchant.dto = new dto_1.MerchantDto();
|
|
108
110
|
this.user.dto = new dto_1.UserDto();
|
|
109
|
-
this.user.setIp(this.cls.get(nestjs_cls_1.CLS_REQ));
|
|
110
111
|
return;
|
|
111
112
|
}
|
|
112
113
|
// get filled user if received multiple fulfills
|
|
@@ -114,7 +115,6 @@ let AuthGuard = class AuthGuard {
|
|
|
114
115
|
const filteredMerchant = fulfilled.filter((f) => (0, lodash_1.get)(f, 'value.merchant')?.id !== null);
|
|
115
116
|
this.merchant.dto = (0, lodash_1.get)(filteredMerchant[0], 'value.merchant', new dto_1.MerchantDto());
|
|
116
117
|
this.user.dto = (0, lodash_1.get)(filteredUser[0], 'value.user', new dto_1.UserDto());
|
|
117
|
-
this.user.setIp(this.cls.get(nestjs_cls_1.CLS_REQ));
|
|
118
118
|
}
|
|
119
119
|
/**
|
|
120
120
|
* Depends on auth type will be used different user query services
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/guards/auth.guard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/guards/auth.guard.ts"],"names":[],"mappings":"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"}
|