Merge pull request #99 from Virtual-Finland-Development/VFD-326-users-api-siivotaan-pois-tuki-suomifi-tunnistautumistoteutukselle

LauriGofore · web-flow · commit 28a1ec706757 · 2023-10-26T11:57:02.000+03:00
SuomiFi cleanup
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs
@@ -20,7 +20,6 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
-using Microsoft.Extensions.Options;
 
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Features/SuomiFiSecurityFeature.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Features/SuomiFiSecurityFeature.cs
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.dev.json b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.dev.json
@@ -1,11 +1,6 @@
 {
   "Security": {
     "Authorization": {
-      "SuomiFi": {
-        "AuthorizationJwksJsonUrl": "https://virtual-finland-development-auth-files.s3.eu-north-1.amazonaws.com/dev/.well-known/jwks.json",
-        "Issuer": "virtual-finland/authentication-gw/suomifi",
-        "IsEnabled": true
-      },
       "Testbed": {
         "IsEnabled": true
       },
@@ -14,4 +9,4 @@
       }
     }
   }
-}
+}
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.json b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.json
@@ -6,9 +6,7 @@
     }
   },
   "Serilog": {
-    "Using": [
-      "Serilog.Sinks.Console"
-    ],
+    "Using": ["Serilog.Sinks.Console"],
     "MinimumLevel": {
       "Default": "Information",
       "Override": {
@@ -32,9 +30,7 @@
     "Access": {
       "AccessFinland": {
         "HeaderName": "x-api-key",
-        "AccessKeys": [
-          "secret"
-        ],
+        "AccessKeys": ["secret"],
         "IsEnabled": false
       },
       "Dataspace": {
@@ -82,22 +78,6 @@
             "IsEnabled": false
           }
         }
-      },
-      "SuomiFi": {
-        "AuthorizationJwksJsonUrl": "http://localhost:4078/auth/saml2/suomifi/.well-known/jwks.json",
-        "Issuer": "virtual-finland/authentication-gw/suomifi",
-        "IsEnabled": false,
-        "AudienceGuard": {
-          "StaticConfig": {
-            "AllowedAudiences": [],
-            "IsEnabled": false
-          },
-          "Service": {
-            "ApiEndpoint": "",
-            "AllowedGroups": [],
-            "IsEnabled": false
-          }
-        }
       }
     },
     "Options": {
@@ -120,4 +100,4 @@
   "Redis": {
     "Endpoint": "localhost:6379"
   }
-}
+}
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.local.json b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.local.json
@@ -23,18 +23,15 @@
       },
       "Sinuna": {
         "IsEnabled": true
-      },
-      "SuomiFi": {
-        "IsEnabled": true
       }
     },
     "Options": {
-      "TermsOfServiceAgreementRequired": true
+      "TermsOfServiceAgreementRequired": false
     }
   },
   "Services": {
     "Codesets": {
       "ServiceRequestTimeoutInMilliseconds": 30000
     }
   }
