From 612d6bcfa8c3b0648f7bac5e902eade1c0cc54f1 Mon Sep 17 00:00:00 2001 From: Tobias Jonas Date: Thu, 8 Apr 2021 12:50:15 +0200 Subject: [PATCH] replace address with street1 and street2 for better i18n --- README.md | 6 ++++-- build.sbt | 2 +- core/src/main/scala/corsign/core/app/Standalone.scala | 11 ++++++----- core/src/main/scala/corsign/core/model/Person.scala | 3 ++- .../test/scala/corsign/core/jwt/JWTSignerSpec.scala | 3 ++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5d85580..061967e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ An example (from the Standalone app looks like this): "birthdate": 1617219803996, "email": "meine@mail.de", "phoneNumber": "0803199999", - "street": "Bahnhofstraße 1", + "street1": "Bahnhofstraße 1", + "street2": "", "city": "Rosenheim", "zip": "83022" , "country": "de", @@ -64,7 +65,8 @@ The following list shows all possible fields, most of which are optional. Please "birthdate": "timestamp in milliseconds", "email": "meine@mail.de *required or phoneNumber", "phoneNumber": "0803199999 *required or E-Mail", - "street": "Bahnhofstraße 1", + "street1": "Bahnhofstraße 1", + "street2": "", "city": "Rosenheim", "zip": "zip code", "country": "2 letter Alpha-2 country code as defined in ISO 3166" diff --git a/build.sbt b/build.sbt index d7093b2..df46a7a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val appName = "corsign-core" -val libVersion = "1.0.1" +val libVersion = "1.0.2" val scVersion = "2.13.5" name := appName diff --git a/core/src/main/scala/corsign/core/app/Standalone.scala b/core/src/main/scala/corsign/core/app/Standalone.scala index b522fc5..9924e20 100644 --- a/core/src/main/scala/corsign/core/app/Standalone.scala +++ b/core/src/main/scala/corsign/core/app/Standalone.scala @@ -31,7 +31,8 @@ object Standalone extends App { phoneNumber = Some("0803199999"), email = Some("meine@mail.de"), idCardNumber = Some("LFC123ABC"), - address = Some("Bahnhofstraße 1"), + street1 = Some("Bahnhofstraße 1"), + street2 = Some("Bahnhofstraße 1"), zip = Some("83022"), city = Some("Rosenheim"), country = Some("Germany") @@ -51,17 +52,17 @@ object Standalone extends App { val token = JWTSigner.signWithRSA(claims, key) println("\nSigned Token with this Key is:") println(token) - println("\nParsed Content from validated Token is") + println("\nParsed content from validated Token is:") println(SimpleRSAValidator.validateWithRSA(token.get, key).get) println(key.jwkJson.toString()) - println("\nNow try to sign with a Deserialized PEM Key") + println("\nNow try to sign with a Deserialized PEM Key:") val token2 = JWTSigner.signWithRSA(claims, RSAKey.fromPEM(key.privateKeyPEM)) - println("\nSecond JWT Token is:") + println("\nThe second JWT Token is:") println(token2) - println("\nPrivate Key Hash for Signing Endpoint") + println("\nPrivate Key Hash for signing endpoint:") println(key.privateKeySHA512) println("\n\nNow generating a QR Code") diff --git a/core/src/main/scala/corsign/core/model/Person.scala b/core/src/main/scala/corsign/core/model/Person.scala index cea862a..ef6b087 100644 --- a/core/src/main/scala/corsign/core/model/Person.scala +++ b/core/src/main/scala/corsign/core/model/Person.scala @@ -12,7 +12,8 @@ case class Person( phoneNumber: Option[String] = None, email: Option[String] = None, idCardNumber: Option[String] = None, - address: Option[String] = None, + street1: Option[String] = None, + street2: Option[String] = None, zip: Option[String] = None, city: Option[String] = None, country: Option[String] = None diff --git a/core/src/test/scala/corsign/core/jwt/JWTSignerSpec.scala b/core/src/test/scala/corsign/core/jwt/JWTSignerSpec.scala index 9c0524e..c3b4ecc 100644 --- a/core/src/test/scala/corsign/core/jwt/JWTSignerSpec.scala +++ b/core/src/test/scala/corsign/core/jwt/JWTSignerSpec.scala @@ -27,7 +27,8 @@ class JWTSignerSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyChe phoneNumber = Some("0803199999"), email = Some("meine@mail.de"), idCardNumber = Some("LFC123ABC"), - address = Some("Bahnhofstraße 1"), + street1 = Some("Bahnhofstraße 1"), + street2 = Some("c/o innFactory"), zip = Some("83022"), city = Some("Rosenheim"), country = Some("Germany")