Merge pull request #7 from DSorlov/dev

0.0.3
DSorlov · Mar 22, 2023 · e63ced2 · e63ced2
2 parents b23c13f + 2911ccb
commit e63ced2
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog][keep-a-changelog]
 ## [Unreleased]
 - Nothing right now
 
+## [0.0.3] (2023-11-22)
+
+### Added
+- Updates to support new attributes in frejaeid
+- New certificates to support rollover in 2023
+- Added jwt-tokens for FrejaEid 2023
+
+### Notable changes
+- Field names in frejaeid under extras have been normalized
+
 ## [0.0.2] (2020-11-24)
 
 ### Library
@@ -26,5 +36,6 @@ The format is based on [Keep a Changelog][keep-a-changelog]
 
 [keep-a-changelog]: http://keepachangelog.com/en/1.0.0/
 [Unreleased]: https://github.com/DSorlov/eid-provider-net/compare/master...dev
+[0.0.3]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.3
 [0.0.2]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.2
 [0.0.1]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.1
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![stability-stable](https://img.shields.io/badge/stability-stable-green.svg)
-![version](https://img.shields.io/badge/version-0.0.2-green.svg)
-![maintained](https://img.shields.io/maintenance/yes/2021.svg)
+![version](https://img.shields.io/badge/version-0.0.3-green.svg)
+![maintained](https://img.shields.io/maintenance/yes/2023.svg)
 [![maintainer](https://img.shields.io/badge/maintainer-daniel%20sörlöv-blue.svg)](https://github.com/DSorlov)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://img.shields.io/github/license/DSorlov/eid-provider-net)
 

diff --git a/eid-provider-library/eid-provider-library.csproj b/eid-provider-library/eid-provider-library.csproj
@@ -4,12 +4,12 @@
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>com.sorlov.eidprovider</RootNamespace>
     <AssemblyName>eid-provider</AssemblyName>
-    <Version>0.0.2</Version>
+    <Version>0.0.3</Version>
     <Authors>Daniel Sörlöv</Authors>
     <Company>Daniel Sörlöv</Company>
     <Description>eid-provider adapted for .net</Description>
     <Product>EIDProvider.Net</Product>
-    <Copyright>(c) 2019-2020 Daniel Sörlöv. All rights reserved.</Copyright>
+    <Copyright>(c) 2019-2023 Daniel Sörlöv. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/DSorlov/eid-provider-net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/DSorlov/eid-provider-net.git</RepositoryUrl>

diff --git a/eid-provider-library/frejaeid/Client.cs b/eid-provider-library/frejaeid/Client.cs
@@ -216,20 +216,42 @@ private EIDResult pollRequest(string endpoint, string postData)
                         result["user"]["fullname"] = fullName;
 
                         result["extra"] = new JObject();
+                        if (requestedAttributes.ContainsKey("age"))
+                            result["extra"]["age"] = requestedAttributes["age"].ToString();
+                        if (requestedAttributes.ContainsKey("photo"))
+                            result["extra"]["photo"] = requestedAttributes["photo"].ToString();
                         if (requestedAttributes.ContainsKey("dateOfBirth"))
-                            result["extra"]["date_of_birth"] = requestedAttributes["dateOfBirth"].ToString();
+                            result["extra"]["dateOfBirth"] = requestedAttributes["dateOfBirth"].ToString();
                         if (requestedAttributes.ContainsKey("emailAddress"))
-                            result["extra"]["email_address"] = requestedAttributes["emailAddress"].ToString();
+                            result["extra"]["emailAddress"] = requestedAttributes["emailAddress"].ToString();
                         if (requestedAttributes.ContainsKey("allEmailAddresses"))
-                            result["extra"]["all_email_addresses"] = requestedAttributes["allEmailAddresses"].ToString();
+                            result["extra"]["allEmailAddresses"] = requestedAttributes["allEmailAddresses"].ToString();
                         if (requestedAttributes.ContainsKey("addresses"))
                             result["extra"]["addresses"] = requestedAttributes["addresses"].ToString();
                         if (requestedAttributes.ContainsKey("customIdentifier"))
-                            result["extra"]["custom_identifier"] = requestedAttributes["customIdentifier"].ToString();
+                            result["extra"]["customIdentifier"] = requestedAttributes["customIdentifier"].ToString();
+                        if (requestedAttributes.ContainsKey("registrationLevel"))
+                            result["extra"]["registrationLevel"] = requestedAttributes["registrationLevel"].ToString();
                         if (requestedAttributes.ContainsKey("ssn"))
                         {
-                            result["extra"]["ssn_number"] = requestedAttributes["ssn"]["ssn"].ToString();
-                            result["extra"]["ssn_country"] = requestedAttributes["ssn"]["country"].ToString();
+                            result["extra"]["ssnNumber"] = requestedAttributes["ssn"]["ssn"].ToString();
+                            result["extra"]["ssnCountry"] = requestedAttributes["ssn"]["country"].ToString();
+                        }
+                        if (requestedAttributes.ContainsKey("document"))
+                        {
+                            result["extra"]["documentType"] = requestedAttributes["document"]["type"].ToString();
+                            result["extra"]["documentCountry"] = requestedAttributes["document"]["country"].ToString();
+                            result["extra"]["documentNumber"] = requestedAttributes["document"]["serialNumber"].ToString();
+                            result["extra"]["documentExpiration"] = requestedAttributes["document"]["expirationDate"].ToString();
+                        }
+
+                        if (requestedAttributes.ContainsKey("covidCertificates"))
+                        {
+                            if (requestedAttributes["covidCertificates"].ContainsKey("allowed"))
+                                if (requestedAttributes["covidCertificates"]["allowed"]=="true")
+                                    result["extra"]["covidVaccines"] = requestedAttributes["covidCertificates"]["vaccines"]["certificates"].ToString();
+                                    result["extra"]["covidTests"] = requestedAttributes["covidCertificates"]["tests"]["certificates"].ToString();
+                                    result["extra"]["covidRecovery"] = requestedAttributes["covidCertificates"]["recovery"]["certificates"].ToString();
                         }
 
 

diff --git a/eid-provider-library/frejaeid/Enums.cs b/eid-provider-library/frejaeid/Enums.cs
@@ -35,7 +35,11 @@ public enum Attributes
         RELYING_PARTY_USER_ID = 64,
         INTEGRATOR_SPECIFIC_USER_UD = 128,
         CUSTOM_IDENTIFIER = 256,
-        ORG_ID = 512
+        ORG_ID = 512,
+        PHOTO = 1024,
+        AGE = 2048,
+        DOCUMENT = 4096,
+        COVID_CERTIFICATES = 8192
     }
 
     public enum SSNCountry

diff --git a/eid-provider-library/frejaeid/InitializationData.cs b/eid-provider-library/frejaeid/InitializationData.cs
@@ -23,7 +23,7 @@ public InitializationData(EIDEnvironment environment) : base(environment)
                 this.Add("attribute_list", "EMAIL_ADDRESS,RELYING_PARTY_USER_ID,BASIC_USER_INFO");
                 this.Add("minimum_level", "EXTENDED");
                 this.Add("default_country", "SE");
-                this.Add("jwt_cert", "{'aRw9OLn2BhM7hxoc458cIXHfezw': 'builtin://certs/frejaeid_prod_aRw9OLn2BhM7hxoc458cIXHfezw.jwt', 'onjnxVgI3oUzWQMLciD7sQZ4mqM': 'builtin://certs/frejaeid_prod_onjnxVgI3oUzWQMLciD7sQZ4mqM.jwt'}");
+                this.Add("jwt_cert", "{'aRw9OLn2BhM7hxoc458cIXHfezw': 'builtin://certs/frejaeid_prod_aRw9OLn2BhM7hxoc458cIXHfezw.jwt', 'wSYLdhe93ToPR2X1UrNXxOg1juI': 'builtin://certs/frejaeid_prod_wSYLdhe93ToPR2X1UrNXxOg1juI.jwt'}");
             }
             else
             {
@@ -35,7 +35,7 @@ public InitializationData(EIDEnvironment environment) : base(environment)
                 this.Add("attribute_list", "EMAIL_ADDRESS,RELYING_PARTY_USER_ID,BASIC_USER_INFO");
                 this.Add("minimum_level", "EXTENDED");
                 this.Add("default_country", "SE");
-                this.Add("jwt_cert", "{'2LQIrINOzwWAVDhoYybqUcXXmVs': 'builtin://certs/frejaeid_test_2LQIrINOzwWAVDhoYybqUcXXmVs.jwt', 'HwMHK_gb3_iuNF1advMtlG0-fUs': 'builtin://certs/frejaeid_test_HwMHK_gb3_iuNF1advMtlG0-fUs.jwt'}");
+                this.Add("jwt_cert", "{'2LQIrINOzwWAVDhoYybqUcXXmVs': 'builtin://certs/frejaeid_test_2LQIrINOzwWAVDhoYybqUcXXmVs.jwt', 'DiZbzBfysUm6-IwI-GtienEsbjc': 'builtin://certs/frejaeid_test_DiZbzBfysUm6-IwI-GtienEsbjc.jwt'}");
             }
 
         }

diff --git a/eid-provider-library/resources/certs/frejaeid_prod_onjnxVgI3oUzWQMLciD7sQZ4mqM.jwt b/eid-provider-library/resources/certs/frejaeid_prod_onjnxVgI3oUzWQMLciD7sQZ4mqM.jwt
diff --git a/eid-provider-library/resources/certs/frejaeid_prod_wSYLdhe93ToPR2X1UrNXxOg1juI.jwt b/eid-provider-library/resources/certs/frejaeid_prod_wSYLdhe93ToPR2X1UrNXxOg1juI.jwt
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEvDCCAySgAwIBAgIUO7H1JLQMSMERte/IgsBUOP6qBSYwDQYJKoZIhvcNAQEL
+BQAweTELMAkGA1UEBhMCU0UxFDASBgNVBGETCzU1OTExMC00ODA2MR0wGwYDVQQK
+ExRWZXJpc2VjIEZyZWphIGVJRCBBQjETMBEGA1UECxMKUHJvZHVjdGlvbjEgMB4G
+A1UEAxMXRnJlamEgZUlEIElzc3VpbmcgQ0EgdjEwHhcNMjMwMjIzMTI1NDI5WhcN
+MjYwMjIzMTI1NDI5WjB5MSEwHwYDVQQDExhGcmVqYSBlSUQgSldTIFNpZ25pbmcg
+djMxFDASBgNVBGETCzU1OTExMC00ODA2MRMwEQYDVQQLEwpQcm9kdWN0aW9uMRww
+GgYDVQQKExNGcmVqYSBlSUQgU3dlZGVuIEFCMQswCQYDVQQGEwJTRTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpp0UVzAVmZFiTVxhdJcAwkAt6hUmn
+JVi9uddgMUQLQnKNa6ip3np3iOydHcq627LENg9PIBVyRy/CjMoLQ2eiOQi7r4hs
+cJPBECYuBwQJEPxeMuP2b4BTk1dh2w1HDD4ZijRV4bbo8E4H39EbZvvBPaB1C7BK
+wVGJmV471A+5MpvgkSMisROz9xtqhVKy94+zYValv6mYq90X42L489aOEu8wY1N+
+VvzFH5CGZpgY9ttulfT4ykfstDZE4qKXnN4VAJlEU9PKnE+8HlGK15S8Mo9rwE80
+lklPnZPSMuiBztpZkYy4ug4cBu2ZTwxydu5J6PfdJMfnk+JaCjgc8bMCAwEAAaOB
+uzCBuDAOBgNVHQ8BAf8EBAMCBsAwDAYDVR0TAQH/BAIwADBYBggrBgEFBQcBAQRM
+MEowSAYIKwYBBQUHMAKGPGh0dHBzOi8vd3d3LmZyZWphZWlkLmNvbS90Yy9jZXJ0
+cy9mcmVqYWVpZF9pc3N1aW5nX2NhX3YxLmNlcjAfBgNVHSMEGDAWgBQQPyQ32jqI
+R/Ao483TFfBLqfaxUDAdBgNVHQ4EFgQUAIg4CkKACFOmRUmry1/9Pb48No0wDQYJ
+KoZIhvcNAQELBQADggGBAH/lokazs32mk5QlUYTZBkoP5IOxuYbm8pbr/pgDfz/E
+NEJ8OWycfDuS/fBBL59OwjOfWBlmFdDtUXoTYCjYjNVrIvfNOE62dAXN4RzqBq+c
+Uoov6MDvYfARi1B3wWuAwbZ2swNRuh/NyNLB3RsfHXya/XjA3w2MYfIeytKdBvcS
+LMOiwx4wxePtox8OuL0H6wAA8mmJdW0lCPyAyYiRRmP91DpLQwpXGCgN6MLJwpAA
+t611z17VoZhYT6PaSHvhyV05q3o/ayRFAp2xTh7ZoAALsBcEeaSg27RuuxxHFDeW
+6aqsZiUbkqEdBvaUcbN7s33O1gTLnPLhsTjMTtjwKfLCd+1jR32MQw1WdXXpgZRF
+pIgy5DW9jrOeFGUOfc+wErAeykm+XlrsBC/I3/mRra1fLYnvLToTkHPfWl1jQYfA
+E38EAlxcQpaV46znmReHq/xB+/yTWLboJO/UMgp8PyqCiumP4kXu7oLJ++48R+nu
+kptNjrjW1RSy4YOYySFxuA==
+-----END CERTIFICATE-----
diff --git a/eid-provider-library/resources/certs/frejaeid_test_DiZbzBfysUm6-IwI-GtienEsbjc.jwt b/eid-provider-library/resources/certs/frejaeid_test_DiZbzBfysUm6-IwI-GtienEsbjc.jwt
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIUXB3gwjUzjQcd77CDrCgXXbeQPowwDQYJKoZIhvcNAQEL
+BQAwgYMxCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xFDASBgNVBGET
+CzU1OTExMC00ODA2MR0wGwYDVQQKExRWZXJpc2VjIEZyZWphIGVJRCBBQjENMAsG
+A1UECxMEVGVzdDEcMBoGA1UEAxMTUlNBIFRFU1QgSXNzdWluZyBDQTAeFw0yMzAy
+MjMxMTQ4MThaFw0yNjAyMjMxMTQ4MThaMHUxIzAhBgNVBAMTGkZyZWphIGVJRCBU
+RVNUIEpXUyBTaWduaW5nMRQwEgYDVQRhEws1NTkxMTAtNDgwNjENMAsGA1UECxME
+VGVzdDEcMBoGA1UEChMTRnJlamEgZUlEIFN3ZWRlbiBBQjELMAkGA1UEBhMCU0Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDiMthhWkZT9Ovye8qzJpL/
+jHQODkVUUvQTvrE7uhG8rLKfya125XzIqfCAltazpfHS8e4o1cfET9PJ1YgsMlcE
+UszMpgvDbBeBm28LipFUk1njXTtGV39+lQ88KLpTHKhRPRxEdmRpcMuX1tHD13a3
+N0jwhcAWrFuZLsiheP1i7xNKda2Rontsg3prFPtzY4sW9kO1UQfOecay/MqIpGbs
+uH7kQbIDrY18Z1TNX8YRc5E+K69gZTBl+pLjjpZy49P02HriKA3a8upU0QKSqio8
+X1pkllBpXiIjib+Hxoze6xqnHfi3iHXidNjtxsam8b+gwwafKpSCFfl/rswTpPNR
+AgMBAAGjdDByMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8EAjAAMB8GA1UdIwQY
+MBaAFGp8ig+dcA4c2l8toDwmX4joFb+cMBIGA1UdIAQLMAkwBwYFKgMEBQowHQYD
+VR0OBBYEFL10m8p9GIWlWojIKxoXROpmkDdfMA0GCSqGSIb3DQEBCwUAA4IBAQAU
+YsxIpDi7iju0yvupfhrGDyJk8AX7aDmhpyYWx+EitDHqI9aqULH+9GxEFRCor+Y2
+a0d7hzkRzSITma0bvS+evpd4QwIhRRf00RASqnY4g4J+8knFoT7AJ7r2oJpogrzR
+8L7e5BJUnnDA9btBh01Jq5Rh4aY3azRHFeS9E26/NaRbZhOaE23r8EDGGt1oYGOA
+DkC2ouiJgnELga7DnYjroCDXRfzTeb2lmQzjyAp+tjW1MO1fQuN5cElyJkxDRtAS
+0TTGXdXux9UDCFjJL+ZaMJxOFdX9i2gQTlMitY8FzQ10pFiGt77h93TQjTS/Sfz1
+K2wpZ6CXk/WQQs1aXOl7
+-----END CERTIFICATE-----
diff --git a/eid-provider-library/resources/certs/frejaeid_test_HwMHK_gb3_iuNF1advMtlG0-fUs.jwt b/eid-provider-library/resources/certs/frejaeid_test_HwMHK_gb3_iuNF1advMtlG0-fUs.jwt