scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in SW-3476-use-separate-curity-client-for-service-tokens-for-partner-sas (pull request #2809)

Browse Source 
feat(SW-3476): add support for using different curity clients when creating service tokens

* fix(SW-3476): add support for using different curity clients when creating service tokens

* remove log statement


Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Joakim Jäderberg
2025-09-18 07:04:45 +00:00
parent 8661e5c348
commit 9620bfe76d
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/partner-sas/.env Normal file
View File

@@ -0,0 +1 @@
CURITY_CLIENT_SERVICE_SCOPES="profile_read, hotel, booking, package, availability"

2
apps/partner-sas/.gitignore vendored
View File

@@ -31,7 +31,7 @@ yarn-error.log*
.pnpm-debug.log* .pnpm-debug.log*
# env files (can opt-in for committing if needed) # env files (can opt-in for committing if needed)
.env* .env.*
# vercel # vercel
.vercel .vercel

1
apps/scandic-web/.env
View File

@@ -1,6 +1,7 @@
NEXTAUTH_DEBUG="false" NEXTAUTH_DEBUG="false"
DEBUG_QUERIES="false" DEBUG_QUERIES="false"
SEAMLESS_ENVIRONMENT_SUBDOMAIN="www" SEAMLESS_ENVIRONMENT_SUBDOMAIN="www"
CURITY_CLIENT_SERVICE_SCOPES="profile, hotel, booking, package, availability"
SEAMLESS_LOGIN="https://${SEAMLESS_ENVIRONMENT_SUBDOMAIN}.scandichotels.{topleveldomain}/updatelogin" SEAMLESS_LOGIN="https://${SEAMLESS_ENVIRONMENT_SUBDOMAIN}.scandichotels.{topleveldomain}/updatelogin"
SEAMLESS_LOGOUT="https://${SEAMLESS_ENVIRONMENT_SUBDOMAIN}.scandichotels.{topleveldomain}/updatelogout?newweb=1" SEAMLESS_LOGOUT="https://${SEAMLESS_ENVIRONMENT_SUBDOMAIN}.scandichotels.{topleveldomain}/updatelogout?newweb=1"

8
packages/common/env/server.ts vendored
View File

@@ -20,6 +20,13 @@ export const env = createEnv({
CURITY_ISSUER_USER: z.string(), CURITY_ISSUER_USER: z.string(),
CURITY_CLIENT_ID_SERVICE: z.string().default("scandichotels-web-backend"), CURITY_CLIENT_ID_SERVICE: z.string().default("scandichotels-web-backend"),
CURITY_CLIENT_SECRET_SERVICE: z.string(), CURITY_CLIENT_SECRET_SERVICE: z.string(),
CURITY_CLIENT_SERVICE_SCOPES: z.string().transform((val) =>
val
.split(",")
.map((s) => s.trim())
.filter(Boolean)
.toSorted()
),
}, },
emptyStringAsUndefined: true, emptyStringAsUndefined: true,
runtimeEnv: { runtimeEnv: {
@@ -31,5 +38,6 @@ export const env = createEnv({
CURITY_CLIENT_SECRET_SERVICE: process.env.CURITY_CLIENT_SECRET_SERVICE, CURITY_CLIENT_SECRET_SERVICE: process.env.CURITY_CLIENT_SECRET_SERVICE,
CURITY_ISSUER_USER: process.env.CURITY_ISSUER_USER, CURITY_ISSUER_USER: process.env.CURITY_ISSUER_USER,
CURITY_CLIENT_ID_SERVICE: process.env.CURITY_CLIENT_ID_SERVICE, CURITY_CLIENT_ID_SERVICE: process.env.CURITY_CLIENT_ID_SERVICE,
CURITY_CLIENT_SERVICE_SCOPES: process.env.CURITY_CLIENT_SERVICE_SCOPES,
}, },
}) })

2
packages/common/tokenManager/tokenManager.ts
View File

@@ -15,7 +15,7 @@ export async function getServiceToken() {
const tracer = trace.getTracer("getServiceToken") const tracer = trace.getTracer("getServiceToken")
return await tracer.startActiveSpan("getServiceToken", async () => { return await tracer.startActiveSpan("getServiceToken", async () => {
const scopes = ["profile", "hotel", "booking", "package", "availability"] const scopes = env.CURITY_CLIENT_SERVICE_SCOPES
const cacheKey = getServiceTokenCacheKey(scopes) const cacheKey = getServiceTokenCacheKey(scopes)
const cacheClient = await getCacheClient() const cacheClient = await getCacheClient()