Skip to content

enhance: add issuer and scope to signJWT, app origins for everything #4903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rschlaefli merged 22 commits into from
Sep 14, 2025
Merged

enhance: add issuer and scope to signJWT, app origins for everything #4903

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ec51826
add issuers to all sign calls
rschlaefli Sep 13, 2025
2e3d18c
remove legacy issuedAt param, reduce length of impersonation tokens
rschlaefli Sep 13, 2025
f278dbd
EDUID as a new user login scope and set on next auth login
rschlaefli Sep 13, 2025
95be09e
JWT issuers in apps and deploy
rschlaefli Sep 13, 2025
82a0ed9
updates
rschlaefli Sep 13, 2025
8f60313
updates
rschlaefli Sep 13, 2025
a69cd59
deployment config and env vars
rschlaefli Sep 13, 2025
af8a875
add issuers to tests
rschlaefli Sep 13, 2025
655a011
Merge branch 'v3-assessment' of https://github.com/uzh-bf/klicker-uzh…
rschlaefli Sep 13, 2025
4c8160d
always set issuedAt
rschlaefli Sep 13, 2025
c4100e9
Add all issuers to all relevant apps for verification purposes (asses…
rschlaefli Sep 13, 2025
1234695
cypress issuers
rschlaefli Sep 14, 2025
f6202eb
Merge branch 'v3-assessment' of https://github.com/uzh-bf/klicker-uzh…
rschlaefli Sep 14, 2025
fda3434
lockfile
rschlaefli Sep 14, 2025
d0fe09f
Merge branch 'jwt-issuer-v2' of https://github.com/uzh-bf/klicker-uzh…
rschlaefli Sep 14, 2025
4457480
app origins
rschlaefli Sep 14, 2025
de1141e
Merge branch 'v3-assessment' of https://github.com/uzh-bf/klicker-uzh…
rschlaefli Sep 14, 2025
9e2c449
add all issuers to all configs
rschlaefli Sep 14, 2025
859e294
fix backend-sls
rschlaefli Sep 14, 2025
b708a50
more consistency fixes
rschlaefli Sep 14, 2025
e1e6783
prisma doppler commands
rschlaefli Sep 14, 2025
f085a54
Merge branch 'v3-assessment' of https://github.com/uzh-bf/klicker-uzh…
rschlaefli Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/cypress-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,15 @@ jobs:
SERVICE_ENDPOINTS: 'http://127.0.0.1:3000/healthz http://127.0.0.1:3001 http://127.0.0.1:3002 http://127.0.0.1:3003 http://127.0.0.1:3010'
TIMEOUT_SECONDS: '300'
CHECK_INTERVAL: '5'
# Provide all app origins to the services and tests
APP_ORIGIN_API: http://127.0.0.1:3000
APP_ORIGIN_AUTH: http://127.0.0.1:3010
APP_ORIGIN_LTI: http://127.0.0.1:3005
APP_ORIGIN_PWA: http://127.0.0.1:3001
APP_ORIGIN_MANAGE: http://127.0.0.1:3002
APP_ORIGIN_CONTROL: http://127.0.0.1:3003
APP_ORIGIN_ASSESSMENT_API: http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA: http://127.0.0.1:3001

- name: Cypress run parallel with cypress-split
uses: cypress-io/github-action@v6
Expand All @@ -190,6 +199,15 @@ jobs:
HATCHET_API_URL: http://127.0.0.1:8888
HATCHET_TENANT_ID: 707d0855-80ab-4e1f-a156-f1c4546cbf52
HATCHET_HOST_PORT: 7077
# Ensure Cypress process has all origins, too
APP_ORIGIN_API: http://127.0.0.1:3000
APP_ORIGIN_AUTH: http://127.0.0.1:3010
APP_ORIGIN_LTI: http://127.0.0.1:3005
APP_ORIGIN_PWA: http://127.0.0.1:3001
APP_ORIGIN_MANAGE: http://127.0.0.1:3002
APP_ORIGIN_CONTROL: http://127.0.0.1:3003
APP_ORIGIN_ASSESSMENT_API: http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA: http://127.0.0.1:3001
SPLIT: ${{ strategy.job-total }}
SPLIT_INDEX: ${{ strategy.job-index }}
SPLIT_FILE: timings.json
Expand Down Expand Up @@ -345,6 +363,15 @@ jobs:
SERVICE_ENDPOINTS: 'http://127.0.0.1:3000/healthz http://127.0.0.1:3001 http://127.0.0.1:3002 http://127.0.0.1:3003 http://127.0.0.1:3010'
TIMEOUT_SECONDS: '300'
CHECK_INTERVAL: '5'
# Provide all app origins to the services and tests
APP_ORIGIN_API: http://127.0.0.1:3000
APP_ORIGIN_AUTH: http://127.0.0.1:3010
APP_ORIGIN_LTI: http://127.0.0.1:3005
APP_ORIGIN_PWA: http://127.0.0.1:3001
APP_ORIGIN_MANAGE: http://127.0.0.1:3002
APP_ORIGIN_CONTROL: http://127.0.0.1:3003
APP_ORIGIN_ASSESSMENT_API: http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA: http://127.0.0.1:3001

- name: Upload service logs
if: always()
Expand Down Expand Up @@ -377,6 +404,15 @@ jobs:
HATCHET_API_URL: http://127.0.0.1:8888
HATCHET_TENANT_ID: 707d0855-80ab-4e1f-a156-f1c4546cbf52
HATCHET_HOST_PORT: 7077
# Ensure Cypress process has all origins, too
APP_ORIGIN_API: http://127.0.0.1:3000
APP_ORIGIN_AUTH: http://127.0.0.1:3010
APP_ORIGIN_LTI: http://127.0.0.1:3005
APP_ORIGIN_PWA: http://127.0.0.1:3001
APP_ORIGIN_MANAGE: http://127.0.0.1:3002
APP_ORIGIN_CONTROL: http://127.0.0.1:3003
APP_ORIGIN_ASSESSMENT_API: http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA: http://127.0.0.1:3001

- if: always()
uses: actions/upload-artifact@v4
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test-graphql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,12 @@ jobs:
HATCHET_API_URL: http://localhost:8888
HATCHET_TENANT_ID: 707d0855-80ab-4e1f-a156-f1c4546cbf52
HATCHET_HOST_PORT: 7077
# Provide all app origins for consistency
APP_ORIGIN_API: http://api.klicker.com
APP_ORIGIN_AUTH: http://auth.klicker.com
APP_ORIGIN_LTI: http://lti.klicker.com
APP_ORIGIN_PWA: http://pwa.klicker.com
APP_ORIGIN_MANAGE: http://manage.klicker.com
APP_ORIGIN_CONTROL: http://control.klicker.com
APP_ORIGIN_ASSESSMENT_API: http://assessment-api.klicker.com
APP_ORIGIN_ASSESSMENT_PWA: http://assessment.klicker.com
25 changes: 20 additions & 5 deletions apps/auth/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
COOKIE_DOMAIN=.klicker.com
NEXTAUTH_URL=https://auth.klicker.com
EDUID_CLIENT_ID=uzh_klicker_auth_dev
EDUID_WELL_KNOWN=https://login.test.eduid.ch/.well-known/openid-configuration
NEXT_PUBLIC_EDUID_ID=eduid-test
NEXT_PUBLIC_DEFAULT_REDIRECT=https://manage.klicker.com
NEXT_PUBLIC_AUTH_URL=https://auth.klicker.com
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker.com"
NEXT_PUBLIC_ASSESSMENT_URL="https://assessment.klicker.com"

APP_ORIGIN_API=https://api.klicker.com
APP_ORIGIN_PWA=https://pwa.klicker.com
APP_ORIGIN_MANAGE=https://manage.klicker.com
APP_ORIGIN_CONTROL=https://control.klicker.com
APP_ORIGIN_LTI=https://lti.klicker.com
APP_ORIGIN_AUTH=https://auth.klicker.com
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker.com
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker.com

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API

NEXTAUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_DEFAULT_REDIRECT=$APP_ORIGIN_MANAGE
25 changes: 20 additions & 5 deletions apps/auth/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
COOKIE_DOMAIN=.klicker.uzh.ch
NEXTAUTH_URL=https://auth.klicker.uzh.ch
EDUID_CLIENT_ID=uzh_klicker_auth
EDUID_WELL_KNOWN=https://login.eduid.ch/.well-known/openid-configuration
NEXT_PUBLIC_EDUID_ID=eduid
NEXT_PUBLIC_DEFAULT_REDIRECT=https://manage.klicker.uzh.ch
NEXT_PUBLIC_AUTH_URL=https://auth.klicker.uzh.ch
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker.uzh.ch"
NEXT_PUBLIC_ASSESSMENT_URL="https://assessment.klicker.uzh.ch"

APP_ORIGIN_API=https://backend-sls.klicker.uzh.ch
APP_ORIGIN_PWA=https://pwa.klicker.uzh.ch
APP_ORIGIN_MANAGE=https://manage.klicker.uzh.ch
APP_ORIGIN_CONTROL=https://control.klicker.uzh.ch
APP_ORIGIN_LTI=https://lti.klicker.uzh.ch
APP_ORIGIN_AUTH=https://auth.klicker.uzh.ch
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker.uzh.ch
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker.uzh.ch

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API

NEXTAUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_DEFAULT_REDIRECT=$APP_ORIGIN_MANAGE
Comment thread
rschlaefli marked this conversation as resolved.
Outdated
25 changes: 20 additions & 5 deletions apps/auth/.env.qa
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
COOKIE_DOMAIN=.klicker-qa.bf-app.ch
NEXTAUTH_URL=https://auth.klicker-qa.bf-app.ch
EDUID_CLIENT_ID=uzh_klicker_auth_stg
EDUID_WELL_KNOWN=https://login.eduid.ch/.well-known/openid-configuration
NEXT_PUBLIC_EDUID_ID=eduid
NEXT_PUBLIC_DEFAULT_REDIRECT=https://manage.klicker-qa.bf-app.ch
NEXT_PUBLIC_AUTH_URL=https://auth.klicker-qa.bf-app.ch
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker-qa.bf-app.ch"
NEXT_PUBLIC_ASSESSMENT_URL="https://assessment.klicker-qa.bf-app.ch"

APP_ORIGIN_API=https://api.klicker-qa.bf-app.ch
APP_ORIGIN_PWA=https://pwa.klicker-qa.bf-app.ch
APP_ORIGIN_MANAGE=https://manage.klicker-qa.bf-app.ch
APP_ORIGIN_CONTROL=https://control.klicker-qa.bf-app.ch
APP_ORIGIN_LTI=https://lti.klicker-qa.bf-app.ch
APP_ORIGIN_AUTH=https://auth.klicker-qa.bf-app.ch
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker-qa.bf-app.ch
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker-qa.bf-app.ch

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API

NEXTAUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_DEFAULT_REDIRECT=$APP_ORIGIN_MANAGE
23 changes: 20 additions & 3 deletions apps/auth/.env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
COOKIE_DOMAIN=127.0.0.1
NEXTAUTH_URL=http://127.0.0.1:3010
EDUID_CLIENT_ID=uzh_klicker_auth_dev
EDUID_WELL_KNOWN=https://login.test.eduid.ch/.well-known/openid-configuration
NEXT_PUBLIC_EDUID_ID=eduid-test
NEXT_PUBLIC_DEFAULT_REDIRECT=http://127.0.0.1:3002
DATABASE_URL=postgres://klicker-prod:klicker@localhost:5432/klicker-prod
APP_SECRET=abcd
NEXT_PUBLIC_AUTH_URL=http://127.0.0.1:3010

APP_ORIGIN_API=http://127.0.0.1:3000
APP_ORIGIN_PWA=http://127.0.0.1:3001
APP_ORIGIN_MANAGE=http://127.0.0.1:3002
APP_ORIGIN_CONTROL=http://127.0.0.1:3003
APP_ORIGIN_LTI=http://127.0.0.1:4000
APP_ORIGIN_AUTH=http://127.0.0.1:3010
APP_ORIGIN_ASSESSMENT_API=http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA=http://127.0.0.1:3001

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API

NEXTAUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_DEFAULT_REDIRECT=$APP_ORIGIN_MANAGE
13 changes: 12 additions & 1 deletion apps/auth/src/pages/api/auth/[...nextauth].ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ export const PARTICIPANT_COOKIE_NAME = 'next-auth.participant-session-token'
// Export for discourse.ts and other consumers
export const APP_SECRET = process.env.APP_SECRET

// Validate required environment variables
if (!process.env.APP_ORIGIN_AUTH) {
console.error('APP_ORIGIN_AUTH is required but not defined')
process.exit(1)
}

Comment thread
rschlaefli marked this conversation as resolved.
// Stateless context detection - no persistent cookies, URL and referrer based only
function getAuthContext(req: NextApiRequest): 'lecturer' | 'participant' {
const { participant, nextauth } = req.query
Expand Down Expand Up @@ -130,7 +136,10 @@ export async function decode({ token, secret }: JWTDecodeParams) {

export async function encode({ token, secret }: JWTEncodeParams) {
const secretString = typeof secret === 'string' ? secret : secret.toString()
return signJWT((token as JWTPayload) ?? {}, secretString)

return signJWT((token as JWTPayload) ?? {}, secretString, {
issuer: process.env.APP_ORIGIN_AUTH,
})
}

function extractProviderFromAffiliationId(
Expand Down Expand Up @@ -615,6 +624,8 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
},

async jwt({ token, profile }) {
token.scope = 'EDUID'

// Handle initial sign-in with participant profile
if (profile && (profile as any).participantId) {
token.sub = (profile as any).participantId
Expand Down
11 changes: 11 additions & 0 deletions apps/backend-docker/.env.cypress
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,14 @@ APP_MANAGE_SUBDOMAIN="127.0.0.1:3002"
APP_CONTROL_SUBDOMAIN="127.0.0.1:3003"
HATCHET_CLIENT_TOKEN=__HATCHET_CLIENT_TOKEN__
HATCHET_CLIENT_TLS_STRATEGY=none
# Legacy issuer vars no longer used; prefer APP_ORIGIN_*

# Canonical app origins (prefer these; issuers fall back to them)
APP_ORIGIN_AUTH="http://127.0.0.1:3010"
APP_ORIGIN_API="http://127.0.0.1:3000"
APP_ORIGIN_LTI="http://127.0.0.1:4000"
APP_ORIGIN_PWA="http://127.0.0.1:3001"
APP_ORIGIN_MANAGE="http://127.0.0.1:3002"
APP_ORIGIN_CONTROL="http://127.0.0.1:3003"
APP_ORIGIN_ASSESSMENT_API="http://127.0.0.1:3000"
APP_ORIGIN_ASSESSMENT_PWA="http://127.0.0.1:3001"
11 changes: 11 additions & 0 deletions apps/backend-docker/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,14 @@ APP_MANAGE_SUBDOMAIN="127.0.0.1:3002"
APP_CONTROL_SUBDOMAIN="127.0.0.1:3003"
HATCHET_CLIENT_TOKEN=__HATCHET_CLIENT_TOKEN__
HATCHET_CLIENT_TLS_STRATEGY=none
# Legacy issuer vars no longer used; prefer APP_ORIGIN_*

# Canonical app origins (prefer these; issuers fall back to them)
APP_ORIGIN_AUTH="http://127.0.0.1:3010"
APP_ORIGIN_API="http://127.0.0.1:3000"
APP_ORIGIN_LTI="http://127.0.0.1:4000"
APP_ORIGIN_PWA="http://127.0.0.1:3001"
APP_ORIGIN_MANAGE="http://127.0.0.1:3002"
APP_ORIGIN_CONTROL="http://127.0.0.1:3003"
APP_ORIGIN_ASSESSMENT_API="http://127.0.0.1:3000"
APP_ORIGIN_ASSESSMENT_PWA="http://127.0.0.1:3001"
Comment on lines +17 to +25
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Sep 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Same nits as cypress env: prefer APP_ORIGIN_ as SSoT and unquote.*

  • Consider commenting out legacy API_DOMAIN/APP_*_SUBDOMAIN here too (if unused).
  • Remove quotes and optionally sort.
-APP_ORIGIN_AUTH="http://127.0.0.1:3010"
-APP_ORIGIN_API="http://127.0.0.1:3000"
-APP_ORIGIN_LTI="http://127.0.0.1:4000"
-APP_ORIGIN_PWA="http://127.0.0.1:3001"
-APP_ORIGIN_MANAGE="http://127.0.0.1:3002"
-APP_ORIGIN_CONTROL="http://127.0.0.1:3003"
-APP_ORIGIN_ASSESSMENT_API="http://127.0.0.1:3000"
-APP_ORIGIN_ASSESSMENT_PWA="http://127.0.0.1:3001"
+APP_ORIGIN_API=http://127.0.0.1:3000
+APP_ORIGIN_ASSESSMENT_API=http://127.0.0.1:3000
+APP_ORIGIN_ASSESSMENT_PWA=http://127.0.0.1:3001
+APP_ORIGIN_AUTH=http://127.0.0.1:3010
+APP_ORIGIN_CONTROL=http://127.0.0.1:3003
+APP_ORIGIN_LTI=http://127.0.0.1:4000
+APP_ORIGIN_MANAGE=http://127.0.0.1:3002
+APP_ORIGIN_PWA=http://127.0.0.1:3001
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# Canonical app origins (prefer these; issuers fall back to them)
APP_ORIGIN_AUTH="http://127.0.0.1:3010"
APP_ORIGIN_API="http://127.0.0.1:3000"
APP_ORIGIN_LTI="http://127.0.0.1:4000"
APP_ORIGIN_PWA="http://127.0.0.1:3001"
APP_ORIGIN_MANAGE="http://127.0.0.1:3002"
APP_ORIGIN_CONTROL="http://127.0.0.1:3003"
APP_ORIGIN_ASSESSMENT_API="http://127.0.0.1:3000"
APP_ORIGIN_ASSESSMENT_PWA="http://127.0.0.1:3001"
# Canonical app origins (prefer these; issuers fall back to them)
APP_ORIGIN_API=http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_API=http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA=http://127.0.0.1:3001
APP_ORIGIN_AUTH=http://127.0.0.1:3010
APP_ORIGIN_CONTROL=http://127.0.0.1:3003
APP_ORIGIN_LTI=http://127.0.0.1:4000
APP_ORIGIN_MANAGE=http://127.0.0.1:3002
APP_ORIGIN_PWA=http://127.0.0.1:3001
🧰 Tools
🪛 dotenv-linter (3.3.0)

[warning] 18-18: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 19-19: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 19-19: [UnorderedKey] The APP_ORIGIN_API key should go before the APP_ORIGIN_AUTH key

(UnorderedKey)

[warning] 20-20: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 21-21: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 22-22: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 22-22: [UnorderedKey] The APP_ORIGIN_MANAGE key should go before the APP_ORIGIN_PWA key

(UnorderedKey)

[warning] 23-23: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 23-23: [UnorderedKey] The APP_ORIGIN_CONTROL key should go before the APP_ORIGIN_LTI key

(UnorderedKey)

[warning] 24-24: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 24-24: [UnorderedKey] The APP_ORIGIN_ASSESSMENT_API key should go before the APP_ORIGIN_AUTH key

(UnorderedKey)

[warning] 25-25: [QuoteCharacter] The value has quote characters (', ")

(QuoteCharacter)

[warning] 25-25: [UnorderedKey] The APP_ORIGIN_ASSESSMENT_PWA key should go before the APP_ORIGIN_AUTH key

(UnorderedKey)

🤖 Prompt for AI Agents 
In apps/backend-docker/.env.example around lines 17 to 25, the APP_ORIGIN_*
entries are quoted and legacy API_DOMAIN/APP_*_SUBDOMAIN variables are still
present; update this file to use the APP_ORIGIN_* variables as the single source
of truth by removing the surrounding quotes from each APP_ORIGIN_* value,
comment out (or remove) any unused legacy API_DOMAIN/APP_*_SUBDOMAIN entries,
and optionally sort the APP_ORIGIN_* lines for clarity while preserving the same
URLs.

8 changes: 7 additions & 1 deletion apps/backend-docker/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ if (redisCache) {
cache = createInMemoryCache()
}

emitter.on('invalidate', (resource) => {
emitter.on('invalidate', (resource: any) => {
cache.invalidate([
{
typename: resource.typename,
Expand Down Expand Up @@ -118,6 +118,12 @@ migrate(prisma).then(() => {
tasks,
})

// Validate required environment variables at startup
if (!process.env.APP_ORIGIN_API) {
console.error('APP_ORIGIN_API is required but not defined')
process.exit(1)
}
Comment thread
rschlaefli marked this conversation as resolved.

const server = app.listen(3000, () => {
console.log(`GraphQL API located at 0.0.0.0:3000${yogaApp.graphqlEndpoint}`)

Expand Down
2 changes: 1 addition & 1 deletion apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"typescript": "~5.6.3"
},
"scripts": {
"build": "docusaurus build",
"build:docs": "docusaurus build",
Comment thread
rschlaefli marked this conversation as resolved.
"deploy": "docusaurus deploy",
"dev:docs": "docusaurus start --port 5500",
"docusaurus": "docusaurus",
Expand Down
21 changes: 16 additions & 5 deletions apps/frontend-control/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,19 @@ NEXT_PUBLIC_AVATAR_BASE_PATH="https://sos-ch-dk-2.exo.io/klicker-prod/avatars"
NEXT_PUBLIC_API_URL="https://$API_DOMAIN/api/graphql"
NEXT_PUBLIC_API_URL_SSR=http://127.0.0.1:3000/api/graphql

NEXT_PUBLIC_PWA_URL="https://pwa.klicker.com"
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker.com"
NEXT_PUBLIC_CONTROL_URL="https://control.klicker.com"
NEXT_PUBLIC_AUTH_URL="https://auth.klicker.com"
NEXT_PUBLIC_LTI_URL="https://lti.klicker.com"
APP_ORIGIN_API=https://api.klicker.com
APP_ORIGIN_PWA=https://pwa.klicker.com
APP_ORIGIN_MANAGE=https://manage.klicker.com
APP_ORIGIN_CONTROL=https://control.klicker.com
APP_ORIGIN_LTI=https://lti.klicker.com
APP_ORIGIN_AUTH=https://auth.klicker.com
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker.com
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker.com

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API
23 changes: 17 additions & 6 deletions apps/frontend-control/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,22 @@ NEXT_PUBLIC_AVATAR_BASE_PATH="https://sos-ch-dk-2.exo.io/klicker-prod/avatars"
NEXT_PUBLIC_API_URL="https://$API_DOMAIN/api/graphql"
NEXT_PUBLIC_API_URL_SSR="http://klicker-v2-prod-klicker-uzh-v2-backend-graphql:3000/api/graphql"

NEXT_PUBLIC_PWA_URL="https://pwa.klicker.uzh.ch"
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker.uzh.ch"
NEXT_PUBLIC_CONTROL_URL="https://control.klicker.uzh.ch"
NEXT_PUBLIC_AUTH_URL="https://auth.klicker.uzh.ch"
NEXT_PUBLIC_LTI_URL="https://lti.klicker.uzh.ch"

NEXT_PUBLIC_MATOMO_URL="https://webstats.uzh.ch/"
NEXT_PUBLIC_MATOMO_SITE_ID=480

APP_ORIGIN_API=https://backend-sls.klicker.uzh.ch
APP_ORIGIN_PWA=https://pwa.klicker.uzh.ch
APP_ORIGIN_MANAGE=https://manage.klicker.uzh.ch
APP_ORIGIN_CONTROL=https://control.klicker.uzh.ch
APP_ORIGIN_LTI=https://lti.klicker.uzh.ch
APP_ORIGIN_AUTH=https://auth.klicker.uzh.ch
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker.uzh.ch
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker.uzh.ch

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API
Comment thread
rschlaefli marked this conversation as resolved.
21 changes: 16 additions & 5 deletions apps/frontend-control/.env.qa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,19 @@ NEXT_PUBLIC_AVATAR_BASE_PATH="https://sos-ch-dk-2.exo.io/klicker-prod/avatars"
NEXT_PUBLIC_API_URL="https://$API_DOMAIN/api/graphql"
NEXT_PUBLIC_API_URL_SSR="http://klicker-uzh-qa-klicker-uzh-v3-backend-graphql:3000/api/graphql"

NEXT_PUBLIC_PWA_URL="https://pwa.klicker-qa.bf-app.ch"
NEXT_PUBLIC_MANAGE_URL="https://manage.klicker-qa.bf-app.ch"
NEXT_PUBLIC_CONTROL_URL="https://control.klicker-qa.bf-app.ch"
NEXT_PUBLIC_AUTH_URL="https://auth.klicker-qa.bf-app.ch"
NEXT_PUBLIC_LTI_URL="https://lti.klicker-qa.bf-app.ch"
APP_ORIGIN_API=https://api.klicker-qa.bf-app.ch
APP_ORIGIN_PWA=https://pwa.klicker-qa.bf-app.ch
APP_ORIGIN_MANAGE=https://manage.klicker-qa.bf-app.ch
APP_ORIGIN_CONTROL=https://control.klicker-qa.bf-app.ch
APP_ORIGIN_LTI=https://lti.klicker-qa.bf-app.ch
APP_ORIGIN_AUTH=https://auth.klicker-qa.bf-app.ch
APP_ORIGIN_ASSESSMENT_API=https://assessment-api.klicker-qa.bf-app.ch
APP_ORIGIN_ASSESSMENT_PWA=https://assessment.klicker-qa.bf-app.ch

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API
21 changes: 16 additions & 5 deletions apps/frontend-control/.env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,19 @@ NEXT_PUBLIC_API_URL_SSR=$NEXT_PUBLIC_API_URL

APP_SECRET=abcd

NEXT_PUBLIC_PWA_URL="http://127.0.0.1:3001"
NEXT_PUBLIC_MANAGE_URL="http://127.0.0.1:3002"
NEXT_PUBLIC_CONTROL_URL="http://127.0.0.1:3003"
NEXT_PUBLIC_AUTH_URL="http://127.0.0.1:3010"
NEXT_PUBLIC_LTI_URL="http://127.0.0.1:4000"
APP_ORIGIN_API=http://127.0.0.1:3000
APP_ORIGIN_PWA=http://127.0.0.1:3001
APP_ORIGIN_MANAGE=http://127.0.0.1:3002
APP_ORIGIN_CONTROL=http://127.0.0.1:3003
APP_ORIGIN_LTI=http://127.0.0.1:4000
APP_ORIGIN_AUTH=http://127.0.0.1:3010
APP_ORIGIN_ASSESSMENT_API=http://127.0.0.1:3000
APP_ORIGIN_ASSESSMENT_PWA=http://127.0.0.1:3001

NEXT_PUBLIC_PWA_URL=$APP_ORIGIN_PWA
NEXT_PUBLIC_MANAGE_URL=$APP_ORIGIN_MANAGE
NEXT_PUBLIC_CONTROL_URL=$APP_ORIGIN_CONTROL
NEXT_PUBLIC_AUTH_URL=$APP_ORIGIN_AUTH
NEXT_PUBLIC_LTI_URL=$APP_ORIGIN_LTI
NEXT_PUBLIC_ASSESSMENT_URL=$APP_ORIGIN_ASSESSMENT_PWA
NEXT_PUBLIC_ASSESSMENT_API_URL=$APP_ORIGIN_ASSESSMENT_API
Loading
Loading