-}
+}
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.staging.json b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.staging.json
@@ -1,13 +1,9 @@
 {
   "Security": {
     "Authorization": {
-      "SuomiFi": {
-        "AuthorizationJwksJsonUrl": "https://virtual-finland-development-auth-files.s3.eu-north-1.amazonaws.com/staging/.well-known/jwks.json",
-        "Issuer": "virtual-finland/authentication-gw/suomifi"
-      },
       "Sinuna": {
         "IsEnabled": true
       }
     }
   }
-}
+}
diff --git a/VirtualFinland.UsersAPI.Deployment/Features/UsersApiLambdaFunction.cs b/VirtualFinland.UsersAPI.Deployment/Features/UsersApiLambdaFunction.cs
@@ -155,9 +155,6 @@ public UsersApiLambdaFunction(Config config, StackSetup stackSetup, VpcSetup vpc
                     {
                         "Security__Authorization__Sinuna__IsEnabled", authorizationConfig.Require("sinuna-isEnabled")
                     },
-                    {
-                        "Security__Authorization__SuomiFi__IsEnabled", authorizationConfig.Require("suomifi-isEnabled")
-                    },
                     {
                         "Security__Options__TermsOfServiceAgreementRequired", termsOfServiceConfig.Require("isEnabled")
                     }
diff --git a/VirtualFinland.UsersAPI.Deployment/Pulumi.mvp-staging.yaml b/VirtualFinland.UsersAPI.Deployment/Pulumi.mvp-staging.yaml
@@ -4,6 +4,5 @@ config:
     secure: AAABAMWeYU4N0HFQu5eKKdr/AYYpfK//ip+VfV1wxkE0i/117unS9ZpHpmk0pFZWdVyJyhs33NUY9jvsKh+SKr5QGQ44skVe112LC57z/Q==
   acl:dataspace-isEnabled: true
   auth:sinuna-isEnabled: true
-  auth:suomifi-isEnabled: false
   auth:testbed-isEnabled: false
-  termsOfService:isEnabled: true
+  termsOfService:isEnabled: true
diff --git a/VirtualFinland.UsersAPI.Deployment/Pulumi.yaml b/VirtualFinland.UsersAPI.Deployment/Pulumi.yaml
@@ -17,5 +17,4 @@ config:
   acl:dataspace-agent: ""
   auth:testbed-isEnabled: true
   auth:sinuna-isEnabled: true
-  auth:suomifi-isEnabled: false
-  termsOfService:isEnabled: false
+  termsOfService:isEnabled: false
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       AWS_REGION: eu-north-1
       REDIS_ENDPOINT: redis:6379
       "Services__Codesets__ApiEndpoint": ${CodesetApiBaseUrl:-http://host.docker.internal:3166/resources}
-      "SuomiFi__AuthorizationJwksJsonUrl": ${SuomiFi__AuthorizationJwksJsonUrl:-http://host.docker.internal:4078/auth/saml2/suomifi/.well-known/jwks.json}
     depends_on:
       postgresdb:
         condition: service_healthy

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Security": {`
`3`	`3`	`"Authorization": {`
`4`		`- "SuomiFi": {`
`5`		`- "AuthorizationJwksJsonUrl": "https://virtual-finland-development-auth-files.s3.eu-north-1.amazonaws.com/dev/.well-known/jwks.json",`
`6`		`- "Issuer": "virtual-finland/authentication-gw/suomifi",`
`7`		`- "IsEnabled": true`
`8`		`- },`
`9`	`4`	`"Testbed": {`
`10`	`5`	`"IsEnabled": true`
`11`	`6`	`},`
`@@ -14,4 +9,4 @@`
`14`	`9`	`}`
`15`	`10`	`}`
`16`	`11`	`}`
`17`		`-}`
	`12`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,18 +23,15 @@`
`23`	`23`	`},`
`24`	`24`	`"Sinuna": {`
`25`	`25`	`"IsEnabled": true`
`26`		`- },`
`27`		`- "SuomiFi": {`
`28`		`- "IsEnabled": true`
`29`	`26`	`}`
`30`	`27`	`},`
`31`	`28`	`"Options": {`
`32`		`- "TermsOfServiceAgreementRequired": true`
	`29`	`+ "TermsOfServiceAgreementRequired": false`
`33`	`30`	`}`
`34`	`31`	`},`
`35`	`32`	`"Services": {`
`36`	`33`	`"Codesets": {`
`37`	`34`	`"ServiceRequestTimeoutInMilliseconds": 30000`
`38`	`35`	`}`
`39`	`36`	`}`
`40`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"Security": {`
`3`	`3`	`"Authorization": {`
`4`		`- "SuomiFi": {`
`5`		`- "AuthorizationJwksJsonUrl": "https://virtual-finland-development-auth-files.s3.eu-north-1.amazonaws.com/staging/.well-known/jwks.json",`
`6`		`- "Issuer": "virtual-finland/authentication-gw/suomifi"`
`7`		`- },`
`8`	`4`	`"Sinuna": {`
`9`	`5`	`"IsEnabled": true`
`10`	`6`	`}`
`11`	`7`	`}`
`12`	`8`	`}`
`13`		`-}`
	`9`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,6 @@ public UsersApiLambdaFunction(Config config, StackSetup stackSetup, VpcSetup vpc`
`155`	`155`	`{`
`156`	`156`	`"Security__Authorization__Sinuna__IsEnabled", authorizationConfig.Require("sinuna-isEnabled")`
`157`	`157`	`},`
`158`		`- {`
`159`		`- "Security__Authorization__SuomiFi__IsEnabled", authorizationConfig.Require("suomifi-isEnabled")`
`160`		`- },`
`161`	`158`	`{`
`162`	`159`	`"Security__Options__TermsOfServiceAgreementRequired", termsOfServiceConfig.Require("isEnabled")`
`163`	`160`	`}`