Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15 * wip: apply codemod and upgrade swc plugin * wip: design-system to react 19, fix issues from async (search)params * wip: fix remaining issues from codemod serverClient is now async because context use headers() getLang is now async because it uses headers() * Minor cleanup * Inline react-material-symbols package Package is seemingly not maintained any more and doesn't support React 19. This copies the package source into `design-system`, makes the necessary changes for 19 and export it for others to use. * Fix missing awaits * Disable modal exit animations Enabling modal exit animations via isExiting prop is causing modals to be rendered in "hidden" state and never unmount. Seems to be an issue with react-aria-components, see https://github.com/adobe/react-spectrum/issues/7563. Can probably be fixed by rewriting to a solution similar to https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html * Remove unstable cache implementation and use in memory cache locally * Fix ref type in SelectFilter * Use cloneElement to add key prop to element Approved-by: Linus Flood
This commit is contained in:
@@ -38,12 +38,12 @@ export function createContextInner(opts: CreateContextOptions) {
|
||||
* This is the actual context you'll use in your router
|
||||
* @link https://trpc.io/docs/context
|
||||
**/
|
||||
export const createContext = cache(function () {
|
||||
const h = headers()
|
||||
export const createContext = cache(async function () {
|
||||
const headersList = await headers()
|
||||
|
||||
const cookie = cookies()
|
||||
const cookie = await cookies()
|
||||
const webviewTokenCookie = cookie.get("webviewToken")
|
||||
const loginType = h.get("loginType")
|
||||
const loginType = headersList.get("loginType")
|
||||
|
||||
return createContextInner({
|
||||
auth: async () => {
|
||||
@@ -60,13 +60,13 @@ export const createContext = cache(function () {
|
||||
} as Session)
|
||||
)
|
||||
},
|
||||
lang: h.get("x-lang") as Lang,
|
||||
pathname: h.get("x-pathname")!,
|
||||
uid: h.get("x-uid"),
|
||||
url: h.get("x-url")!,
|
||||
lang: headersList.get("x-lang") as Lang,
|
||||
pathname: headersList.get("x-pathname")!,
|
||||
uid: headersList.get("x-uid"),
|
||||
url: headersList.get("x-url")!,
|
||||
webToken: webviewTokenCookie?.value,
|
||||
contentType: h.get("x-contenttype")!,
|
||||
contentType: headersList.get("x-contenttype")!,
|
||||
})
|
||||
})
|
||||
|
||||
export type Context = ReturnType<typeof createContext>
|
||||
export type Context = Awaited<ReturnType<typeof createContext>>
|
||||
|
||||
@@ -2,8 +2,8 @@ import { cookies } from "next/headers"
|
||||
|
||||
import { SAS_TOKEN_STORAGE_KEY } from "@/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/sasUtils"
|
||||
|
||||
export function getSasToken() {
|
||||
const cookieStore = cookies()
|
||||
export async function getSasToken() {
|
||||
const cookieStore = await cookies()
|
||||
const tokenCookie = cookieStore.get(SAS_TOKEN_STORAGE_KEY)
|
||||
const sasAuthToken = tokenCookie?.value
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ const outputSchema = z.object({
|
||||
export const linkAccount = protectedProcedure
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ ctx }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const { referenceId } = getOTPState()
|
||||
const sasAuthToken = await getSasToken()
|
||||
const { referenceId } = await getOTPState()
|
||||
|
||||
console.log("[SAS] link account")
|
||||
|
||||
|
||||
@@ -10,8 +10,9 @@ const otpStateSchema = z.object({
|
||||
|
||||
export type OtpState = z.infer<typeof otpStateSchema>
|
||||
|
||||
export function getOTPState() {
|
||||
const otpState = cookies().get(SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME)
|
||||
export async function getOTPState() {
|
||||
const cookieStore = await cookies()
|
||||
const otpState = cookieStore.get(SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME)
|
||||
|
||||
return otpStateSchema.parse(JSON.parse(otpState?.value ?? "{}"))
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ const outputSchema = z.union([successSchema, failureSchema])
|
||||
export const requestOtp = protectedProcedure
|
||||
.output(outputSchema)
|
||||
.mutation(async function () {
|
||||
const sasAuthToken = getSasToken()
|
||||
const sasAuthToken = await getSasToken()
|
||||
|
||||
if (!sasAuthToken) {
|
||||
throw createError("AUTH_TOKEN_NOT_FOUND")
|
||||
@@ -113,14 +113,15 @@ async function fetchRequestOtp({ sasAuthToken }: { sasAuthToken: string }) {
|
||||
})
|
||||
}
|
||||
|
||||
function setSASOtpCookie({
|
||||
async function setSASOtpCookie({
|
||||
referenceId,
|
||||
databaseUUID,
|
||||
}: {
|
||||
referenceId: string
|
||||
databaseUUID: string
|
||||
}) {
|
||||
cookies().set(
|
||||
const cookieStore = await cookies()
|
||||
cookieStore.set(
|
||||
SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME,
|
||||
JSON.stringify({
|
||||
referenceId: referenceId,
|
||||
|
||||
@@ -34,7 +34,7 @@ export const verifyOtp = protectedProcedure
|
||||
.input(inputSchema)
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ input }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const sasAuthToken = await getSasToken()
|
||||
|
||||
if (!sasAuthToken) {
|
||||
throw createError("AUTH_TOKEN_NOT_FOUND")
|
||||
@@ -70,8 +70,8 @@ export const verifyOtp = protectedProcedure
|
||||
})
|
||||
|
||||
async function fetchVerifyOtp(input: z.infer<typeof inputSchema>) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const { referenceId, databaseUUID } = getOTPState()
|
||||
const sasAuthToken = await getSasToken()
|
||||
const { referenceId, databaseUUID } = await getOTPState()
|
||||
|
||||
return await fetch(
|
||||
`${env.SAS_API_ENDPOINT}/api/scandic-partnership/customer/verify-otp`,
|
||||
|
||||
@@ -24,7 +24,7 @@ const outputSchema = z.union([matchedSchema, notMatchedSchema])
|
||||
export const performLevelUpgrade = protectedProcedure
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ ctx }) {
|
||||
const cookieStore = cookies()
|
||||
const cookieStore = await cookies()
|
||||
const sasTierMatch = cookieStore.get("sasTierMatch")
|
||||
if (sasTierMatch) {
|
||||
return { tierMatchState: "cached" }
|
||||
|
||||
@@ -17,7 +17,7 @@ export const transferPoints = protectedProcedure
|
||||
.output(outputSchema)
|
||||
.input(transferPointsInputSchema)
|
||||
.mutation(async function ({ ctx, input }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const sasAuthToken = await getSasToken()
|
||||
|
||||
console.log("[SAS] transfer points")
|
||||
console.log({ sasAuthToken })
|
||||
|
||||
@@ -13,8 +13,8 @@ const outputSchema = z.object({
|
||||
export const unlinkAccount = protectedProcedure
|
||||
.output(outputSchema)
|
||||
.mutation(async function ({ ctx }) {
|
||||
const sasAuthToken = getSasToken()
|
||||
const { referenceId } = getOTPState()
|
||||
const sasAuthToken = await getSasToken()
|
||||
const { referenceId } = await getOTPState()
|
||||
|
||||
const apiResponse = await api.post(api.endpoints.v1.Profile.unlink, {
|
||||
headers: {
|
||||
|
||||
Reference in New Issue
Block a user