olaven
/
nrss
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

FIX: Existing agreement exists, but is out of sync with db

This commit is contained in:
Olav Sundfør 2025-05-26 14:40:48 +02:00 committed by GitHub
parent 5cf4e2c152
commit 0e77c35fb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
test-script.ts
tmp
# Created by https://www.toptal.com/developers/gitignore/api/node,deno,macos,emacs

85
lib/vipps/vipps.ts
View File

@ -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;

21
routes/api/trigger-donation/vipps.ts
View File

@ -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<Response> {
const email = new URLSearchParams(req.url.split("?")[1] || "").get("email");
@ -21,11 +22,27 @@ export const handler = async function (req: Request): Promise<Response> {
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);