Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1 * Move web to subfolder /apps/scandic-web * Yarn + transitive deps - Move to yarn - design-system package removed for now since yarn doesn't support the parameter for token (ie project currently broken) - Add missing transitive dependencies as Yarn otherwise prevents these imports - VS Code doesn't pick up TS path aliases unless you open /apps/scandic-web instead of root (will be fixed with monorepo) * Pin framer-motion to temporarily fix typing issue https://github.com/adobe/react-spectrum/issues/7494 * Pin zod to avoid typ error There seems to have been a breaking change in the types returned by zod where error is now returned as undefined instead of missing in the type. We should just handle this but to avoid merge conflicts just pin the dependency for now. * Pin react-intl version Pin version of react-intl to avoid tiny type issue where formatMessage does not accept a generic any more. This will be fixed in a future commit, but to avoid merge conflicts just pin for now. * Pin typescript version Temporarily pin version as newer versions as stricter and results in a type error. Will be fixed in future commit after merge. * Setup workspaces * Add design-system as a monorepo package * Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN * Fix husky for monorepo setup * Update netlify.toml * Add lint script to root package.json * Add stub readme * Fix react-intl formatMessage types * Test netlify.toml in root * Remove root toml * Update netlify.toml publish path * Remove package-lock.json * Update build for branch/preview builds Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
committed by
Linus Flood
Linus Flood
parent
667cab6fb6
commit
80100e7631
@@ -0,0 +1,2 @@
|
||||
export const SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME =
|
||||
"sas-x-scandic-request-otp-state"
|
||||
@@ -0,0 +1,17 @@
|
||||
import { cookies } from "next/headers"
|
||||
import { z } from "zod"
|
||||
|
||||
import { SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME } from "./constants"
|
||||
|
||||
const otpStateSchema = z.object({
|
||||
referenceId: z.string().uuid(),
|
||||
databaseUUID: z.string().uuid(),
|
||||
})
|
||||
|
||||
export type OtpState = z.infer<typeof otpStateSchema>
|
||||
|
||||
export function getOTPState() {
|
||||
const otpState = cookies().get(SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME)
|
||||
|
||||
return otpStateSchema.parse(JSON.parse(otpState?.value ?? "{}"))
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
import { TRPCError } from "@trpc/server"
|
||||
import { cookies } from "next/headers"
|
||||
import { v4 as uuidv4 } from "uuid"
|
||||
import { z } from "zod"
|
||||
|
||||
import { env } from "@/env/server"
|
||||
import { protectedProcedure } from "@/server/trpc"
|
||||
|
||||
import { getSasToken } from "../../getSasToken"
|
||||
import { SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME } from "../constants"
|
||||
import {
|
||||
parseSASRequestOtpError,
|
||||
type RequestOtpGeneralError,
|
||||
} from "./requestOtpError"
|
||||
|
||||
import type { OtpState } from "../getOTPState"
|
||||
|
||||
const inputSchema = z.object({})
|
||||
|
||||
const outputSchema = z.object({
|
||||
status: z.enum([
|
||||
"VERIFIED",
|
||||
"ABUSED",
|
||||
"EXPIRED",
|
||||
"PENDING",
|
||||
"RETRY",
|
||||
"SENT",
|
||||
"NULL",
|
||||
"NOTSENT",
|
||||
]),
|
||||
referenceId: z.string().uuid(),
|
||||
databaseUUID: z.string().uuid(),
|
||||
otpExpiration: z.number(),
|
||||
otpReceiver: z.string(),
|
||||
})
|
||||
|
||||
export const requestOtp = protectedProcedure
|
||||
.input(inputSchema)
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ ctx, input }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
|
||||
if (!sasAuthToken) {
|
||||
// TODO: Should we verify that the SAS token isn't expired?
|
||||
throw createError("AUTH_TOKEN_NOT_FOUND")
|
||||
}
|
||||
|
||||
const tokenResponse = await fetchRequestOtp({ sasAuthToken })
|
||||
console.log(
|
||||
"[SAS] requestOtp",
|
||||
tokenResponse.status,
|
||||
tokenResponse.statusText
|
||||
)
|
||||
|
||||
const body = await tokenResponse.json()
|
||||
const parseResult = outputSchema.safeParse(body)
|
||||
if (!parseResult.success) {
|
||||
console.error("[SAS] requestOtp error", body)
|
||||
|
||||
if (!tokenResponse.ok) {
|
||||
throw createError(body)
|
||||
}
|
||||
throw createError(parseResult.error)
|
||||
}
|
||||
|
||||
setSASOtpCookie(parseResult.data)
|
||||
|
||||
return parseResult.data
|
||||
})
|
||||
|
||||
function createError(
|
||||
errorBody:
|
||||
| {
|
||||
status: string
|
||||
error: string
|
||||
errorCode: number
|
||||
databaseUUID: string
|
||||
}
|
||||
| Error
|
||||
| RequestOtpGeneralError
|
||||
): TRPCError {
|
||||
const errorInfo = parseSASRequestOtpError(errorBody)
|
||||
console.error("[SAS] createError", errorInfo)
|
||||
return new TRPCError({
|
||||
code: "BAD_REQUEST",
|
||||
cause: errorInfo,
|
||||
})
|
||||
}
|
||||
|
||||
async function fetchRequestOtp({ sasAuthToken }: { sasAuthToken: string }) {
|
||||
const endpoint = `${env.SAS_API_ENDPOINT}/api/scandic-partnership/customer/send-otp`
|
||||
|
||||
console.log("[SAS]: Requesting OTP")
|
||||
|
||||
return await fetch(endpoint, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"Ocp-Apim-Subscription-Key": env.SAS_OCP_APIM,
|
||||
Authorization: `Bearer ${sasAuthToken}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
referenceId: uuidv4(),
|
||||
}),
|
||||
})
|
||||
}
|
||||
|
||||
function setSASOtpCookie({
|
||||
referenceId,
|
||||
databaseUUID,
|
||||
}: {
|
||||
referenceId: string
|
||||
databaseUUID: string
|
||||
}) {
|
||||
cookies().set(
|
||||
SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME,
|
||||
JSON.stringify({
|
||||
referenceId: referenceId,
|
||||
databaseUUID: databaseUUID,
|
||||
} satisfies OtpState),
|
||||
{
|
||||
httpOnly: true,
|
||||
maxAge: 3600,
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
import { describe, expect, it } from "@jest/globals"
|
||||
|
||||
import { parseSASRequestOtpError } from "./requestOtpError"
|
||||
|
||||
describe("requestOtpError", () => {
|
||||
it("parses error with invalid error code", () => {
|
||||
const actual = parseSASRequestOtpError({
|
||||
status: "status",
|
||||
error: "error",
|
||||
errorCode: "a" as unknown as number,
|
||||
databaseUUID: "9ffefefe-df0e-4229-9792-5ed31bef1db4",
|
||||
} as any)
|
||||
expect(actual).toEqual({
|
||||
errorCode: "UNKNOWN",
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,70 @@
|
||||
import { z } from "zod"
|
||||
|
||||
export type RequestOtpResponseError = "TOO_MANY_REQUESTS" | "UNKNOWN"
|
||||
|
||||
const requestOtpGeneralError = z.enum([
|
||||
"AUTH_TOKEN_EXPIRED",
|
||||
"AUTH_TOKEN_NOT_FOUND",
|
||||
"UNKNOWN",
|
||||
])
|
||||
export type RequestOtpGeneralError = z.infer<typeof requestOtpGeneralError>
|
||||
|
||||
export type RequestOtpError = {
|
||||
errorCode: RequestOtpResponseError | RequestOtpGeneralError
|
||||
}
|
||||
export function parseSASRequestOtpError(
|
||||
error: SasOtpRequestError | {}
|
||||
): RequestOtpError {
|
||||
const parseResult = sasOtpRequestErrorSchema.safeParse(error)
|
||||
if (!parseResult.success) {
|
||||
const generalErrorResult = requestOtpGeneralError.safeParse(error)
|
||||
if (!generalErrorResult.success) {
|
||||
return {
|
||||
errorCode: "UNKNOWN",
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
errorCode: generalErrorResult.data,
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
errorCode: getErrorCodeByNumber(parseResult.data.errorCode),
|
||||
}
|
||||
}
|
||||
|
||||
const SAS_REQUEST_OTP_ERROR_CODES: {
|
||||
[key in Exclude<RequestOtpResponseError, "UNKNOWN">]: number
|
||||
} = {
|
||||
TOO_MANY_REQUESTS: 10,
|
||||
}
|
||||
|
||||
const getErrorCodeByNumber = (number: number): RequestOtpResponseError => {
|
||||
const v =
|
||||
Object.entries(SAS_REQUEST_OTP_ERROR_CODES).find(
|
||||
([_, value]) => value === number
|
||||
)?.[0] ?? "UNKNOWN"
|
||||
|
||||
console.log("[SAS] getErrorCodeByNumber", number, v)
|
||||
return v as RequestOtpResponseError
|
||||
}
|
||||
|
||||
const sasOtpRequestErrorSchema = z.object({
|
||||
status: z.enum([
|
||||
"VERIFIED",
|
||||
"ABUSED",
|
||||
"EXPIRED",
|
||||
"PENDING",
|
||||
"RETRY",
|
||||
"SENT",
|
||||
"NULL",
|
||||
"NOTSENT",
|
||||
]),
|
||||
otpExpiration: z.string().datetime(),
|
||||
error: z.string(),
|
||||
errorCode: z.number(),
|
||||
databaseUUID: z.string().uuid(),
|
||||
})
|
||||
|
||||
export type SasOtpRequestError = z.infer<typeof sasOtpRequestErrorSchema>
|
||||
@@ -0,0 +1,111 @@
|
||||
import { TRPCError } from "@trpc/server"
|
||||
import { z } from "zod"
|
||||
|
||||
import { env } from "@/env/server"
|
||||
import { protectedProcedure } from "@/server/trpc"
|
||||
|
||||
import { getSasToken } from "../../getSasToken"
|
||||
import { getOTPState } from "../getOTPState"
|
||||
import {
|
||||
parseSASVerifyOtpError,
|
||||
type VerifyOtpGeneralError,
|
||||
} from "./verifyOtpError"
|
||||
|
||||
const inputSchema = z.object({
|
||||
otp: z.string(),
|
||||
})
|
||||
|
||||
const outputSchema = z.object({
|
||||
status: z.enum([
|
||||
"VERIFIED",
|
||||
"ABUSED",
|
||||
"EXPIRED",
|
||||
"PENDING",
|
||||
"RETRY",
|
||||
"SENT",
|
||||
"NULL",
|
||||
"NOTSENT",
|
||||
]),
|
||||
referenceId: z.string().uuid().optional(),
|
||||
databaseUUID: z.string().uuid().optional(),
|
||||
})
|
||||
|
||||
export const verifyOtp = protectedProcedure
|
||||
.input(inputSchema)
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ input }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
|
||||
if (!sasAuthToken) {
|
||||
throw createError("AUTH_TOKEN_NOT_FOUND")
|
||||
}
|
||||
|
||||
const verifyResponse = await fetchVerifyOtp(input)
|
||||
console.log(
|
||||
"[SAS] verifyOTP",
|
||||
verifyResponse.status,
|
||||
verifyResponse.statusText
|
||||
)
|
||||
|
||||
if (verifyResponse.status > 499) {
|
||||
console.error("[SAS] verifyOTP error", await verifyResponse.text())
|
||||
throw new TRPCError({
|
||||
code: "SERVICE_UNAVAILABLE",
|
||||
message: "Error from downstream SAS service",
|
||||
})
|
||||
}
|
||||
|
||||
const data = await verifyResponse.json()
|
||||
console.log("[SAS] verifyOTP data", data)
|
||||
const result = outputSchema.safeParse(data)
|
||||
if (!result.success) {
|
||||
console.error("[SAS] verifyOTP error", result.error)
|
||||
throw createError(data)
|
||||
}
|
||||
|
||||
console.log("[SAS] verifyOTP success")
|
||||
console.log("[SAS] verifyOTP responding", result.data)
|
||||
|
||||
return result.data
|
||||
})
|
||||
|
||||
async function fetchVerifyOtp(input: z.infer<typeof inputSchema>) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const { referenceId, databaseUUID } = getOTPState()
|
||||
|
||||
return await fetch(
|
||||
`${env.SAS_API_ENDPOINT}/api/scandic-partnership/customer/verify-otp`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"Ocp-Apim-Subscription-Key": env.SAS_OCP_APIM,
|
||||
Authorization: `Bearer ${sasAuthToken}`,
|
||||
},
|
||||
body: JSON.stringify({
|
||||
referenceId: referenceId,
|
||||
otpCode: input.otp,
|
||||
databaseUUID: databaseUUID,
|
||||
}),
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
function createError(
|
||||
errorBody:
|
||||
| {
|
||||
status: string
|
||||
error: string
|
||||
errorCode: number
|
||||
databaseUUID: string
|
||||
}
|
||||
| Error
|
||||
| VerifyOtpGeneralError
|
||||
): TRPCError {
|
||||
const errorInfo = parseSASVerifyOtpError(errorBody)
|
||||
|
||||
return new TRPCError({
|
||||
code: "BAD_REQUEST",
|
||||
cause: errorInfo,
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import { describe, expect, it } from "@jest/globals"
|
||||
|
||||
import { parseSASVerifyOtpError } from "./verifyOtpError"
|
||||
|
||||
describe("verifyOtpError", () => {
|
||||
it("parses error with invalid error code", () => {
|
||||
const error = {
|
||||
status: "status",
|
||||
error: "error",
|
||||
errorCode: "a",
|
||||
databaseUUID: "9ffefefe-df0e-4229-9792-5ed31bef1db4",
|
||||
}
|
||||
|
||||
const actual = parseSASVerifyOtpError({
|
||||
status: "status",
|
||||
error: "error",
|
||||
errorCode: "a" as unknown as number,
|
||||
databaseUUID: "9ffefefe-df0e-4229-9792-5ed31bef1db4",
|
||||
} as any)
|
||||
expect(actual).toEqual({
|
||||
errorCode: "UNKNOWN",
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,57 @@
|
||||
import { z } from "zod"
|
||||
|
||||
export type VerifyOtpResponseError = "OTP_EXPIRED" | "WRONG_OTP" | "UNKNOWN"
|
||||
|
||||
const VerifyOtpGeneralError = z.enum(["AUTH_TOKEN_NOT_FOUND", "UNKNOWN"])
|
||||
export type VerifyOtpGeneralError = z.infer<typeof VerifyOtpGeneralError>
|
||||
|
||||
export type VerifyOtpError = {
|
||||
errorCode: VerifyOtpResponseError | VerifyOtpGeneralError
|
||||
}
|
||||
export function parseSASVerifyOtpError(
|
||||
error: SasOtpVerifyError | {}
|
||||
): VerifyOtpError {
|
||||
const parseResult = sasOtpVerifyErrorSchema.safeParse(error)
|
||||
if (!parseResult.success) {
|
||||
const generalErrorResult = VerifyOtpGeneralError.safeParse(error)
|
||||
if (!generalErrorResult.success) {
|
||||
return {
|
||||
errorCode: "UNKNOWN",
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
errorCode: generalErrorResult.data,
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
errorCode: getErrorCodeByNumber(parseResult.data.errorCode),
|
||||
}
|
||||
}
|
||||
|
||||
const SAS_VERIFY_OTP_ERROR_CODES: {
|
||||
[key in Exclude<VerifyOtpResponseError, "UNKNOWN">]: number
|
||||
} = {
|
||||
OTP_EXPIRED: 1,
|
||||
WRONG_OTP: 2,
|
||||
}
|
||||
|
||||
const getErrorCodeByNumber = (number: number): VerifyOtpResponseError => {
|
||||
const v =
|
||||
Object.entries(SAS_VERIFY_OTP_ERROR_CODES).find(
|
||||
([_, value]) => value === number
|
||||
)?.[0] ?? "UNKNOWN"
|
||||
|
||||
return v as VerifyOtpResponseError
|
||||
}
|
||||
|
||||
const sasOtpVerifyErrorSchema = z.object({
|
||||
status: z.string(),
|
||||
otpExpiration: z.string().datetime(),
|
||||
error: z.string(),
|
||||
errorCode: z.number(),
|
||||
databaseUUID: z.string().uuid(),
|
||||
})
|
||||
|
||||
export type SasOtpVerifyError = z.infer<typeof sasOtpVerifyErrorSchema>
|
||||
Reference in New Issue
Block a user