diff --git a/.gitignore b/.gitignore index a49d6cb..9c1cbf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +test-script.ts tmp # Created by https://www.toptal.com/developers/gitignore/api/node,deno,macos,emacs diff --git a/lib/rss.test.ts b/lib/rss.test.ts index 2247bf1..fead2fb 100644 --- a/lib/rss.test.ts +++ b/lib/rss.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists, assertLess } from "$std/assert/mod.ts"; +import { assertEquals, assertExists } from "$std/assert/mod.ts"; import { testUtils } from "./test-utils.ts"; import { rss } from "./rss.ts"; import { forTestingOnly } from "./rss.ts"; @@ -30,20 +30,6 @@ Deno.test("generated rss contains promo with link to donations page", () => { const series = testUtils.generateSeries(); const feed = rss.assembleFeed(series); + console.log(feed); feed.includes("Vurder å støtte utviklingen via Vipps"); }); - -Deno.test("generated rss contains promo with link to donations page", () => { - const series = testUtils.generateSeries(); - const feed = rss.assembleFeed(series); - - const indexOfFirstPromotion = feed.indexOf( - "NRSS er avhengig av din Vipps-støtte", - ); - const indexOfSecondPromotion = feed.indexOf("Vurder å støtte utviklingen"); - assertLess( - indexOfFirstPromotion, - indexOfSecondPromotion, - "First promotion should come before the second", - ); -}); diff --git a/lib/rss.ts b/lib/rss.ts index 812ac11..3124649 100644 --- a/lib/rss.ts +++ b/lib/rss.ts @@ -27,11 +27,16 @@ function assembleFeed(series: Series): string { tag("itunes:name", "NRK"), tag("itunes:email", "nrkpodcast@nrk.no"), ]), - tag("description", series.subtitle || ""), + tag( + "description", + series.subtitle || "", + ), tag("ttl", "60"), //60 minutes ...(series.imageUrl ? [ - tag("itunes:image", "", [["href", series.imageUrl]]), + tag("itunes:image", "", [ + ["href", series.imageUrl], + ]), tag("image", [ tag("url", series.imageUrl), tag("title", series.title), @@ -53,11 +58,10 @@ function assembleFeed(series: Series): string { } function descriptionWithDonationPromotion(description: string): string { - const firstPromotion = `⬇️NRSS er avhengig av din Vipps-støtte⬇️`; - const secondPromotion = + const promotion = `Takk for at du bruker NRSS 🙏🌟 Vurder å støtte utviklingen via Vipps med omtrent det samme som prisen på en kaffekopp. Se mer på https://nrss.deno.dev/`; - return `${firstPromotion}\n\n${description}\n\n${secondPromotion}`; + return `${description}\n\n${promotion}`; } function assembleEpisode(episode: Episode, seriesId: Series["id"]): Tag { @@ -72,7 +76,10 @@ function assembleEpisode(episode: Episode, seriesId: Series["id"]): Tag { tag("pubDate", new Date(episode.date).toUTCString()), tag("itunes:duration", episode.durationInSeconds.toString()), tag("podcast:chapters", "", [ - ["url", `${getHostUrl()}/api/feeds/${seriesId}/${episode.id}/chapters`], + [ + "url", + `${getHostUrl()}/api/feeds/${seriesId}/${episode.id}/chapters`, + ], ["type", "application/json+chapters"], ]), tag("enclosure", "", [ diff --git a/lib/vipps/vipps.ts b/lib/vipps/vipps.ts index 33cdeb3..79f03da 100644 --- a/lib/vipps/vipps.ts +++ b/lib/vipps/vipps.ts @@ -7,8 +7,12 @@ import { STATUS_CODE } from "$fresh/server.ts"; const config = { clientId: Deno.env.get("VIPPS_CLIENT_ID"), clientSecret: Deno.env.get("VIPPS_CLIENT_SECRET"), - ocpApimSubscriptionKeyPrimary: Deno.env.get("VIPPS_OCP_APIM_SUBSCRIPTION_KEY_PRIMARY"), - ocpApimSubscriptionKeySecondary: Deno.env.get("VIPPS_OCM_APIM_SUBSCRIPTION_KEY_SECONDARY"), + ocpApimSubscriptionKeyPrimary: Deno.env.get( + "VIPPS_OCP_APIM_SUBSCRIPTION_KEY_PRIMARY", + ), + ocpApimSubscriptionKeySecondary: Deno.env.get( + "VIPPS_OCM_APIM_SUBSCRIPTION_KEY_SECONDARY", + ), msn: Deno.env.get("VIPPS_MSN"), baseUrl: Deno.env.get("VIPPS_API_BASE_URL"), }; @@ -33,8 +37,8 @@ const getAccessToken = async function () { method: "POST", // @ts-ignore headers: { - "client_id": config.clientId, - "client_secret": config.clientSecret, + client_id: config.clientId, + client_secret: config.clientSecret, ...standardVippsHeaders, }, }); @@ -56,23 +60,23 @@ export const createAgreement = async function (email: string) { ...standardVippsHeaders, }, body: JSON.stringify({ - "interval": { - "unit": "MONTH", - "count": 1, + interval: { + unit: "MONTH", + count: 1, }, - "initialCharge": { - "amount": amount, - "description": "Initial charge", - "transactionType": "DIRECT_CAPTURE", + initialCharge: { + amount: amount, + description: "Initial charge", + transactionType: "DIRECT_CAPTURE", }, - "pricing": { - "amount": amount, - "currency": "NOK", + pricing: { + amount: amount, + currency: "NOK", }, // email is used to identify the user in the success page - "merchantRedirectUrl": `${getHostUrl()}/donations-success?email=${email}`, - "merchantAgreementUrl": `${getHostUrl()}`, - "productName": "Månedlig støtte til NRSS", + merchantRedirectUrl: `${getHostUrl()}/donations-success?email=${email}`, + merchantAgreementUrl: `${getHostUrl()}`, + productName: "Månedlig støtte til NRSS", }), }); @@ -89,15 +93,23 @@ export const createAgreement = async function (email: string) { } }; -export const getAgreement = async function (agreementId: string) { +export const getAgreement = async function (agreementId: string): Promise< + | { + status: "PENDING" | "ACTIVE" | "STOPPED" | "EXPIRED"; + } + | Error +> { const token = await getAccessToken(); - const response = await fetch(`${config.baseUrl}/recurring/v3/agreements/${agreementId}`, { - // @ts-ignore - headers: { - authorization: `Bearer ${token}`, - ...standardVippsHeaders, + const response = await fetch( + `${config.baseUrl}/recurring/v3/agreements/${agreementId}`, + { + // @ts-ignore + headers: { + authorization: `Bearer ${token}`, + ...standardVippsHeaders, + }, }, - }); + ); if (response.status === STATUS_CODE.OK) { return response.json(); @@ -110,18 +122,21 @@ export const getAgreement = async function (agreementId: string) { export const cancelAgreement = async function (agreementId: string) { const token = await getAccessToken(); - const response = await fetch(`${config.baseUrl}/recurring/v3/agreements/${agreementId}`, { - method: "PATCH", - // @ts-ignore - headers: { - authorization: `Bearer ${token}`, - "Idempotency-Key": `${agreementId}-${Date.now()}`, - ...standardVippsHeaders, + const response = await fetch( + `${config.baseUrl}/recurring/v3/agreements/${agreementId}`, + { + method: "PATCH", + // @ts-ignore + headers: { + authorization: `Bearer ${token}`, + "Idempotency-Key": `${agreementId}-${Date.now()}`, + ...standardVippsHeaders, + }, + body: JSON.stringify({ + status: "STOPPED", + }), }, - body: JSON.stringify({ - "status": "STOPPED", - }), - }); + ); if (response.status === STATUS_CODE.NoContent) { return true; diff --git a/routes/api/trigger-donation/vipps.ts b/routes/api/trigger-donation/vipps.ts index 7d20900..236c8cc 100644 --- a/routes/api/trigger-donation/vipps.ts +++ b/routes/api/trigger-donation/vipps.ts @@ -1,6 +1,7 @@ import { getHostUrl, validateEmail } from "../../../lib/utils.ts"; import { storage } from "../../../lib/storage.ts"; import { createAgreement } from "../../../lib/vipps/vipps.ts"; +import { getAgreement } from "../../../lib/vipps/vipps.ts"; export const handler = async function (req: Request): Promise { const email = new URLSearchParams(req.url.split("?")[1] || "").get("email"); @@ -21,11 +22,27 @@ export const handler = async function (req: Request): Promise { const hasActiveAgreement = existingAgreement && existingAgreement.validAt !== null && existingAgreement.revokedAt === null; + + const agreementInVipps = existingAgreement && (await getAgreement(existingAgreement.agreementId)); + if ( + agreementInVipps && + !(agreementInVipps instanceof Error) && + agreementInVipps.status !== "ACTIVE" && hasActiveAgreement ) { - console.error("Agreement already exists", email); - return Response.redirect(errorPage); + // Somehow the Vipps agreement is not active in our system anymore. + // We should reflect the new status in our system. + await storage.writeVippsAgreement({ + ...existingAgreement, + revokedAt: new Date(), + }); + } else { + // i.e. the agreement in our system was in sync with Vipps. + if (hasActiveAgreement) { + console.error("Agreement already exists", email); + return Response.redirect(errorPage); + } } const agreement = await createAgreement(email);