Skip to content
This repository was archived by the owner on Dec 2, 2024. It is now read-only.

Commit 2911ccb

Browse files
DSorlovDSorlov
committed
0.0.3
### 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
1 parent b23c13f commit 2911ccb

10 files changed

+102
-65
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog][keep-a-changelog]
66
## [Unreleased]
77
- Nothing right now
88

9+
## [0.0.3] (2023-11-22)
10+
11+
### Added
12+
- Updates to support new attributes in frejaeid
13+
- New certificates to support rollover in 2023
14+
- Added jwt-tokens for FrejaEid 2023
15+
16+
### Notable changes
17+
- Field names in frejaeid under extras have been normalized
18+
919
## [0.0.2] (2020-11-24)
1020

1121
### Library
@@ -26,5 +36,6 @@ The format is based on [Keep a Changelog][keep-a-changelog]
2636

2737
[keep-a-changelog]: http://keepachangelog.com/en/1.0.0/
2838
[Unreleased]: https://github.com/DSorlov/eid-provider-net/compare/master...dev
39+
[0.0.3]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.3
2940
[0.0.2]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.2
3041
[0.0.1]: https://github.com/DSorlov/eid-provider-net/releases/tag/v0.0.1

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![stability-stable](https://img.shields.io/badge/stability-stable-green.svg)
2-
![version](https://img.shields.io/badge/version-0.0.2-green.svg)
3-
![maintained](https://img.shields.io/maintenance/yes/2021.svg)
2+
![version](https://img.shields.io/badge/version-0.0.3-green.svg)
3+
![maintained](https://img.shields.io/maintenance/yes/2023.svg)
44
[![maintainer](https://img.shields.io/badge/maintainer-daniel%20sörlöv-blue.svg)](https://github.com/DSorlov)
55
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://img.shields.io/github/license/DSorlov/eid-provider-net)
66

‎eid-provider-library/eid-provider-library.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<TargetFramework>net5.0</TargetFramework>
55
<RootNamespace>com.sorlov.eidprovider</RootNamespace>
66
<AssemblyName>eid-provider</AssemblyName>
7-
<Version>0.0.2</Version>
7+
<Version>0.0.3</Version>
88
<Authors>Daniel Sörlöv</Authors>
99
<Company>Daniel Sörlöv</Company>
1010
<Description>eid-provider adapted for .net</Description>
1111
<Product>EIDProvider.Net</Product>
12-
<Copyright>(c) 2019-2020 Daniel Sörlöv. All rights reserved.</Copyright>
12+
<Copyright>(c) 2019-2023 Daniel Sörlöv. All rights reserved.</Copyright>
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1414
<PackageProjectUrl>https://github.com/DSorlov/eid-provider-net</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/DSorlov/eid-provider-net.git</RepositoryUrl>

‎eid-provider-library/frejaeid/Client.cs

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,42 @@ private EIDResult pollRequest(string endpoint, string postData)
216216
result["user"]["fullname"] = fullName;
217217

218218
result["extra"] = new JObject();
219+
if (requestedAttributes.ContainsKey("age"))
220+
result["extra"]["age"] = requestedAttributes["age"].ToString();
221+
if (requestedAttributes.ContainsKey("photo"))
222+
result["extra"]["photo"] = requestedAttributes["photo"].ToString();
219223
if (requestedAttributes.ContainsKey("dateOfBirth"))
220-
result["extra"]["date_of_birth"] = requestedAttributes["dateOfBirth"].ToString();
224+
result["extra"]["dateOfBirth"] = requestedAttributes["dateOfBirth"].ToString();
221225
if (requestedAttributes.ContainsKey("emailAddress"))
222-
result["extra"]["email_address"] = requestedAttributes["emailAddress"].ToString();
226+
result["extra"]["emailAddress"] = requestedAttributes["emailAddress"].ToString();
223227
if (requestedAttributes.ContainsKey("allEmailAddresses"))
224-
result["extra"]["all_email_addresses"] = requestedAttributes["allEmailAddresses"].ToString();
228+
result["extra"]["allEmailAddresses"] = requestedAttributes["allEmailAddresses"].ToString();
225229
if (requestedAttributes.ContainsKey("addresses"))
226230
result["extra"]["addresses"] = requestedAttributes["addresses"].ToString();
227231
if (requestedAttributes.ContainsKey("customIdentifier"))
228-
result["extra"]["custom_identifier"] = requestedAttributes["customIdentifier"].ToString();
232+
result["extra"]["customIdentifier"] = requestedAttributes["customIdentifier"].ToString();
233+
if (requestedAttributes.ContainsKey("registrationLevel"))
234+
result["extra"]["registrationLevel"] = requestedAttributes["registrationLevel"].ToString();
229235
if (requestedAttributes.ContainsKey("ssn"))
230236
{
231-
result["extra"]["ssn_number"] = requestedAttributes["ssn"]["ssn"].ToString();
232-
result["extra"]["ssn_country"] = requestedAttributes["ssn"]["country"].ToString();
237+
result["extra"]["ssnNumber"] = requestedAttributes["ssn"]["ssn"].ToString();
238+
result["extra"]["ssnCountry"] = requestedAttributes["ssn"]["country"].ToString();
239+
}
240+
if (requestedAttributes.ContainsKey("document"))
241+
{
242+
result["extra"]["documentType"] = requestedAttributes["document"]["type"].ToString();
243+
result["extra"]["documentCountry"] = requestedAttributes["document"]["country"].ToString();
244+
result["extra"]["documentNumber"] = requestedAttributes["document"]["serialNumber"].ToString();
245+
result["extra"]["documentExpiration"] = requestedAttributes["document"]["expirationDate"].ToString();
246+
}
247+
248+
if (requestedAttributes.ContainsKey("covidCertificates"))
249+
{
250+
if (requestedAttributes["covidCertificates"].ContainsKey("allowed"))
251+
if (requestedAttributes["covidCertificates"]["allowed"]=="true")
252+
result["extra"]["covidVaccines"] = requestedAttributes["covidCertificates"]["vaccines"]["certificates"].ToString();
253+
result["extra"]["covidTests"] = requestedAttributes["covidCertificates"]["tests"]["certificates"].ToString();
254+
result["extra"]["covidRecovery"] = requestedAttributes["covidCertificates"]["recovery"]["certificates"].ToString();
233255
}
234256

235257

‎eid-provider-library/frejaeid/Enums.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ public enum Attributes
3535
RELYING_PARTY_USER_ID = 64,
3636
INTEGRATOR_SPECIFIC_USER_UD = 128,
3737
CUSTOM_IDENTIFIER = 256,
38-
ORG_ID = 512
38+
ORG_ID = 512,
39+
PHOTO = 1024,
40+
AGE = 2048,
41+
DOCUMENT = 4096,
42+
COVID_CERTIFICATES = 8192
3943
}
4044

4145
public enum SSNCountry

‎eid-provider-library/frejaeid/InitializationData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public InitializationData(EIDEnvironment environment) : base(environment)
2323
this.Add("attribute_list", "EMAIL_ADDRESS,RELYING_PARTY_USER_ID,BASIC_USER_INFO");
2424
this.Add("minimum_level", "EXTENDED");
2525
this.Add("default_country", "SE");
26-
this.Add("jwt_cert", "{'aRw9OLn2BhM7hxoc458cIXHfezw': 'builtin://certs/frejaeid_prod_aRw9OLn2BhM7hxoc458cIXHfezw.jwt', 'onjnxVgI3oUzWQMLciD7sQZ4mqM': 'builtin://certs/frejaeid_prod_onjnxVgI3oUzWQMLciD7sQZ4mqM.jwt'}");
26+
this.Add("jwt_cert", "{'aRw9OLn2BhM7hxoc458cIXHfezw': 'builtin://certs/frejaeid_prod_aRw9OLn2BhM7hxoc458cIXHfezw.jwt', 'wSYLdhe93ToPR2X1UrNXxOg1juI': 'builtin://certs/frejaeid_prod_wSYLdhe93ToPR2X1UrNXxOg1juI.jwt'}");
2727
}
2828
else
2929
{
@@ -35,7 +35,7 @@ public InitializationData(EIDEnvironment environment) : base(environment)
3535
this.Add("attribute_list", "EMAIL_ADDRESS,RELYING_PARTY_USER_ID,BASIC_USER_INFO");
3636
this.Add("minimum_level", "EXTENDED");
3737
this.Add("default_country", "SE");
38-
this.Add("jwt_cert", "{'2LQIrINOzwWAVDhoYybqUcXXmVs': 'builtin://certs/frejaeid_test_2LQIrINOzwWAVDhoYybqUcXXmVs.jwt', 'HwMHK_gb3_iuNF1advMtlG0-fUs': 'builtin://certs/frejaeid_test_HwMHK_gb3_iuNF1advMtlG0-fUs.jwt'}");
38+
this.Add("jwt_cert", "{'2LQIrINOzwWAVDhoYybqUcXXmVs': 'builtin://certs/frejaeid_test_2LQIrINOzwWAVDhoYybqUcXXmVs.jwt', 'DiZbzBfysUm6-IwI-GtienEsbjc': 'builtin://certs/frejaeid_test_DiZbzBfysUm6-IwI-GtienEsbjc.jwt'}");
3939
}
4040

4141
}

‎eid-provider-library/resources/certs/frejaeid_prod_onjnxVgI3oUzWQMLciD7sQZ4mqM.jwt

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎eid-provider-library/resources/certs/frejaeid_prod_wSYLdhe93ToPR2X1UrNXxOg1juI.jwt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEvDCCAySgAwIBAgIUO7H1JLQMSMERte/IgsBUOP6qBSYwDQYJKoZIhvcNAQEL
3+
BQAweTELMAkGA1UEBhMCU0UxFDASBgNVBGETCzU1OTExMC00ODA2MR0wGwYDVQQK
4+
ExRWZXJpc2VjIEZyZWphIGVJRCBBQjETMBEGA1UECxMKUHJvZHVjdGlvbjEgMB4G
5+
A1UEAxMXRnJlamEgZUlEIElzc3VpbmcgQ0EgdjEwHhcNMjMwMjIzMTI1NDI5WhcN
6+
MjYwMjIzMTI1NDI5WjB5MSEwHwYDVQQDExhGcmVqYSBlSUQgSldTIFNpZ25pbmcg
7+
djMxFDASBgNVBGETCzU1OTExMC00ODA2MRMwEQYDVQQLEwpQcm9kdWN0aW9uMRww
8+
GgYDVQQKExNGcmVqYSBlSUQgU3dlZGVuIEFCMQswCQYDVQQGEwJTRTCCASIwDQYJ
9+
KoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpp0UVzAVmZFiTVxhdJcAwkAt6hUmn
10+
JVi9uddgMUQLQnKNa6ip3np3iOydHcq627LENg9PIBVyRy/CjMoLQ2eiOQi7r4hs
11+
cJPBECYuBwQJEPxeMuP2b4BTk1dh2w1HDD4ZijRV4bbo8E4H39EbZvvBPaB1C7BK
12+
wVGJmV471A+5MpvgkSMisROz9xtqhVKy94+zYValv6mYq90X42L489aOEu8wY1N+
13+
VvzFH5CGZpgY9ttulfT4ykfstDZE4qKXnN4VAJlEU9PKnE+8HlGK15S8Mo9rwE80
14+
lklPnZPSMuiBztpZkYy4ug4cBu2ZTwxydu5J6PfdJMfnk+JaCjgc8bMCAwEAAaOB
15+
uzCBuDAOBgNVHQ8BAf8EBAMCBsAwDAYDVR0TAQH/BAIwADBYBggrBgEFBQcBAQRM
16+
MEowSAYIKwYBBQUHMAKGPGh0dHBzOi8vd3d3LmZyZWphZWlkLmNvbS90Yy9jZXJ0
17+
cy9mcmVqYWVpZF9pc3N1aW5nX2NhX3YxLmNlcjAfBgNVHSMEGDAWgBQQPyQ32jqI
18+
R/Ao483TFfBLqfaxUDAdBgNVHQ4EFgQUAIg4CkKACFOmRUmry1/9Pb48No0wDQYJ
19+
KoZIhvcNAQELBQADggGBAH/lokazs32mk5QlUYTZBkoP5IOxuYbm8pbr/pgDfz/E
20+
NEJ8OWycfDuS/fBBL59OwjOfWBlmFdDtUXoTYCjYjNVrIvfNOE62dAXN4RzqBq+c
21+
Uoov6MDvYfARi1B3wWuAwbZ2swNRuh/NyNLB3RsfHXya/XjA3w2MYfIeytKdBvcS
22+
LMOiwx4wxePtox8OuL0H6wAA8mmJdW0lCPyAyYiRRmP91DpLQwpXGCgN6MLJwpAA
23+
t611z17VoZhYT6PaSHvhyV05q3o/ayRFAp2xTh7ZoAALsBcEeaSg27RuuxxHFDeW
24+
6aqsZiUbkqEdBvaUcbN7s33O1gTLnPLhsTjMTtjwKfLCd+1jR32MQw1WdXXpgZRF
25+
pIgy5DW9jrOeFGUOfc+wErAeykm+XlrsBC/I3/mRra1fLYnvLToTkHPfWl1jQYfA
26+
E38EAlxcQpaV46znmReHq/xB+/yTWLboJO/UMgp8PyqCiumP4kXu7oLJ++48R+nu
27+
kptNjrjW1RSy4YOYySFxuA==
28+
-----END CERTIFICATE-----

‎eid-provider-library/resources/certs/frejaeid_test_DiZbzBfysUm6-IwI-GtienEsbjc.jwt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIID+zCCAuOgAwIBAgIUXB3gwjUzjQcd77CDrCgXXbeQPowwDQYJKoZIhvcNAQEL
3+
BQAwgYMxCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xFDASBgNVBGET
4+
CzU1OTExMC00ODA2MR0wGwYDVQQKExRWZXJpc2VjIEZyZWphIGVJRCBBQjENMAsG
5+
A1UECxMEVGVzdDEcMBoGA1UEAxMTUlNBIFRFU1QgSXNzdWluZyBDQTAeFw0yMzAy
6+
MjMxMTQ4MThaFw0yNjAyMjMxMTQ4MThaMHUxIzAhBgNVBAMTGkZyZWphIGVJRCBU
7+
RVNUIEpXUyBTaWduaW5nMRQwEgYDVQRhEws1NTkxMTAtNDgwNjENMAsGA1UECxME
8+
VGVzdDEcMBoGA1UEChMTRnJlamEgZUlEIFN3ZWRlbiBBQjELMAkGA1UEBhMCU0Uw
9+
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDiMthhWkZT9Ovye8qzJpL/
10+
jHQODkVUUvQTvrE7uhG8rLKfya125XzIqfCAltazpfHS8e4o1cfET9PJ1YgsMlcE
11+
UszMpgvDbBeBm28LipFUk1njXTtGV39+lQ88KLpTHKhRPRxEdmRpcMuX1tHD13a3
12+
N0jwhcAWrFuZLsiheP1i7xNKda2Rontsg3prFPtzY4sW9kO1UQfOecay/MqIpGbs
13+
uH7kQbIDrY18Z1TNX8YRc5E+K69gZTBl+pLjjpZy49P02HriKA3a8upU0QKSqio8
14+
X1pkllBpXiIjib+Hxoze6xqnHfi3iHXidNjtxsam8b+gwwafKpSCFfl/rswTpPNR
15+
AgMBAAGjdDByMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8EAjAAMB8GA1UdIwQY
16+
MBaAFGp8ig+dcA4c2l8toDwmX4joFb+cMBIGA1UdIAQLMAkwBwYFKgMEBQowHQYD
17+
VR0OBBYEFL10m8p9GIWlWojIKxoXROpmkDdfMA0GCSqGSIb3DQEBCwUAA4IBAQAU
18+
YsxIpDi7iju0yvupfhrGDyJk8AX7aDmhpyYWx+EitDHqI9aqULH+9GxEFRCor+Y2
19+
a0d7hzkRzSITma0bvS+evpd4QwIhRRf00RASqnY4g4J+8knFoT7AJ7r2oJpogrzR
20+
8L7e5BJUnnDA9btBh01Jq5Rh4aY3azRHFeS9E26/NaRbZhOaE23r8EDGGt1oYGOA
21+
DkC2ouiJgnELga7DnYjroCDXRfzTeb2lmQzjyAp+tjW1MO1fQuN5cElyJkxDRtAS
22+
0TTGXdXux9UDCFjJL+ZaMJxOFdX9i2gQTlMitY8FzQ10pFiGt77h93TQjTS/Sfz1
23+
K2wpZ6CXk/WQQs1aXOl7
24+
-----END CERTIFICATE-----

‎eid-provider-library/resources/certs/frejaeid_test_HwMHK_gb3_iuNF1advMtlG0-fUs.jwt

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)