From 7f6b13848df346f67d96ff67c48dc4d72713fb0a Mon Sep 17 00:00:00 2001 From: Jason Crawford Date: Mon, 23 Feb 2026 19:27:56 -0800 Subject: [PATCH 1/9] feat: add SMS alerting support for contacts (#53) Add Twilio-based SMS notifications alongside existing email alerts. Contacts now have a type (email or sms) and alerts are dispatched to the appropriate channel when incidents are opened. Co-Authored-By: Claude Opus 4.6 --- e2e/contacts.spec.ts | 14 +- package-lock.json | 327 ++++++++++++++++-- package.json | 3 +- src/__tests__/check-runner.test.ts | 39 ++- src/__tests__/contacts.test.ts | 66 +++- src/__tests__/notifications.test.ts | 87 ++++- src/app/api/checks/run/route.ts | 34 +- src/app/settings/actions.ts | 17 +- src/app/settings/page.tsx | 40 +-- src/components/AddContactForm.tsx | 67 ++++ src/lib/notifications.ts | 58 +++- src/lib/supabase/types.ts | 4 +- .../20250223000001_add_sms_contacts.sql | 21 ++ 13 files changed, 686 insertions(+), 91 deletions(-) create mode 100644 src/components/AddContactForm.tsx create mode 100644 supabase/migrations/20250223000001_add_sms_contacts.sql diff --git a/e2e/contacts.spec.ts b/e2e/contacts.spec.ts index 528b10e..3a765a6 100644 --- a/e2e/contacts.spec.ts +++ b/e2e/contacts.spec.ts @@ -14,7 +14,7 @@ test("shows empty state", async ({ page }) => { await expect(page.getByText("No contacts added yet.")).toBeVisible(); }); -test("adds a contact", async ({ page }) => { +test("adds an email contact", async ({ page }) => { await page.goto("/settings"); await page.getByPlaceholder("email@example.com").fill("contact@example.com"); await page.getByRole("button", { name: "Add" }).click(); @@ -22,9 +22,19 @@ test("adds a contact", async ({ page }) => { await expect(page.getByText("contact@example.com")).toBeVisible(); }); +test("adds an SMS contact", async ({ page }) => { + await page.goto("/settings"); + await page.getByRole("combobox").selectOption("sms"); + await page.getByPlaceholder("+15551234567").fill("+15559876543"); + await page.getByRole("button", { name: "Add" }).click(); + + await expect(page.getByText("+15559876543")).toBeVisible(); + await expect(page.getByText("sms")).toBeVisible(); +}); + test("removes a contact", async ({ page, adminClient }) => { // Seed a contact - await adminClient.from("contacts").insert({ email: "remove-me@example.com" }); + await adminClient.from("contacts").insert({ type: "email", email: "remove-me@example.com" }); await page.goto("/settings"); await expect(page.getByText("remove-me@example.com")).toBeVisible(); diff --git a/package-lock.json b/package-lock.json index e171945..9de8e84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,8 @@ "next": "^15.2.0", "react": "^19.0.0", "react-dom": "^19.0.0", - "resend": "^6.9.2" + "resend": "^6.9.2", + "twilio": "^5.12.2" }, "devDependencies": { "@eslint/eslintrc": "^3", @@ -3308,6 +3309,12 @@ "node": ">= 0.4" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -3334,6 +3341,17 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz", + "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.11", + "form-data": "^4.0.5", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", @@ -3392,6 +3410,12 @@ "node": ">=8" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, "node_modules/call-bind": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", @@ -3415,7 +3439,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -3429,7 +3452,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -3545,6 +3567,18 @@ "dev": true, "license": "MIT" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz", @@ -3668,11 +3702,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/dayjs": { + "version": "1.11.19", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", + "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==", + "license": "MIT" + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -3729,6 +3768,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", @@ -3756,7 +3804,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -3767,6 +3814,15 @@ "node": ">= 0.4" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -3879,7 +3935,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3889,7 +3944,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3934,7 +3988,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -3947,7 +4000,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -4651,6 +4703,26 @@ "dev": true, "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", @@ -4667,6 +4739,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/form-data": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", + "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/formdata-polyfill": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", @@ -4699,7 +4787,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4750,7 +4837,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -4775,7 +4861,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -4863,7 +4948,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4935,7 +5019,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4948,7 +5031,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" @@ -4964,7 +5046,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -5546,6 +5627,28 @@ "json5": "lib/cli.js" } }, + "node_modules/jsonwebtoken": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz", + "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==", + "license": "MIT", + "dependencies": { + "jws": "^4.0.1", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", @@ -5562,6 +5665,27 @@ "node": ">=4.0" } }, + "node_modules/jwa": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", + "license": "MIT", + "dependencies": { + "jwa": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -5883,6 +6007,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -5890,6 +6050,12 @@ "dev": true, "license": "MIT" }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "license": "MIT" + }, "node_modules/loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -5917,7 +6083,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -5947,6 +6112,27 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -5997,7 +6183,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -6214,7 +6399,6 @@ "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -6577,6 +6761,12 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -6587,6 +6777,21 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", + "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -6852,6 +7057,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/safe-push-apply": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", @@ -6893,11 +7118,17 @@ "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==", "license": "MIT" }, + "node_modules/scmp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.1.0.tgz", + "integrity": "sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q==", + "deprecated": "Just use Node.js's crypto.timingSafeEqual()", + "license": "BSD-3-Clause" + }, "node_modules/semver": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", - "devOptional": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -7027,7 +7258,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -7047,7 +7277,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -7064,7 +7293,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -7083,7 +7311,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -7547,6 +7774,49 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, + "node_modules/twilio": { + "version": "5.12.2", + "resolved": "https://registry.npmjs.org/twilio/-/twilio-5.12.2.tgz", + "integrity": "sha512-yjTH04Ig0Z3PAxIXhwrto0IJC4Gv7lBDQQ9f4/P9zJhnxVdd+3tENqBMJOtdmmRags3X0jl2IGKEQefCEpJE9g==", + "license": "MIT", + "dependencies": { + "axios": "^1.12.0", + "dayjs": "^1.11.9", + "https-proxy-agent": "^5.0.0", + "jsonwebtoken": "^9.0.2", + "qs": "^6.14.1", + "scmp": "^2.1.0", + "xmlbuilder": "^13.0.2" + }, + "engines": { + "node": ">=14.0" + } + }, + "node_modules/twilio/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/twilio/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -8124,6 +8394,15 @@ } } }, + "node_modules/xmlbuilder": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz", + "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==", + "license": "MIT", + "engines": { + "node": ">=6.0" + } + }, "node_modules/yallist": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", diff --git a/package.json b/package.json index 77b6118..d49c0bc 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "next": "^15.2.0", "react": "^19.0.0", "react-dom": "^19.0.0", - "resend": "^6.9.2" + "resend": "^6.9.2", + "twilio": "^5.12.2" }, "devDependencies": { "@eslint/eslintrc": "^3", diff --git a/src/__tests__/check-runner.test.ts b/src/__tests__/check-runner.test.ts index 88187b2..757e943 100644 --- a/src/__tests__/check-runner.test.ts +++ b/src/__tests__/check-runner.test.ts @@ -11,9 +11,11 @@ vi.mock('@/lib/checker', async (importOriginal) => { }) // Mock the notifications module -const mockSendIncidentAlert = vi.fn() +const mockSendIncidentEmail = vi.fn() +const mockSendIncidentSms = vi.fn() vi.mock('@/lib/notifications', () => ({ - sendIncidentAlert: (...args: unknown[]) => mockSendIncidentAlert(...args), + sendIncidentEmail: (...args: unknown[]) => mockSendIncidentEmail(...args), + sendIncidentSms: (...args: unknown[]) => mockSendIncidentSms(...args), })) // Mock the admin client @@ -30,7 +32,8 @@ import { checkSite } from '@/lib/checker' describe('POST /api/checks/run', () => { beforeEach(() => { vi.clearAllMocks() - mockSendIncidentAlert.mockResolvedValue(undefined) + mockSendIncidentEmail.mockResolvedValue(undefined) + mockSendIncidentSms.mockResolvedValue(undefined) process.env.CRON_SECRET = 'test-secret' }) @@ -90,7 +93,7 @@ describe('POST /api/checks/run', () => { expect(body).toEqual({ message: 'No sites to check', checks: 0, incidents: 0 }) }) - test('hard failure (HTTP 500) creates incident immediately, sends email', async () => { + test('hard failure (HTTP 500) creates incident immediately, sends email and SMS', async () => { const site = { id: 'site-1', name: 'Test', url: 'https://example.com' } mockFrom.mockImplementation((table: string) => { @@ -129,7 +132,10 @@ describe('POST /api/checks/run', () => { if (table === 'contacts') { return { select: () => ({ - data: [{ email: 'alice@example.com' }], + data: [ + { type: 'email', email: 'alice@example.com', phone: null }, + { type: 'sms', email: null, phone: '+15551234567' }, + ], }), } } @@ -151,13 +157,18 @@ describe('POST /api/checks/run', () => { const body = await response.json() expect(body.checks).toBe(1) expect(body.incidents).toBe(1) - expect(mockSendIncidentAlert).toHaveBeenCalledWith({ + expect(mockSendIncidentEmail).toHaveBeenCalledWith({ siteName: 'Test', siteUrl: 'https://example.com', error: 'HTTP 500', incidentId: 'inc-1', contactEmails: ['alice@example.com'], }) + expect(mockSendIncidentSms).toHaveBeenCalledWith({ + siteName: 'Test', + incidentId: 'inc-1', + contactPhones: ['+15551234567'], + }) }) test('single soft failure (HTTP 503) does not create incident', async () => { @@ -217,7 +228,8 @@ describe('POST /api/checks/run', () => { const response = await POST(request) const body = await response.json() expect(body.incidents).toBe(0) - expect(mockSendIncidentAlert).not.toHaveBeenCalled() + expect(mockSendIncidentEmail).not.toHaveBeenCalled() + expect(mockSendIncidentSms).not.toHaveBeenCalled() }) test('three soft failures within an hour creates incident', async () => { @@ -272,7 +284,7 @@ describe('POST /api/checks/run', () => { if (table === 'contacts') { return { select: () => ({ - data: [{ email: 'alice@example.com' }], + data: [{ type: 'email', email: 'alice@example.com', phone: null }], }), } } @@ -293,7 +305,7 @@ describe('POST /api/checks/run', () => { const response = await POST(request) const body = await response.json() expect(body.incidents).toBe(1) - expect(mockSendIncidentAlert).toHaveBeenCalled() + expect(mockSendIncidentEmail).toHaveBeenCalled() }) test('two soft failures within an hour does not create incident', async () => { @@ -356,7 +368,8 @@ describe('POST /api/checks/run', () => { const response = await POST(request) const body = await response.json() expect(body.incidents).toBe(0) - expect(mockSendIncidentAlert).not.toHaveBeenCalled() + expect(mockSendIncidentEmail).not.toHaveBeenCalled() + expect(mockSendIncidentSms).not.toHaveBeenCalled() }) test('records checks without creating incidents for successful checks', async () => { @@ -397,7 +410,8 @@ describe('POST /api/checks/run', () => { expect(mockInsert).toHaveBeenCalledWith( expect.objectContaining({ status: 'success', status_code: 200 }) ) - expect(mockSendIncidentAlert).not.toHaveBeenCalled() + expect(mockSendIncidentEmail).not.toHaveBeenCalled() + expect(mockSendIncidentSms).not.toHaveBeenCalled() }) test('skips rejected promises from Promise.allSettled', async () => { @@ -489,7 +503,8 @@ describe('POST /api/checks/run', () => { const response = await POST(request) const body = await response.json() expect(body.incidents).toBe(0) - expect(mockSendIncidentAlert).not.toHaveBeenCalled() + expect(mockSendIncidentEmail).not.toHaveBeenCalled() + expect(mockSendIncidentSms).not.toHaveBeenCalled() }) }) diff --git a/src/__tests__/contacts.test.ts b/src/__tests__/contacts.test.ts index e746a66..888d21b 100644 --- a/src/__tests__/contacts.test.ts +++ b/src/__tests__/contacts.test.ts @@ -37,12 +37,12 @@ describe("addContact action", () => { mockGetUser.mockResolvedValue({ data: { user: null } }) const formData = new FormData() - formData.set("email", "test@example.com") + formData.set("contact_email", "test@example.com") await expect(addContact(formData)).rejects.toThrow("NEXT_REDIRECT:/login") }) - test("inserts contact for authenticated users", async () => { + test("inserts email contact for authenticated users", async () => { mockGetUser.mockResolvedValue({ data: { user: { id: "user-1" } }, }) @@ -51,11 +51,42 @@ describe("addContact action", () => { mockFrom.mockReturnValue({ insert: mockInsert }) const formData = new FormData() - formData.set("email", "test@example.com") + formData.set("contact_type", "email") + formData.set("contact_email", "test@example.com") await addContact(formData) expect(mockFrom).toHaveBeenCalledWith("contacts") - expect(mockInsert).toHaveBeenCalledWith({ email: "test@example.com" }) + expect(mockInsert).toHaveBeenCalledWith({ type: "email", email: "test@example.com" }) + }) + + test("inserts SMS contact for authenticated users", async () => { + mockGetUser.mockResolvedValue({ + data: { user: { id: "user-1" } }, + }) + + const mockInsert = vi.fn().mockReturnValue({ error: null }) + mockFrom.mockReturnValue({ insert: mockInsert }) + + const formData = new FormData() + formData.set("contact_type", "sms") + formData.set("contact_phone", "+15551234567") + + await addContact(formData) + expect(mockFrom).toHaveBeenCalledWith("contacts") + expect(mockInsert).toHaveBeenCalledWith({ type: "sms", phone: "+15551234567" }) + }) + + test("rejects invalid phone number format", async () => { + mockGetUser.mockResolvedValue({ + data: { user: { id: "user-1" } }, + }) + + const formData = new FormData() + formData.set("contact_type", "sms") + formData.set("contact_phone", "555-1234") + + await addContact(formData) + expect(mockFrom).not.toHaveBeenCalled() }) test("does nothing if email is empty", async () => { @@ -64,9 +95,36 @@ describe("addContact action", () => { }) const formData = new FormData() + formData.set("contact_type", "email") await addContact(formData) expect(mockFrom).not.toHaveBeenCalled() }) + + test("does nothing if phone is empty for SMS", async () => { + mockGetUser.mockResolvedValue({ + data: { user: { id: "user-1" } }, + }) + + const formData = new FormData() + formData.set("contact_type", "sms") + await addContact(formData) + expect(mockFrom).not.toHaveBeenCalled() + }) + + test("defaults to email type when contact_type is not set", async () => { + mockGetUser.mockResolvedValue({ + data: { user: { id: "user-1" } }, + }) + + const mockInsert = vi.fn().mockReturnValue({ error: null }) + mockFrom.mockReturnValue({ insert: mockInsert }) + + const formData = new FormData() + formData.set("contact_email", "test@example.com") + + await addContact(formData) + expect(mockInsert).toHaveBeenCalledWith({ type: "email", email: "test@example.com" }) + }) }) describe("deleteContact action", () => { diff --git a/src/__tests__/notifications.test.ts b/src/__tests__/notifications.test.ts index 81e36f7..5925968 100644 --- a/src/__tests__/notifications.test.ts +++ b/src/__tests__/notifications.test.ts @@ -8,16 +8,24 @@ vi.mock("resend", () => ({ }, })) -import { sendIncidentAlert } from "@/lib/notifications" +// Mock Twilio +const mockCreate = vi.fn() +vi.mock("twilio", () => ({ + default: () => ({ + messages: { create: mockCreate }, + }), +})) + +import { sendIncidentEmail, sendIncidentSms } from "@/lib/notifications" -describe("sendIncidentAlert", () => { +describe("sendIncidentEmail", () => { beforeEach(() => { vi.clearAllMocks() mockSend.mockResolvedValue({ id: "email-1" }) }) test("sends email to all contacts with correct content", async () => { - await sendIncidentAlert({ + await sendIncidentEmail({ siteName: "Main Website", siteUrl: "https://example.com", error: "HTTP 503", @@ -37,7 +45,7 @@ describe("sendIncidentAlert", () => { }) test("does nothing when contactEmails is empty", async () => { - await sendIncidentAlert({ + await sendIncidentEmail({ siteName: "Main Website", siteUrl: "https://example.com", error: "HTTP 503", @@ -52,7 +60,7 @@ describe("sendIncidentAlert", () => { const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {}) mockSend.mockRejectedValue(new Error("API rate limit")) - await sendIncidentAlert({ + await sendIncidentEmail({ siteName: "Main Website", siteUrl: "https://example.com", error: "HTTP 503", @@ -68,7 +76,7 @@ describe("sendIncidentAlert", () => { }) test("works without error field", async () => { - await sendIncidentAlert({ + await sendIncidentEmail({ siteName: "Main Website", siteUrl: "https://example.com", error: null, @@ -80,3 +88,70 @@ describe("sendIncidentAlert", () => { expect(call.html).not.toContain("Error:") }) }) + +describe("sendIncidentSms", () => { + beforeEach(() => { + vi.clearAllMocks() + mockCreate.mockResolvedValue({ sid: "SM123" }) + process.env.TWILIO_FROM_NUMBER = "+10001112222" + }) + + test("sends SMS to all contacts with correct content", async () => { + await sendIncidentSms({ + siteName: "Main Website", + incidentId: "inc-1", + contactPhones: ["+15551234567", "+15559876543"], + }) + + expect(mockCreate).toHaveBeenCalledTimes(2) + const call1 = mockCreate.mock.calls[0][0] + expect(call1.to).toBe("+15551234567") + expect(call1.from).toBe("+10001112222") + expect(call1.body).toContain("[Down]") + expect(call1.body).toContain("Main Website") + expect(call1.body).toContain("/incidents/inc-1") + }) + + test("does nothing when contactPhones is empty", async () => { + await sendIncidentSms({ + siteName: "Main Website", + incidentId: "inc-1", + contactPhones: [], + }) + + expect(mockCreate).not.toHaveBeenCalled() + }) + + test("handles SMS send failure gracefully", async () => { + const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + mockCreate.mockRejectedValue(new Error("Twilio error")) + + await sendIncidentSms({ + siteName: "Main Website", + incidentId: "inc-1", + contactPhones: ["+15551234567"], + }) + + expect(consoleSpy).toHaveBeenCalledWith( + expect.stringContaining("Failed to send incident SMS"), + expect.any(Error) + ) + consoleSpy.mockRestore() + }) + + test("continues sending to remaining contacts if one fails", async () => { + const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + mockCreate + .mockRejectedValueOnce(new Error("Twilio error")) + .mockResolvedValueOnce({ sid: "SM456" }) + + await sendIncidentSms({ + siteName: "Main Website", + incidentId: "inc-1", + contactPhones: ["+15551111111", "+15552222222"], + }) + + expect(mockCreate).toHaveBeenCalledTimes(2) + consoleSpy.mockRestore() + }) +}) diff --git a/src/app/api/checks/run/route.ts b/src/app/api/checks/run/route.ts index d70f136..44266a0 100644 --- a/src/app/api/checks/run/route.ts +++ b/src/app/api/checks/run/route.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server' import { createAdminClient } from '@/lib/supabase/admin' import { checkSite, isSoftFailure } from '@/lib/checker' -import { sendIncidentAlert } from '@/lib/notifications' +import { sendIncidentEmail, sendIncidentSms } from '@/lib/notifications' export const maxDuration = 60 @@ -95,15 +95,29 @@ async function handleCheckRun(request: NextRequest) { if (incident) { const { data: contacts } = await supabase .from('contacts') - .select('email') - - await sendIncidentAlert({ - siteName: site.name, - siteUrl: site.url, - error, - incidentId: incident.id, - contactEmails: (contacts ?? []).map((c: { email: string }) => c.email), - }) + .select('type, email, phone') + + const emailContacts = (contacts ?? []) + .filter((c: { type: string }) => c.type === 'email') + .map((c: { email: string }) => c.email) + const smsContacts = (contacts ?? []) + .filter((c: { type: string }) => c.type === 'sms') + .map((c: { phone: string }) => c.phone) + + await Promise.all([ + sendIncidentEmail({ + siteName: site.name, + siteUrl: site.url, + error, + incidentId: incident.id, + contactEmails: emailContacts, + }), + sendIncidentSms({ + siteName: site.name, + incidentId: incident.id, + contactPhones: smsContacts, + }), + ]) } } } diff --git a/src/app/settings/actions.ts b/src/app/settings/actions.ts index 1fcab26..693306b 100644 --- a/src/app/settings/actions.ts +++ b/src/app/settings/actions.ts @@ -4,6 +4,8 @@ import { revalidatePath } from "next/cache" import { redirect } from "next/navigation" import { createClient } from "@/lib/supabase/server" +const E164_REGEX = /^\+[1-9]\d{1,14}$/ + export async function addContact(formData: FormData) { const supabase = await createClient() const { @@ -12,10 +14,19 @@ export async function addContact(formData: FormData) { if (!user) redirect("/login") - const email = formData.get("email") as string - if (!email) return + const type = (formData.get("contact_type") as string) || "email" + + if (type === "sms") { + const phone = formData.get("contact_phone") as string + if (!phone) return + if (!E164_REGEX.test(phone)) return + await supabase.from("contacts").insert({ type: "sms", phone }) + } else { + const email = formData.get("contact_email") as string + if (!email) return + await supabase.from("contacts").insert({ type: "email", email }) + } - await supabase.from("contacts").insert({ email }) revalidatePath("/settings") } diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx index 332138e..c2e5420 100644 --- a/src/app/settings/page.tsx +++ b/src/app/settings/page.tsx @@ -1,7 +1,8 @@ import { redirect } from "next/navigation" import { createClient } from "@/lib/supabase/server" import type { Contact, Invitation } from "@/lib/supabase/types" -import { addContact, deleteContact } from "./actions" +import { deleteContact } from "./actions" +import AddContactForm from "@/components/AddContactForm" import { sendInvitation, revokeInvitation } from "./invite-actions" import Link from "next/link" @@ -54,7 +55,7 @@ export default async function SettingsPage() { Contacts

- All contacts are notified by email when an incident is opened. + All contacts are notified when an incident is opened.