From 4b447f1c0b2233d55105a1cd6a54312d4cb6c13b Mon Sep 17 00:00:00 2001
From: Philipp Jahoda <phil@ahoikapptn.com>
Date: Mon, 28 Feb 2022 16:37:58 +0100
Subject: [PATCH] Add RS256 algorithm

---
 .DS_Store                            | Bin 6148 -> 6148 bytes
 .idea/compiler.xml                   |   2 +-
 .idea/misc.xml                       |   3 +
 .idea/workspace.xml                  |  97 +++----------------------
 README.md                            |  19 +++--
 build.gradle                         |   4 +-
 src/main/java/com/philjay/jwt/JWT.kt |  54 ++++++++------
 src/test/java/JWTTest.kt             | 105 +++++++++++++++++++++++++--
 8 files changed, 160 insertions(+), 124 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index dde68ff85ab2605b361c9bee1877b0c2e2eb721e..ad57cc55cd4fe1ae4ce0d85bf2b6c63f4dda0060 100755
GIT binary patch
delta 378
zcmZoMXfc@JFDSvlz`)4BAi$85ZWx@LpIfk5kYhD-JxG{^L60GwA(Np5CIu7&it@)G
z%jM>~xFqG|CjrGcwlIAvGXHSU5mi0~uY5rU#9E*p1_qG=5XsJ<H(7{9l9}n!k;!^2
zaykvqDmPiZ0UHaH0y?RPA(0`4A%`I~Hy>d*MAhU97DXl&g~_v7WSOipC+}jBVs9@#
zplG=J(B#`J(s1@)7FosvlciZ@n0Z_7Pqt!}Vk=O#^cMRtIf_*V#;jqLWfD%9JezeP
rlV#{+J2o-<1xs5O+d&+{%uoz;Ml!MkFlABv#t<;E@Xuy;j=%f>%d=>>

