Merge branch 'PWATypes' of https://github.com/uzh-bf/klicker-uzh into…

… PWATypes

apps/auth/package.json

@@ -47,6 +47,7 @@
   "scripts": {
     "build": "next build",
     "build:test": "cross-env NODE_ENV=test next build",
+    "check": "tsc",
     "dev": "next dev --port 3010",
     "dev:offline": "next dev --port 3010",
     "dev:test": "cross-env NODE_ENV=test next dev --port 3010",

apps/auth/src/pages/api/auth/[...nextauth].ts

@@ -13,11 +13,21 @@ import prisma from 'src/lib/prisma'
 
 export const COOKIE_NAME = 'next-auth.session-token'
 
-interface ExtendedProfile extends Profile {
+export interface ExtendedProfile extends Profile {
   swissEduPersonUniqueID: string
   swissEduIDLinkedAffiliation?: string[]
 }
 
+export interface ExtendedUser {
+  id: string
+  email: string
+  role: UserRole
+  shortname: string
+  scope: string
+  catalystInstitutional: boolean
+  catalystIndividual: boolean
+}
+
 function reduceCatalyst(acc: boolean, affiliation: string) {
   try {
     if (
@@ -207,12 +217,13 @@ export const authOptions: NextAuthOptions = {
 
   callbacks: {
     async signIn({ user, account, profile, email }) {
-      if (profile?.sub && account?.provider) {
+      const profileData = profile as ExtendedProfile
+      if (profileData?.sub && account?.provider) {
         const userAccount = await prisma.account.findUnique({
           where: {
             provider_providerAccountId: {
               provider: account.provider,
-              providerAccountId: profile.sub,
+              providerAccountId: profileData.sub,
             },
           },
         })
@@ -221,11 +232,11 @@ export const authOptions: NextAuthOptions = {
           const user = await prisma.user.update({
             where: { id: userAccount.userId },
             data: {
-              email: profile.email,
+              email: profileData.email,
               lastLoginAt: new Date(),
               catalystInstitutional:
-                (profile.email?.endsWith('uzh.ch') ||
-                  profile.swissEduIDLinkedAffiliation?.reduce<boolean>(
+                (profileData.email?.endsWith('uzh.ch') ||
+                  profileData.swissEduIDLinkedAffiliation?.reduce<boolean>(
                     reduceCatalyst,
                     false
                   )) ??
@@ -246,17 +257,20 @@ export const authOptions: NextAuthOptions = {
     },
 
     async jwt({ token, user, account, profile, trigger }) {
+      const profileData = profile as ExtendedProfile
+      const userData = user as ExtendedUser
+
       if (typeof user !== 'undefined') {
-        token.shortname = user.shortname
+        token.shortname = userData.shortname
 
-        if (typeof profile?.swissEduPersonUniqueID === 'string') {
+        if (typeof profileData?.swissEduPersonUniqueID === 'string') {
           token.scope = UserLoginScope.ACCOUNT_OWNER
         } else {
           token.scope = (user as any).scope as UserLoginScope
         }
 
-        token.catalystInstitutional = user.catalystInstitutional
-        token.catalystIndividual = user.catalystIndividual
+        token.catalystInstitutional = userData.catalystInstitutional
+        token.catalystIndividual = userData.catalystIndividual
 
         token.role = UserRole.USER
       }

apps/auth/src/pages/api/discourse.ts

@@ -45,9 +45,9 @@ export default async function handler(
   const nonce = ssoURL.searchParams.get('nonce')
   const redirectURL = ssoURL.searchParams.get('return_sso_url')
 
-  const userEmail = session.email
+  const userEmail = session.email!
   const userId = session.sub
-  const userShortname = session.shortname
+  const userShortname = session.shortname as string
   const userRole = session.role
 
   let payload = `nonce=${nonce}&email=${encodeURIComponent(

apps/backend-docker/scripts/checkRedisConsistency.ts

@@ -1,5 +1,5 @@
 import { PrismaClient } from '@klicker-uzh/prisma'
-import Redis from 'ioredis'
+import { Redis } from 'ioredis'
 
 async function run() {
   const prisma = new PrismaClient()

apps/backend-docker/scripts/fixPointsInconsistency.ts

@@ -1,7 +1,7 @@
 // pn exec:prod scripts/fixPointsInconsistency.ts
 
 import { PrismaClient } from '@klicker-uzh/prisma'
-import Redis from 'ioredis'
+import { Redis } from 'ioredis'
 const prisma = new PrismaClient()
 
 const redisExec = new Redis({

apps/backend-docker/src/app.ts

@@ -6,7 +6,7 @@ import { usePersistedOperations } from '@graphql-yoga/plugin-persisted-operation
 import { enhanceContext, schema } from '@klicker-uzh/graphql'
 import cookieParser from 'cookie-parser'
 import cors from 'cors'
-import express, { Request } from 'express'
+import express, { type Request } from 'express'
 import { createYoga } from 'graphql-yoga'
 import { createRequire } from 'node:module'
 import passport from 'passport'
@@ -102,7 +102,7 @@ function prepareApp({ prisma, redisExec, pubSub, cache, emitter }: any) {
 
   app.use(cookieParser())
   app.use((req: any, res, next) =>
-    passport.authenticate('jwt', { session: false }, (err, user) => {
+    passport.authenticate('jwt', { session: false }, (_: any, user: any) => {
       req.locals = { user }
       next()
     })(req, res, next)
@@ -170,7 +170,7 @@ function prepareApp({ prisma, redisExec, pubSub, cache, emitter }: any) {
     res.send('OK')
   })
 
-  app.use('/api/graphql', yogaApp)
+  app.use('/api/graphql', yogaApp as any)
 
   return { app, yogaApp }
 }

apps/backend-docker/src/index.ts

@@ -4,10 +4,10 @@ import { PrismaClient } from '@klicker-uzh/prisma'
 import * as Sentry from '@sentry/node'
 import '@sentry/tracing'
 import { createPubSub } from 'graphql-yoga'
-import Redis from 'ioredis'
+import { Redis } from 'ioredis'
 import prepareApp from './app.js'
 
-import { Cache, createInMemoryCache } from '@envelop/response-cache'
+import { createInMemoryCache, type Cache } from '@envelop/response-cache'
 import { createRedisCache } from '@envelop/response-cache-redis'
 import { useServer } from 'graphql-ws/lib/use/ws'
 import { EventEmitter } from 'node:events'

apps/backend-docker/tsconfig.json

@@ -1,4 +1,10 @@
 {
+  "include": [
+    "./**/*"
+  ],
+  "exclude": [
+    "instrumented/"
+  ],
   "compilerOptions": {
     "baseUrl": ".",
     /* Base Options: */
@@ -18,12 +24,9 @@
     "module": "NodeNext",
     "outDir": "dist",
     "sourceMap": true,
-    /* AND if you're building for a library: */
-    "declaration": true,
-    /* AND if you're building for a library in a monorepo: */
-    "composite": true,
-    "declarationMap": true,
     /* If your code doesn't run in the DOM: */
-    "lib": ["es2022"]
+    "lib": [
+      "es2022"
+    ]
   }
 }

packages/graphql/src/services/courses.ts

@@ -312,8 +312,8 @@ export async function getCourseOverviewData(
       )
 
       const sortByScoreAndUsername = R.curry(R.sortWith)([
-        R.descend(R.prop<number>('score')),
-        R.ascend(R.prop<string>('username')),
+        R.descend(R.prop('score')),
+        R.ascend(R.prop('username')),
       ])
 
       const sortedEntries: typeof allEntries.mapped = sortByScoreAndUsername(
@@ -643,7 +643,7 @@ export async function getCourseData(
     (groupActivity) => {
       return {
         ...groupActivity,
-        numOfQuestions: groupActivity.stacks[0].elements.length,
+        numOfQuestions: groupActivity.stacks[0]!.elements.length,
       }
     }
   )

packages/graphql/src/services/feedbacks.ts

@@ -107,7 +107,7 @@ export async function respondToFeedback(
     },
   })
 
-  if (!feedback || feedback.session.ownerId !== ctx.user.sub) return null
+  if (!feedback || feedback.session!.ownerId !== ctx.user.sub) return null
 
   const feedbackPublished = feedback.isPublished
   const updatedFeedback = await ctx.prisma.feedback.update({
@@ -185,7 +185,7 @@ export async function publishFeedback(
     },
   })
 
-  if (!feedback || feedback.session.ownerId !== ctx.user.sub) return null
+  if (!feedback || feedback.session!.ownerId !== ctx.user.sub) return null
 
   const updatedFeedback = await ctx.prisma.feedback.update({
     where: {
@@ -225,7 +225,7 @@ export async function pinFeedback(
     },
   })
 
-  if (!feedback || feedback.session.ownerId !== ctx.user.sub) return null
+  if (!feedback || feedback.session!.ownerId !== ctx.user.sub) return null
 
   const updatedFeedback = await ctx.prisma.feedback.update({
     where: {
@@ -261,7 +261,7 @@ export async function resolveFeedback(
     },
   })
 
-  if (!feedback || feedback.session.ownerId !== ctx.user.sub) return null
+  if (!feedback || feedback.session!.ownerId !== ctx.user.sub) return null
 
   const updatedFeedback = await ctx.prisma.feedback.update({
     where: { id },
@@ -296,7 +296,7 @@ export async function deleteFeedback(
     },
   })
 
-  if (!feedback || feedback.session.ownerId !== ctx.user.sub) return null
+  if (!feedback || feedback.session!.ownerId !== ctx.user.sub) return null
 
   const deletedFeedback = await ctx.prisma.feedback.delete({
     where: { id },
@@ -330,7 +330,7 @@ export async function deleteFeedbackResponse(
 
   if (
     !feedbackResponse ||
-    feedbackResponse.feedback.session.ownerId !== ctx.user.sub
+    feedbackResponse.feedback.session!.ownerId !== ctx.user.sub
   )
     return null
 

packages/graphql/src/services/groups.ts

@@ -375,7 +375,7 @@ export async function manipulateGroupActivity(
         options: {},
         elements: {
           create: stack.elements.map((elem) => {
-            const element = elementMap[elem.elementId]
+            const element = elementMap[elem.elementId]!
             const processedElementData = processElementData(element)
 
             return {
@@ -841,6 +841,8 @@ export async function submitGroupActivityDecisions(
           response: response,
         })
 
+        if (!updatedResults.results) return
+
         // update the instance with the new results
         await prisma.elementInstance.update({
           where: { id: instanceId },
@@ -1177,7 +1179,7 @@ export async function finalizeGroupActivityGrading(
         leaderboard: participant.leaderboards.length > 0,
       }
       if (instance.results!.passed) {
-        acc[participant.id].achievements.push(8)
+        acc[participant.id]!.achievements.push(8)
       }
     })
 

packages/graphql/src/services/microLearning.ts

@@ -185,7 +185,7 @@ export async function manipulateMicroLearning(
           options: {},
           elements: {
             create: stack.elements.map((elem) => {
-              const element = elementMap[elem.elementId]
+              const element = elementMap[elem.elementId]!
 
               const processedElementData = processElementData(element)
 

packages/graphql/src/services/participants.ts

@@ -129,7 +129,7 @@ export async function getParticipations(
   if (!participant) return []
 
   return R.sort(
-    R.ascend(R.prop<string>('course.displayName')),
+    R.ascend(R.prop('course.displayName')),
     participant.participations
   )
 }

packages/graphql/src/types/app.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Element,
   ElementStackType,
   ElementType,