WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1419 from OpenSignLabs/validation

Browse Source 
fix: user does not exist error while creating document
This commit is contained in:
prafull-opensignlabs
2024-11-06 11:41:58 +05:30
committed by GitHub
parent 1776931df5 0673242f41
commit b09becf3eb
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/primitives/AddContact.js
-2
View File
@@ -60,7 +60,6 @@ const AddContact = (props) => {
);
const userId = user?.objectId || "";
const tenantDetails = await getTenantDetails(userId, props.jwttoken);
console.log("tenantDetails", tenantDetails);
const tenantId = tenantDetails?.objectId || "";
if (tenantId) {
try {
@@ -78,7 +77,6 @@ const AddContact = (props) => {
const axiosRes = await axios.post(url, data, { headers });
const contactRes = axiosRes?.data?.result || {};
if (contactRes?.objectId) {
console.log("contactRes ", contactRes);
props.details(contactRes);
if (props.closePopup) {
props.closePopup();
apps/OpenSignServer/cloud/parsefunction/getTenant.js
+34 -32
View File
@@ -1,5 +1,35 @@
import { parseJwt } from '../../Utils.js';
import jwt from 'jsonwebtoken';
async function getTenantByUserId(userId) {
try {
const query = new Parse.Query('contracts_Users');
query.equalTo('UserId', {
__type: 'Pointer',
className: '_User',
objectId: userId,
});
const extuser = await query.first({ useMasterKey: true });
if (extuser) {
const user = extuser?.get('CreatedBy')?.id || userId;
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
tenantCreditsQuery.equalTo('UserId', {
__type: 'Pointer',
className: '_User',
objectId: user,
});
tenantCreditsQuery.exclude('FileAdapters');
tenantCreditsQuery.exclude('PfxFile');
const res = await tenantCreditsQuery.first({ useMasterKey: true });
return res;
} else {
return {};
}
} catch (err) {
console.log('err in getTenant ', err);
return 'user does not exist!';
}
}
export default async function getTenant(request) {
const jwttoken = request.headers.jwttoken || '';
const userId = request.params.userId || '';
@@ -10,50 +40,22 @@ export default async function getTenant(request) {
const userCls = new Parse.Query(Parse.User);
userCls.equalTo('email', jwtDecode?.user_email);
const userRes = await userCls.first({ useMasterKey: true });
const userId = userRes?.id;
const apiUserId = userRes?.id;
const tokenQuery = new Parse.Query('appToken');
tokenQuery.equalTo('userId', {
__type: 'Pointer',
className: '_User',
objectId: userId,
objectId: apiUserId,
});
const appRes = await tokenQuery.first({ useMasterKey: true });
const decoded = jwt.verify(verifyToken, appRes?.get('token'));
if (decoded?.user_email) {
try {
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
tenantCreditsQuery.equalTo('UserId', {
__type: 'Pointer',
className: '_User',
objectId: userId,
});
tenantCreditsQuery.exclude('FileAdapters');
tenantCreditsQuery.exclude('PfxFile');
const res = await tenantCreditsQuery.first({ useMasterKey: true });
if (res) {
return res;
}
} catch (e) {
return 'user does not exist!';
}
return await getTenantByUserId(apiUserId);
} else {
return { status: 'error', result: 'Invalid token!' };
}
}
} else if (userId) {
try {
const tenantCreditsQuery = new Parse.Query('partners_Tenant');
tenantCreditsQuery.equalTo('UserId', {
__type: 'Pointer',
className: '_User',
objectId: userId,
});
const res = await tenantCreditsQuery.first();
if (res) {
return res;
}
} catch (e) {
return 'user does not exist!';
}
return await getTenantByUserId(userId);
}
}