literal 6148
zcmeHKu};H44E51aDp)GSz<6JP)B)yDg)it2&^A>;N|gfYo`s!(58xA6_yB$fc4nUM
zOq6SK5>thcE#1B3Y@eN%=3Enz8E^6t(U6D+7>vmwrVe2}kCyDo$_dc8J#s2&Q7lK3
zdD*ho1!X`P_-hRCw|hWmw4{5QQsetwtzD|-+_o)NWtPo~as~|_3~yhb@0VRx`7f;2
zH+)+BM0>$Dw2yplk;{Un{wxtKU7Uv6NFELURoR(C!y<@JPd@&PHprl$Jcyq>Kf3s}
zHX6TS5s6=01o8W?9KRoZ8$=)5`bZAJ9uXD-n;;KY52!~E_*KjU4(Rv}8HgqlyViC-
zyJ*9B7MrT<m;uymmcfxnos|J)KpChR;Pb&^Fs6c)M|X5!axDNb!Lk!vb1%U@RxlN;
zJVFC8-WBLwjkFlXyJOvoT`E|4^zLM&`7jdMNQYuvbnI`PIhoX>&dPu?5His7w?nS~
zSMmNobkaLzKpFT~445RFWMe#%)YjI+ajmr&*BC5pS9x?Un4}!L3ogansXKwr@&zyz
TtUO``qJIP&4LT_UJ7wS-ez~1-

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 182c0ec..e78dd81 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.8">
       <module name="apn-jwt.main" target="1.8" />
       <module name="apn-jwt.test" target="1.8" />
     </bytecodeTargetLevel>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7696bff..655dfee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4df381e..85724c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="9cd38b38-8818-43d6-a465-285545f10b31" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -38,7 +41,6 @@
   <component name="ProjectId" id="1WkV3E09oDmot7Y5RDdCQF3Fxim" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
@@ -87,7 +89,9 @@
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -103,18 +107,7 @@
       </list>
     </recent_temporary>
   </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand />
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="9cd38b38-8818-43d6-a465-285545f10b31" name="Default Changelist" comment="" />
@@ -132,82 +125,12 @@
       <workItem from="1580138092704" duration="308000" />
       <workItem from="1580140654676" duration="4818000" />
       <workItem from="1580198778394" duration="73000" />
-      <workItem from="1580198880216" duration="3724000" />
+      <workItem from="1580198880216" duration="3739000" />
+      <workItem from="1646058684704" duration="3926000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="2416" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1579698310206">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state x="2416" y="395" key="#com.intellij.execution.impl.EditConfigurationsDialog/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579698310206" />
-    <state x="3125" y="541" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1580200884115">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state x="3125" y="541" key="#com.intellij.fileTypes.FileTypeChooser/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580200884115" />
-    <state x="2689" y="525" key="#com.intellij.ide.util.TreeClassChooserDialog" timestamp="1579695578501">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state x="2689" y="525" key="#com.intellij.ide.util.TreeClassChooserDialog/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579695578501" />
-    <state x="2785" y="640" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1579693388719">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state x="2785" y="640" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579693388719" />
-    <state width="1750" height="340" key="GridCell.Tab.0.bottom" timestamp="1580202844292">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.0.bottom/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120017" />
-    <state width="1750" height="340" key="GridCell.Tab.0.bottom/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202844292" />
-    <state width="1750" height="340" key="GridCell.Tab.0.center" timestamp="1580202844292">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.0.center/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120011" />
-    <state width="1750" height="340" key="GridCell.Tab.0.center/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202844292" />
-    <state width="1750" height="340" key="GridCell.Tab.0.left" timestamp="1580202844291">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.0.left/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120010" />
-    <state width="1750" height="340" key="GridCell.Tab.0.left/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202844291" />
-    <state width="1750" height="340" key="GridCell.Tab.0.right" timestamp="1580202844292">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.0.right/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120016" />
-    <state width="1750" height="340" key="GridCell.Tab.0.right/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202844292" />
-    <state width="1750" height="501" key="GridCell.Tab.1.bottom" timestamp="1580202743112">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.1.bottom/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120019" />
-    <state width="1750" height="501" key="GridCell.Tab.1.bottom/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202743112" />
-    <state width="1750" height="501" key="GridCell.Tab.1.center" timestamp="1580202743111">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.1.center/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120018" />
-    <state width="1750" height="501" key="GridCell.Tab.1.center/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202743111" />
-    <state width="1750" height="501" key="GridCell.Tab.1.left" timestamp="1580202743111">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.1.left/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120017" />
-    <state width="1750" height="501" key="GridCell.Tab.1.left/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202743111" />
-    <state width="1750" height="501" key="GridCell.Tab.1.right" timestamp="1580202743111">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state width="2076" height="501" key="GridCell.Tab.1.right/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579701120018" />
-    <state width="1750" height="501" key="GridCell.Tab.1.right/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@1792.23.2560.1417" timestamp="1580202743111" />
-    <state x="463" y="286" key="SettingsEditor" timestamp="1579952534931">
-      <screen x="0" y="23" width="1792" height="1097" />
-    </state>
-    <state x="463" y="286" key="SettingsEditor/0.23.1792.1097@0.23.1792.1097" timestamp="1579952534931" />
-    <state x="2453" y="370" key="SettingsEditor/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579693849503" />
-    <state x="550" y="406" key="com.intellij.ide.util.TipDialog" timestamp="1580198838505">
-      <screen x="0" y="23" width="1792" height="1097" />
-    </state>
-    <state x="550" y="406" key="com.intellij.ide.util.TipDialog/4352.23.1920.1057/0.23.1792.1097/1792.23.2560.1417@0.23.1792.1097" timestamp="1580198838505" />
-    <state x="2617" y="346" width="670" height="675" key="run.anything.popup" timestamp="1579693832596">
-      <screen x="1792" y="23" width="2560" height="1417" />
-    </state>
-    <state x="2617" y="346" width="670" height="675" key="run.anything.popup/1792.23.2560.1417/4352.23.1920.1057/0.23.1792.1097@1792.23.2560.1417" timestamp="1579693832596" />
+    <option name="version" value="3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 6909ed5..b49e2ff 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,10 @@ Lightweight Kotlin JWT implementation (Json Web Token) designed for **Apple**, a
 
 No other dependencies required.
 
+## Algorithms supported
+ - ES256
+ - RS256
+
 ## Dependency 
 
 Add the following to your **build.gradle** file:
@@ -16,7 +20,7 @@ allprojects {
 }
 
 dependencies {
-    implementation 'com.github.PhilJay:JWT:1.1.5'
+    implementation 'com.github.PhilJay:JWT:1.2.0'
 }
 ```
 
