maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrades prisma to latest version (#1894) 

* Upgrades prisma

* Extends Stripe paid booking timeout

* Stripe test fixes

* Disables cache for db-reset

* Disabled cache from db-seed

* Avatar fixes

* Fixes paid booking test once and for all

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Omar López 2022-02-18 15:16:53 -07:00 committed by GitHub
parent 81b4443fc2
commit deeafb21a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/pages/api/user/avatar.ts
View File

@ -8,6 +8,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
// const username = req.url?.substring(1, req.url.lastIndexOf("/"));
const username = req.query.username as string;
const user = await prisma.user.findUnique({
rejectOnNotFound: true,
where: {
username: username,
},
@ -19,9 +20,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const emailMd5 = crypto
.createHash("md5")
.update(user?.email as string)
.update(user.email as string)
.digest("hex");
const img = user?.avatar;
const img = user.avatar;
if (!img) {
res.writeHead(302, {
Location: defaultAvatarSrc({ md5: emailMd5 }),

19
apps/web/playwright/integrations-stripe.test.ts
View File

@ -49,23 +49,18 @@ test.describe.serial("Stripe integration", () => {
await Promise.all([page.waitForNavigation({ url: "/payment/*" }), page.press('[name="email"]', "Enter")]);
await page.waitForSelector('iframe[src^="https://js.stripe.com/v3/elements-inner-card-"]');
// We lookup Stripe's iframe
const stripeFrame = page.frame({
url: (url) => url.href.startsWith("https://js.stripe.com/v3/elements-inner-card-"),
});
if (!stripeFrame) throw new Error("Stripe frame not found");
const stripeFrame = page
.frameLocator('iframe[src^="https://js.stripe.com/v3/elements-inner-card-"]')
.first();
// Fill [placeholder="Card number"]
await stripeFrame.fill('[placeholder="Card number"]', "4242 4242 4242 4242");
await stripeFrame.locator('[placeholder="Card number"]').fill("4242 4242 4242 4242");
// Fill [placeholder="MM / YY"]
await stripeFrame.fill('[placeholder="MM / YY"]', "12 / 24");
await stripeFrame.locator('[placeholder="MM / YY"]').fill("12 / 24");
// Fill [placeholder="CVC"]
await stripeFrame.fill('[placeholder="CVC"]', "111");
await stripeFrame.locator('[placeholder="CVC"]').fill("111");
// Fill [placeholder="ZIP"]
await stripeFrame.fill('[placeholder="ZIP"]', "111111");
await stripeFrame.locator('[placeholder="ZIP"]').fill("11111");
// Click button:has-text("Pay now")
await page.click('button:has-text("Pay now")');

4
packages/prisma/package.json
View File

@ -18,13 +18,13 @@
},
"devDependencies": {
"npm-run-all": "^4.1.5",
"prisma": "3.0.2",
"prisma": "3.9.2",
"ts-node": "^10.2.1",
"zod-prisma": "^0.5.4"
},
"dependencies": {
"@calcom/lib": "*",
"@prisma/client": "3.0.2"
"@prisma/client": "3.9.2"
},
"main": "index.ts",
"types": "index.d.ts",

5
turbo.json
View File

@ -4,8 +4,11 @@
"globalDependencies": ["apps/web/.env", "packages/prisma/.env"],
"pipeline": {
"@calcom/prisma#db-deploy": {},
"@calcom/prisma#db-reset": {},
"@calcom/prisma#db-reset": {
"cache": false
},
"@calcom/prisma#db-seed": {
"cache": false,
"dependsOn": ["@calcom/prisma#db-deploy"]
},
"@calcom/web#build": {

36
yarn.lock
View File

@ -1963,12 +1963,12 @@
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
"@prisma/client@3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.0.2.tgz#f04d9b252f3d0c6918df43ad228eac27d03f6db1"
integrity sha512-6SrDYY2Yr5AmYpVB3XAXFqfzxKMdDTemXR7FmfXthnxWhQHoBwRLNZ3B3GyI/MmWa5tr+kaaGDJjp1LU0vuYvQ==
"@prisma/client@3.9.2":
version "3.9.2"
resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.9.2.tgz#ad17dcfb702842573fe6ec3b7dc4615eff8d8fc6"
integrity sha512-VlEIYVMyfFZHbVBOlunPl47gmP/Z0zzPjPj8I7uKEIaABqrUy50ru3XS0aZd8GFvevVwt7p91xxkUjNjrWhKAQ==
dependencies:
"@prisma/engines-version" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
"@prisma/engines-version" "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"
"@prisma/debug@3.8.1":
version "3.8.1"
@ -1979,15 +1979,15 @@
ms "2.1.3"
strip-ansi "6.0.1"
"@prisma/engines-version@2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db":
version "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz#c45323e420f47dd950b22c873bdcf38f75e65779"
integrity sha512-iArSApZZImVmT9oC/rGOjzvpG2AOqlIeqYcVnop9poA3FxD4zfVPbNPH9DTgOWhc06OkBHujJZeAcsNddVabIQ==
"@prisma/engines-version@3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009":
version "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"
resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz#ea03ffa723382a526dc6625ce6eae9b6ad984400"
integrity sha512-5Dh+qTDhpPR66w6NNAnPs+/W/Qt4r1DSd+qhfPFcDThUK4uxoZKGlPb2IYQn5LL+18aIGnmteDf7BnVMmvBNSQ==
"@prisma/engines@2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db":
version "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz#b6cf70bc05dd2a62168a16f3ea58a1b011074621"
integrity sha512-Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg==
"@prisma/engines@3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009":
version "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"
resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz#e5c345cdedb7be83d11c1e0c5ab61d866b411256"
integrity sha512-qM+uJbkelB21bnK44gYE049YTHIjHysOuj0mj5U2gDGyNLfmiazlggzFPCgEjgme4U5YB2tYs6Z5Hq08Kl8pjA==
"@prisma/generator-helper@~3.8.1":
version "3.8.1"
@ -10742,12 +10742,12 @@ prism-react-renderer@^1.1.1:
resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d"
integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ==
prisma@3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.0.2.tgz#e86cb6abf4a815c7ac97b9d0ed383f01c253ce34"
integrity sha512-TyOCbtWGDVdWvsM1RhUzJXoGClXGalHhyYWIc5eizSF8T1ScGiOa34asBUdTnXOUBFSErbsqMNw40DHAteBm1A==
prisma@3.9.2:
version "3.9.2"
resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.9.2.tgz#cc2da4e8db91231dea7465adf9db6e19f11032a9"
integrity sha512-i9eK6cexV74OgeWaH3+e6S07kvC9jEZTl6BqtBH398nlCU0tck7mE9dicY6YQd+euvMjjCtY89q4NgmaPnUsSg==
dependencies:
"@prisma/engines" "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
"@prisma/engines" "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"
process-es6@^0.11.2:
version "0.11.6"