Merge branch 'main' of https://github.com/dBildungsplattform/dbildung…

…s-iam-server into EW-612

config/config.dev.json

@@ -9,9 +9,9 @@
         "SESSION_SECRET": "SessionSecretForDevelopment",
         "SESSION_TTL_MS": 3600000,
         "BACKEND_ADDRESS": "http://127.0.0.1:9090",
-        "OIDC_CALLBACK_URL": "http://localhost:8099/api/frontend/login",
-        "DEFAULT_LOGIN_REDIRECT": "http://localhost:8099/",
-        "LOGOUT_REDIRECT": "http://localhost:8099/"
+        "OIDC_CALLBACK_URL": "https://localhost:8099/api/frontend/login",
+        "DEFAULT_LOGIN_REDIRECT": "https://localhost:8099/",
+        "LOGOUT_REDIRECT": "https://localhost:8099/"
     },
     "DB": {
         "CLIENT_URL": "postgres://admin:[email protected]:5432",

dev-realm-spsh.json

@@ -829,7 +829,7 @@
       "secret": "YDp6fYkbUcj4ZkyAOnbAHGQ9O72htc5M",
       "redirectUris": [
         "http://localhost:9091/*",
-        "http://localhost:8099/*",
+        "https://localhost:8099/*",
         "/*"
       ],
       "webOrigins": [
@@ -2364,4 +2364,4 @@
   "clientPolicies": {
     "policies": []
   }
-}
+}

package.json

@@ -55,7 +55,7 @@
         "express-session": "^1.17.3",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
-        "nest-commander": "^3.12.2",
+        "nest-commander": "~3.10",
         "nest-keycloak-connect": "^1.9.2",
         "openid-client": "^5.6.0",
         "passport": "^0.6.0",

src/modules/frontend/auth/user.decorator.ts

@@ -1,10 +1,10 @@
-import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 import { Request } from 'express';
 import { UserinfoResponse } from 'openid-client';
 
 type UserDecoratorFactory = () => ParameterDecorator;
 
-export type User = { id_token: string; access_token: string; userinfo: UserinfoResponse } & Express.User;
+export type User = { id_token: string; access_token: string; userinfo: UserinfoResponse };
 
 export const CurrentUser: UserDecoratorFactory = createParamDecorator((_data: unknown, ctx: ExecutionContext) => {
     const request: Request = ctx.switchToHttp().getRequest<Request>();

src/modules/rolle/api/provider.controller.ts

@@ -4,7 +4,7 @@ import { ApiTags, ApiUnauthorizedResponse } from '@nestjs/swagger';
 import { AuthenticatedUser } from 'nest-keycloak-connect';
 import { GetServiceProviderInfoDo } from '../domain/get-service-provider-info.do.js';
 
-@ApiTags('rolle')
+@ApiTags('provider')
 @Controller({ path: 'provider' })
 export class ProviderController {
     public constructor(private readonly rolleService: RolleService) {}