@@ -33,7 +37,7 @@ Or add the following to your **pom.xml**:
 <dependency>
     <groupId>com.github.PhilJay</groupId>
     <artifactId>JWT</artifactId>
-    <version>1.1.5</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
@@ -78,15 +82,18 @@ Create required encoders, decoders and JSON Mapper (e.g. Gson or equivalent). Th
     }
 ```
 
-Create the token by providing your teamId, keyId and secret (private key excluding header and footer). The teamId can be obtained from the developer member center. The keyId can be obtained when you create your secret (private key).
+Create the Apple JWT token by providing your teamId, keyId and secret (private key excluding header and footer). The teamId can be obtained from the developer member center. The keyId can be obtained when you create your secret (private key).
 
 ```kotlin
-    val token = JWT.token("teamId", "keyId", "secret", jsonEncoder, encoder, decoder)
+    val token = JWT.tokenApple("teamId", "keyId", "secret", jsonEncoder, encoder, decoder)
+```
 
-    // or...
+Create any JWT token by providing the required algorithm, header, payload and secret (private key):
+
+```kotlin
     val header = JWTAuthHeader(...)
     val payload = JWTAuthPayload(...)
-    val token = JWT.token(header, payload, "secret", jsonEncoder, encoder, decoder)
+    val token = JWT.token(Algorithm.ES256, header, payload, "secret", jsonEncoder, encoder, decoder)
 ```
 
 ## Decoding JWT
diff --git a/build.gradle b/build.gradle
index 2f17fbe..bbe7d59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.philjay.jwt'
-version '1.1.5'
+version '1.2.0'
 
 sourceCompatibility = 1.8
 
@@ -16,7 +16,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 
-    testCompile 'com.google.code.gson:gson:2.8.6'
+    testCompile 'com.google.code.gson:gson:2.9.0'
     testCompile 'commons-codec:commons-codec:1.14'
 }
 
diff --git a/src/main/java/com/philjay/jwt/JWT.kt b/src/main/java/com/philjay/jwt/JWT.kt
index 9fc4ae3..7b3b76c 100644
--- a/src/main/java/com/philjay/jwt/JWT.kt
+++ b/src/main/java/com/philjay/jwt/JWT.kt
@@ -16,10 +16,7 @@ import kotlin.text.Charsets.UTF_8
 
 
 object JWT {
-
     private const val verifyAlgorithm = "SHA256withRSA"
-    private const val tokenSignatureAlgorithm = "SHA256withECDSA"
-    private const val keyAlgorithm = "EC"
     private const val tokenDelimiter = '.'
 
     /**
@@ -27,18 +24,18 @@ object JWT {
      *
      * @param teamId The team identifier (can be obtained from the developer console member center)
      * @param keyId  The key identifier (can be obtained when generating your private key)
-     * @param secret The private key (without the header and the footer - as in (BEGIN KEY...)
+     * @param secret The private key (without the header and the footer - as in BEGIN KEY...)
      * @param jsonEncoder: A mapper to transform JWT header and payload to a json String.
      * @param encoder An encoder to base64 encode the JWT header and payload json String.
      * @param decoder A decoder to base64 decode ByteArrays.
      * @param charset The Charset to use for String to ByteArray encoding, defaults to UTF_8.
      * @return A valid JWT token.
      */
-    fun token(
+    fun tokenApple(
         teamId: String,
         keyId: String,
         secret: String,
-        jsonEncoder: JsonEncoder<JWTAuthHeader, JWTAuthPayload>,
+        jsonEncoder: JsonEncoder<AppleJWTAuthHeader, JWTAuthPayload>,
         encoder: Base64Encoder,
         decoder: Base64Decoder,
         charset: Charset = UTF_8
@@ -46,18 +43,19 @@ object JWT {
 
         val now = Instant.now().epochSecond // token timestamp in seconds
 
-        val header = JWTAuthHeader(kid = keyId)
+        val header = AppleJWTAuthHeader(kid = keyId)
         val payload = JWTAuthPayload(teamId, now)
 
-        return token(header, payload, secret, jsonEncoder, encoder, decoder, charset)
+        return token(Algorithm.ES256, header, payload, secret, jsonEncoder, encoder, decoder, charset)
     }
 
     /**
-     * Generates a JWT token as per Apple's specifications. Does not include the required "bearer" prefix.
+     * Generates a JWT token String.
      *
+     * @param algorithm The algorithm to use.
      * @param header The auth header usually containing algorithm and key id.
      * @param payload The payload usually containing at least the team id and timestamp.
-     * @param secret The private key (without the header and the footer - as in (BEGIN KEY...)
+     * @param secret The private key (without the header and the footer - as in BEGIN KEY...)
      * @param jsonEncoder: A mapper to transform JWT header and payload to a json String.
      * @param encoder An encoder to base64 encode the JWT header and payload json String.
      * @param decoder A decoder to base64 decode ByteArrays.
@@ -65,6 +63,7 @@ object JWT {
      * @return A valid JWT token.
      */
     fun <H : JWTAuthHeader, P : JWTAuthPayload> token(
+        algorithm: Algorithm,
         header: H, payload: P, secret: String, jsonEncoder: JsonEncoder<H, P>, encoder: Base64Encoder,
         decoder: Base64Decoder, charset: Charset = UTF_8
     ): String {
@@ -77,7 +76,7 @@ object JWT {
 
         val value = "$base64Header$tokenDelimiter$base64Payload"
 
-        return value + tokenDelimiter + es256(secret, value, encoder, decoder, charset)
+        return value + tokenDelimiter + sign(algorithm, secret, value, encoder, decoder, charset)
     }
 
     /**
@@ -115,9 +114,9 @@ object JWT {
     }
 
     /**
-     * Verifies the provided JWT String with the provided JWK object (public key).
+     * Verifies the provided JWT String with the provided JWK object (RSA public key).
      * @param jwt: The JWK String to validate.
-     * @param jwk: The Json Web Key (public key) obtained from Apple for validation.
+     * @param jwk: The Json Web Key (RSA public key) obtained from Apple for validation.
      * @param decoder: Base64 decoder for decoding the JWT signature.
      * @return True if validation was successful, false if not.
      */
@@ -147,7 +146,8 @@ object JWT {
         }
     }
 
-    private fun es256(
+    private fun sign(
+        algorithm: Algorithm,
         secret: String,
         data: String,
         encoder: Base64Encoder,
@@ -155,18 +155,22 @@ object JWT {
         charset: Charset
     ): String {
 
-        val factory = KeyFactory.getInstance(keyAlgorithm)
+        val factory = KeyFactory.getInstance(algorithm.keyAlg)
         val keySpec = PKCS8EncodedKeySpec(decoder.decode(secret.toByteArray(charset)))
         val key = factory.generatePrivate(keySpec)
 
-        val algECDSAsha256 = Signature.getInstance(tokenSignatureAlgorithm)
-        algECDSAsha256.initSign(key)
-        algECDSAsha256.update(data.toByteArray(charset))
+        val sig = Signature.getInstance(algorithm.alg)
+        sig.initSign(key)
+        sig.update(data.toByteArray(charset))
 
-        return encoder.encodeURLSafe(algECDSAsha256.sign())
+        return encoder.encodeURLSafe(sig.sign())
     }
 }
 
+enum class Algorithm(val alg: String, val keyAlg: String) {
+    ES256("SHA256withECDSA", "EC"), RS256("SHA256withRSA", "RSA")
+}
+
 /**
  * Mapper to transform auth header and payload to a json String.
  */
@@ -299,11 +303,19 @@ open class JWKObject(
  * JWT Authentication token header.
  */
 open class JWTAuthHeader(
+    /** the encryption algorithm used */
+    val alg: String
+)
+
+/**
+ * JWT Authentication token header for Apple.
+ */
+class AppleJWTAuthHeader(
     /** the encryption algorithm used, defaults to ES256 */
-    val alg: String = "ES256",
+    alg: String = Algorithm.ES256.name,
     /** the key identifier (found when generating private key) */
     val kid: String
-)
+) : JWTAuthHeader(alg)
 
 /**
  * JWT authentication token payload.
diff --git a/src/test/java/JWTTest.kt b/src/test/java/JWTTest.kt
index ddd156a..edf8260 100644
--- a/src/test/java/JWTTest.kt
+++ b/src/test/java/JWTTest.kt
@@ -1,7 +1,8 @@
 import com.google.gson.GsonBuilder
 import com.philjay.jwt.*
 import org.apache.commons.codec.binary.Base64
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Test
 import java.time.Instant
 
@@ -29,6 +30,16 @@ class JWTTest {
             return gson.fromJson(json, CustomJWTAuthPayload::class.java)
         }
     }
+    private val appleJsonDecoder = object : JsonDecoder<AppleJWTAuthHeader, CustomJWTAuthPayload> {
+
+        override fun headerFrom(json: String): AppleJWTAuthHeader {
+            return gson.fromJson(json, AppleJWTAuthHeader::class.java)
+        }
+
+        override fun payloadFrom(json: String): CustomJWTAuthPayload {
+            return gson.fromJson(json, CustomJWTAuthPayload::class.java)
+        }
+    }
 
     private val encoder = object : Base64Encoder {
         override fun encodeURLSafe(bytes: ByteArray): String {
@@ -53,11 +64,11 @@ class JWTTest {
     @Test
     fun testDecode() {
 
-        // dummy JWT created with jwt.io
+        // dummy Apple JWT created with jwt.io
         val jwt =
             "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkFCQ0RFRkcifQ.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMiwiaXNzIjoiSkFORSJ9.aWXZy39-nV3chKPGeX8SZnK7PwuqRGxCThrvN955M0Ne4xcd7RJJyoSQEPjbok4MD2PMP7UPquPTYylYRCbsbQ"
 
-        val jwtObject = JWT.decode(jwt, jsonDecoder, decoder)
+        val jwtObject = JWT.decode(jwt, appleJsonDecoder, decoder)
 
         assertNotNull(jwtObject)
         assertEquals("ES256", jwtObject?.header?.alg)
@@ -70,7 +81,47 @@ class JWTTest {
     }
 
     @Test
-    fun testEncodeDecode() {
+    fun testTokenApple() {
+
+        val jsonEncoder = object : JsonEncoder<AppleJWTAuthHeader, JWTAuthPayload> {
+            override fun toJson(header: AppleJWTAuthHeader): String {
+                return gson.toJson(header, AppleJWTAuthHeader::class.java)
+            }
+
+            override fun toJson(payload: JWTAuthPayload): String {
+                return gson.toJson(payload, JWTAuthPayload::class.java)
+            }
+        }
+
+        val nowSeconds = Instant.now().epochSecond
+        // dummy key created in Apple dev console (without header & footer)
+        val secret = "MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgofYVrV6I5TvcM1Gc\n" +
+                "TxiNYa/K30VltjNMg0bupcr9VfagCgYIKoZIzj0DAQehRANCAATc/L5AvAOgsTM5\n" +
+                "h07NRuxi4rU4JWVO7md6wTiJQS3SkMAiyzvSmMXCPf6x6tKyQeppM0jI7XWz+cjo\n" +
+                "Q3raiQbh"
+
+        val jwtString = JWT.tokenApple(
+            teamId = "teamId",
+            keyId = "keyId",
+            secret = secret,
+            jsonEncoder = jsonEncoder,
+            encoder = encoder,
+            decoder = decoder
+        )
+        assertNotNull(jwtString)
+
+        val jwtObject = JWT.decode(jwtString, appleJsonDecoder, decoder)
+
+        assertNotNull(jwtObject)
+        assertEquals("ES256", jwtObject?.header?.alg)
+        assertEquals("keyId", jwtObject?.header?.kid)
+
+        assertEquals(nowSeconds, jwtObject?.payload?.iat)
+        assertEquals("teamId", jwtObject?.payload?.iss)
+    }
+
+    @Test
+    fun testEncodeDecodeEC256() {
 
         val nowSeconds = Instant.now().epochSecond
         val expSeconds = nowSeconds + 3600
@@ -81,18 +132,58 @@ class JWTTest {
                 "h07NRuxi4rU4JWVO7md6wTiJQS3SkMAiyzvSmMXCPf6x6tKyQeppM0jI7XWz+cjo\n" +
                 "Q3raiQbh"
 
-        val header = JWTAuthHeader(kid = "KEYID") // dummy key id
+        val header = JWTAuthHeader(alg = Algorithm.ES256.name) // dummy key id
 
         val payload = CustomJWTAuthPayload("com.philjay.jwt", "test", "ISS", nowSeconds, expSeconds)
 
-        val jwtString = JWT.token(header, payload, secret, jsonEncoder, encoder, decoder)
+        val jwtString = JWT.token(Algorithm.ES256, header, payload, secret, jsonEncoder, encoder, decoder)
         assertNotNull(jwtString)
 
         val jwtObject = JWT.decode(jwtString, jsonDecoder, decoder)
 
         assertNotNull(jwtObject)
         assertEquals("ES256", jwtObject?.header?.alg)
-        assertEquals("KEYID", jwtObject?.header?.kid)
+
+        assertEquals("com.philjay.jwt", jwtObject?.payload?.sub)
+        assertEquals("test", jwtObject?.payload?.name)
+        assertEquals(nowSeconds, jwtObject?.payload?.iat)
+        assertEquals(expSeconds, jwtObject?.payload?.exp)
+        assertEquals("ISS", jwtObject?.payload?.iss)
+    }
+
+    @Test
+    fun testEncodeDecodeRS256() {
+
+        val nowSeconds = Instant.now().epochSecond
+        val expSeconds = nowSeconds + 3600
+
+        // dummy key
+        val secret = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANWfjyOAEf2mqkkn\n" +
+                "31PtdAZK8HJry8T8RKoQg9CvyjP7VoFNSUP0iex21lZiC7SVG9T02I6GWb42EJ6p\n" +
+                "NfLeVtCfBELmWdSbK8uYqUfKAfPONQycRYOsf1sP/pdW8Jwvf9dAqJyYEa+FiH0X\n" +
+                "mPvBy2RCDnTCaRMu3QMr6YEm+LOzAgMBAAECgYB/8Em3xzH/Kdv+aETWbPX59tO+\n" +
+                "k1S8qyEsgSuQxldhfnu2gOUKL+CSoDGKFrpP8qVyixlPcqM4ygR2IX1P8V0oB6Ia\n" +
+                "GXucv9i3zockN0VCN2cR+1dkqkvEnBGjaRDHGCvkBXP6d59o5Qlxp5uoZ9/gcQf4\n" +
+                "yOWj9/QmMt1Yi+l1AQJBAP4DXSOJdMLCj6gppwLr7STNkAYHFA4IfE+PIAiai8Vm\n" +
+                "/CYQZAlhUpEiHgLtLPaVK24u55SyamboSKh2P4UeV/MCQQDXS1GQbLL+vVJhjL78\n" +
+                "ex/6Gkr2bPqjHlFMGihoYo9OVPAffIBvhrVXhgNYJ76LFTDnVURbp12K5LwjLyQy\n" +
+                "COVBAkAb1iaI1HF1PnkbxqTEzzIHzHcyEeiCuS9WUKsEBlu24FhVm4o69O1ldkWv\n" +
+                "sGozA5nk00MRqpO6f04nF/5SCkc9AkBQFJL1Lolx2YfgAxMzJLUjOU5y1NxxeiBx\n" +
+                "NzWahjaZw1xByfSYBzpCoPVzf+0PHMXA9mVj1iAkPqqAR9OlzMtBAkAdEvNs/xAK\n" +
+                "l5VhkxmMDGiF+HX3tetU3tzkh9v4Z0pz9nVDWGDbIPjCjhc60z7SCpOwnlF0bf92\n" +
+                "YTOPkpSdAGlO"
+
+        val header = JWTAuthHeader(alg = Algorithm.RS256.name) // dummy key id
+
+        val payload = CustomJWTAuthPayload("com.philjay.jwt", "test", "ISS", nowSeconds, expSeconds)
+
+        val jwtString = JWT.token(Algorithm.RS256, header, payload, secret, jsonEncoder, encoder, decoder)
+        assertNotNull(jwtString)
+
+        val jwtObject = JWT.decode(jwtString, jsonDecoder, decoder)
+
+        assertNotNull(jwtObject)
+        assertEquals("RS256", jwtObject?.header?.alg)
 
         assertEquals("com.philjay.jwt", jwtObject?.payload?.sub)
         assertEquals("test", jwtObject?.payload?.name)