Skip to content

Commit e03f07a

Browse files
fix: incompatible pdf issue and signturetype issues
1 parent 9915a70 commit e03f07a

File tree

1 file changed

+44
-22
lines changed

1 file changed

+44
-22
lines changed
Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,48 @@
11
import { parseJwt } from '../../Utils.js';
22
import jwt from 'jsonwebtoken';
33

4-
async function getTenantByUserId(userId) {
4+
async function getTenantByUserId(userId, contactId) {
55
try {
6-
const query = new Parse.Query('contracts_Users');
7-
query.equalTo('UserId', {
8-
__type: 'Pointer',
9-
className: '_User',
10-
objectId: userId,
11-
});
12-
const extuser = await query.first({ useMasterKey: true });
13-
if (extuser) {
14-
const user = extuser?.get('CreatedBy')?.id || userId;
15-
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
16-
tenantCreditsQuery.equalTo('UserId', {
6+
if (contactId) {
7+
const contactquery = new Parse.Query('contracts_Contactbook');
8+
contactquery.equalTo('objectId', contactId);
9+
const contactuser = await contactquery.first({ useMasterKey: true });
10+
if (contactuser) {
11+
const user = contactuser?.get('CreatedBy')?.id || userId;
12+
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
13+
tenantCreditsQuery.equalTo('UserId', {
14+
__type: 'Pointer',
15+
className: '_User',
16+
objectId: user,
17+
});
18+
tenantCreditsQuery.exclude('FileAdapters,PfxFile,ContactNumber');
19+
const res = await tenantCreditsQuery.first({ useMasterKey: true });
20+
return res;
21+
} else {
22+
return {};
23+
}
24+
} else {
25+
const query = new Parse.Query('contracts_Users');
26+
query.equalTo('UserId', {
1727
__type: 'Pointer',
1828
className: '_User',
19-
objectId: user,
29+
objectId: userId,
2030
});
21-
tenantCreditsQuery.exclude('FileAdapters');
22-
tenantCreditsQuery.exclude('PfxFile');
23-
const res = await tenantCreditsQuery.first({ useMasterKey: true });
24-
return res;
25-
} else {
26-
return {};
31+
const extuser = await query.first({ useMasterKey: true });
32+
if (extuser) {
33+
const user = extuser?.get('CreatedBy')?.id || userId;
34+
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
35+
tenantCreditsQuery.equalTo('UserId', {
36+
__type: 'Pointer',
37+
className: '_User',
38+
objectId: user,
39+
});
40+
tenantCreditsQuery.exclude('FileAdapters,PfxFile');
41+
const res = await tenantCreditsQuery.first({ useMasterKey: true });
42+
return res;
43+
} else {
44+
return {};
45+
}
2746
}
2847
} catch (err) {
2948
console.log('err in getTenant ', err);
@@ -33,6 +52,7 @@ async function getTenantByUserId(userId) {
3352
export default async function getTenant(request) {
3453
const jwttoken = request.headers.jwttoken || '';
3554
const userId = request.params.userId || '';
55+
const contactId = request.params.contactId || '';
3656
if (jwttoken) {
3757
const jwtDecode = parseJwt(jwttoken);
3858
if (jwtDecode?.user_email) {
@@ -50,12 +70,14 @@ export default async function getTenant(request) {
5070
const appRes = await tokenQuery.first({ useMasterKey: true });
5171
const decoded = jwt.verify(verifyToken, appRes?.get('token'));
5272
if (decoded?.user_email) {
53-
return await getTenantByUserId(apiUserId);
73+
return await getTenantByUserId(apiUserId, contactId);
5474
} else {
5575
return { status: 'error', result: 'Invalid token!' };
5676
}
5777
}
58-
} else if (userId) {
59-
return await getTenantByUserId(userId);
78+
} else if (userId || contactId) {
79+
return await getTenantByUserId(userId, contactId);
80+
} else {
81+
return {};
6082
}
6183
}

0 commit comments

Comments
 (0)