mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-14 21:10:34 +01:00
Added error conditions for website updates.
This commit is contained in:
parent
4e756727ed
commit
e429abc08e
@ -56,7 +56,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/inter": "4.5.7",
|
"@fontsource/inter": "4.5.7",
|
||||||
"@prisma/client": "4.3.1",
|
"@prisma/client": "4.4.0",
|
||||||
"chalk": "^4.1.1",
|
"chalk": "^4.1.1",
|
||||||
"chart.js": "^2.9.4",
|
"chart.js": "^2.9.4",
|
||||||
"classnames": "^2.3.1",
|
"classnames": "^2.3.1",
|
||||||
@ -84,7 +84,7 @@
|
|||||||
"maxmind": "^4.3.6",
|
"maxmind": "^4.3.6",
|
||||||
"moment-timezone": "^0.5.35",
|
"moment-timezone": "^0.5.35",
|
||||||
"next": "^12.2.5",
|
"next": "^12.2.5",
|
||||||
"next-basics": "^0.17.0",
|
"next-basics": "^0.18.0",
|
||||||
"node-fetch": "^3.2.8",
|
"node-fetch": "^3.2.8",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"prop-types": "^15.7.2",
|
"prop-types": "^15.7.2",
|
||||||
@ -125,7 +125,7 @@
|
|||||||
"postcss-preset-env": "7.4.3",
|
"postcss-preset-env": "7.4.3",
|
||||||
"postcss-rtlcss": "^3.6.1",
|
"postcss-rtlcss": "^3.6.1",
|
||||||
"prettier": "^2.6.2",
|
"prettier": "^2.6.2",
|
||||||
"prisma": "4.3.1",
|
"prisma": "4.4.0",
|
||||||
"prompts": "2.4.2",
|
"prompts": "2.4.2",
|
||||||
"rollup": "^2.70.1",
|
"rollup": "^2.70.1",
|
||||||
"rollup-plugin-terser": "^7.0.2",
|
"rollup-plugin-terser": "^7.0.2",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
import { useAuth, useCors } from 'lib/middleware';
|
import { useAuth, useCors } from 'lib/middleware';
|
||||||
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
|
import { getRandomChars, methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';
|
||||||
import { deleteWebsite, getAccount, getWebsite, updateWebsite } from 'queries';
|
import { deleteWebsite, getAccount, getWebsite, updateWebsite } from 'queries';
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
@ -26,21 +26,31 @@ export default async (req, res) => {
|
|||||||
|
|
||||||
if (accountUuid) {
|
if (accountUuid) {
|
||||||
account = await getAccount({ accountUuid });
|
account = await getAccount({ accountUuid });
|
||||||
|
|
||||||
|
if (!account) {
|
||||||
|
return serverError(res, 'Account does not exist.');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const website = await getWebsite({ websiteUuid: websiteId });
|
const website = await getWebsite({ websiteUuid: websiteId });
|
||||||
|
|
||||||
const newShareId = enableShareUrl ? website.shareId || getRandomChars(8) : null;
|
const newShareId = enableShareUrl ? website.shareId || getRandomChars(8) : null;
|
||||||
|
|
||||||
await updateWebsite(
|
try {
|
||||||
{
|
await updateWebsite(
|
||||||
name,
|
{
|
||||||
domain,
|
name,
|
||||||
shareId: shareId ? shareId : newShareId,
|
domain,
|
||||||
userId: account ? account.id : +owner,
|
shareId: shareId ? shareId : newShareId,
|
||||||
},
|
userId: account ? account.id : +owner || undefined,
|
||||||
{ websiteUuid: websiteId },
|
},
|
||||||
);
|
{ websiteUuid: websiteId },
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
if (e.message.includes('Unique constraint') && e.message.includes('share_id')) {
|
||||||
|
return serverError(res, 'That share ID is already taken.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return ok(res);
|
return ok(res);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user