diff --git a/apps/endringsmelding-frontend/src/main/resources/application-local.yml b/apps/endringsmelding-frontend/src/main/resources/application-local.yml index b26d7b4a5c..dbe599bab0 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application-local.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application-local.yml @@ -1,8 +1,7 @@ AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} -AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: ${sm://azure-openid-config-token-endpoint} -AZURE_OPENID_CONFIG_JWKS_URI: ${sm://azure-openid-config-jwks-uri} AZURE_OPENID_CONFIG_ISSUER: ${sm://azure-openid-config-issuer} +AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: ${sm://azure-openid-config-token-endpoint} spring: config: diff --git a/apps/endringsmelding-frontend/src/main/resources/application.yml b/apps/endringsmelding-frontend/src/main/resources/application.yml index 572046a27f..2abd52c225 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application.yml @@ -8,15 +8,15 @@ spring: oauth2: client: registration: - aad: + azure: authorization-grant-type: authorization_code client-id: ${AZURE_APP_CLIENT_ID} client-secret: ${AZURE_APP_CLIENT_SECRET} redirect-uri: '{baseUrl}/login/oauth2/code/{registrationId}' - scope: openid, ${AZURE_APP_CLIENT_ID}/.default + scope: openid, ${AZURE_APP_CLIENT_ID}/.default provider: - aad: - issuer-uri: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b/v2.0 + azure: + issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER} consumers: endringsmelding-service: diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml index 05ead4bd0b..01d8cc207f 100644 --- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml @@ -36,4 +36,6 @@ + + \ No newline at end of file