@riocrypto/common 1.0.396 → 1.0.398

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.
@@ -22,11 +22,23 @@ const not_authorized_error_1 = require("../errors/not-authorized-error");
22
22
  const kyc_status_1 = require("../types/kyc-status");
23
23
  const missing_kyc_approval_error_1 = require("../errors/missing-kyc-approval-error");
24
24
  const missing_user_error_1 = require("../errors/missing-user-error");
25
+ const missing_password_error_1 = require("../errors/missing-password-error");
26
+ const missing_security_question_error_1 = require("../errors/missing-security-question-error");
25
27
  const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(void 0, void 0, void 0, function* () {
26
- var _a, _b, _c;
28
+ var _a, _b, _c, _d, _e, _f;
27
29
  let missingKYC = false;
30
+ if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Auth) ||
31
+ authorizationTypes.includes(authorization_type_1.AuthorizationType.UserNoKYC) ||
32
+ authorizationTypes.includes(authorization_type_1.AuthorizationType.User)) {
33
+ if ((_b = (_a = req.currentAuth) === null || _a === void 0 ? void 0 : _a.missing) === null || _b === void 0 ? void 0 : _b.includes("password")) {
34
+ throw new missing_password_error_1.MissingPasswordError();
35
+ }
36
+ if ((_d = (_c = req.currentAuth) === null || _c === void 0 ? void 0 : _c.missing) === null || _d === void 0 ? void 0 : _d.includes("securityQuestion")) {
37
+ throw new missing_security_question_error_1.MissingSecurityQuestionError();
38
+ }
39
+ }
28
40
  if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Auth)) {
29
- if ((_a = req.cookies) === null || _a === void 0 ? void 0 : _a.jwt) {
41
+ if ((_e = req.cookies) === null || _e === void 0 ? void 0 : _e.jwt) {
30
42
  try {
31
43
  const payload = jsonwebtoken_1.default.verify(req.cookies.jwt, process.env.JWT_KEY);
32
44
  req.currentAuth = payload;
@@ -35,7 +47,7 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
35
47
  }
36
48
  }
37
49
  if (authorizationTypes.includes(authorization_type_1.AuthorizationType.Admin)) {
38
- if ((_b = req.cookies) === null || _b === void 0 ? void 0 : _b.adminJwt) {
50
+ if ((_f = req.cookies) === null || _f === void 0 ? void 0 : _f.adminJwt) {
39
51
  try {
40
52
  const payload = jsonwebtoken_1.default.verify(req.cookies.adminJwt, process.env.JWT_KEY_ADMIN);
41
53
  req.currentAdminAuth = payload;
@@ -52,6 +64,9 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
52
64
  phoneNumber: req.currentAuth.phoneNumber,
53
65
  attributes: { $ne: user_attribute_1.UserAttribute.deleted },
54
66
  });
67
+ if (!individualUser) {
68
+ throw new missing_user_error_1.MissingUserError();
69
+ }
55
70
  }
56
71
  catch (err) {
57
72
  individualUser = null;
@@ -62,6 +77,9 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
62
77
  phoneNumber: req.currentAuth.phoneNumber,
63
78
  attributes: { $ne: user_attribute_1.UserAttribute.deleted },
64
79
  });
80
+ if (!businessUser) {
81
+ throw new missing_user_error_1.MissingUserError();
82
+ }
65
83
  }
66
84
  catch (err) {
67
85
  businessUser = null;
@@ -80,6 +98,9 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
80
98
  phoneNumber: req.currentAuth.phoneNumber,
81
99
  attributes: { $ne: user_attribute_1.UserAttribute.deleted },
82
100
  });
101
+ if (!individualUser) {
102
+ throw new missing_user_error_1.MissingUserError();
103
+ }
83
104
  if ((individualUser === null || individualUser === void 0 ? void 0 : individualUser.kycStatus) !== kyc_status_1.KYCStatus.Passed) {
84
105
  missingKYC = true;
85
106
  throw new Error();
@@ -94,6 +115,9 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
94
115
  phoneNumber: req.currentAuth.phoneNumber,
95
116
  attributes: { $ne: user_attribute_1.UserAttribute.deleted },
96
117
  });
118
+ if (!businessUser) {
119
+ throw new missing_user_error_1.MissingUserError();
120
+ }
97
121
  if ((businessUser === null || businessUser === void 0 ? void 0 : businessUser.kycStatus) !== kyc_status_1.KYCStatus.businessApproved) {
98
122
  missingKYC = true;
99
123
  throw new Error();
@@ -107,20 +131,6 @@ const authorize = (req, res, next, mongoose, authorizationTypes) => __awaiter(vo
107
131
  req.user = user;
108
132
  }
109
133
  }
110
- console.log("checking if user has cookies ", req.cookies);
111
- if ((_c = req.cookies) === null || _c === void 0 ? void 0 : _c.jwt) {
112
- console.log("kachao");
113
- try {
114
- const payload = jsonwebtoken_1.default.verify(req.cookies.jwt, process.env.JWT_KEY);
115
- if (authorizationTypes.includes(authorization_type_1.AuthorizationType.User) && !req.user) {
116
- console.log("kachao1");
117
- throw new missing_user_error_1.MissingUserError();
118
- }
119
- }
120
- catch (err) {
121
- console.log("kachao2");
122
- }
123
- }
124
134
  if (!req.currentAdminAuth && !req.currentAuth && !req.user) {
125
135
  if (missingKYC) {
126
136
  throw new missing_kyc_approval_error_1.MissingKYCApprovalError();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riocrypto/common",
3
- "version": "1.0.396",
3
+ "version": "1.0.398",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",