finalized all storage services

Author: lmajano

interfaces/jwt/IJwtStorage.cfc

@@ -19,10 +19,16 @@ interface{
      * @key The cache key
      * @token The token to store
      * @expiration The token expiration
+	 * @payload The payload
      *
      * @return JWTStorage
      */
-    any function set( required key, required token, required expiration );
+    any function set(
+		required key,
+		required token,
+		required expiration,
+		required payload
+	);
 
     /**
      * Verify if the passed in token key exists

models/jwt/JwtService.cfc

@@ -109,7 +109,12 @@ component accessors="true" singleton{
 
 		// Store it with the expiration as well if enabled
 		if( variables.settings.jwt.tokenStorage.enabled ){
-			getTokenStorage().set( payload.jti, jwtToken, variables.settings.jwt.expiration );
+			getTokenStorage().set(
+				key 		= payload.jti,
+				token 		= jwtToken,
+				expiration 	= variables.settings.jwt.expiration,
+				payload		= payload
+			);
 		}
 
 		// Return it

models/jwt/storages/CacheTokenStorage.cfc

@@ -55,16 +55,23 @@ component accessors="true" singleton{
      * @key The cache key
      * @token The token to store
      * @expiration The token expiration
+	 * @payload The payload
      *
      * @return JWTStorage
      */
-    any function set( required key, required token, required expiration ){
+    any function set(
+		required key,
+		required token,
+		required expiration,
+		required payload
+	){
 		variables.cache.set(
 			buildKey( arguments.key ),
 			{
 				token 		: arguments.token,
 				expiration 	: arguments.expiration,
-				created 	: now()
+				created 	: now(),
+				payload		: arguments.payload
 			},
 			arguments.expiration
 		);

models/jwt/storages/DBTokenStorage.cfc

@@ -16,6 +16,7 @@
  * - cacheKey : varchar 255
  * - token : text
  * - expiration : varchar 255 (unix timestamp)
+ * - subject : varchar 255
  *
  */
 component accessors="true" singleton{
@@ -40,7 +41,7 @@ component accessors="true" singleton{
 	 */
 	property name="keyPrefix";
 
-	variables.COLUMNS = "id,cacheKey,token,expiration,created";
+	variables.COLUMNS = "id,cacheKey,token,expiration,created,subject";
 
 	/**
 	 * Constructor
@@ -93,26 +94,34 @@ component accessors="true" singleton{
      * @key The cache key
      * @token The token to store
      * @expiration The token expiration
+	 * @payload The payload
      *
      * @return JWTStorage
      */
-    any function set( required key, required token, required expiration ){
+    any function set(
+		required key,
+		required token,
+		required expiration,
+		required payload
+	){
 		queryExecute(
 			"INSERT INTO #getTable()# (#variables.COLUMNS#)
 				VALUES (
 					:uuid,
 					:cacheKey,
 					:token,
 					:expiration,
-					:created
+					:created,
+					:subject
 				)
 			",
 			{
 				uuid      	= { cfsqltype="varchar", 	value="#variables.uuid.randomUUID().toString()#" },
 				cacheKey  	= { cfsqltype="varchar", 	value=arguments.key },
 				token  		= { cfsqltype="longvarchar",value=arguments.token },
 				expiration 	= { cfsqltype="varchar", 	value=arguments.expiration },
-				created     = { cfsqltype="timestamp", 	value=now() }
+				created     = { cfsqltype="timestamp", 	value=now() },
+				subject 	= { cfsqltype="varchar", 	value=arguments.payload.sub },
 			},
 			{
 				datasource = variables.properties.dsn
@@ -316,6 +325,7 @@ component accessors="true" singleton{
 					break;
 				}
 			}
+
 			// create it
 			if( NOT tableFound ){
 				transaction{
@@ -326,6 +336,7 @@ component accessors="true" singleton{
 							expiration VARCHAR(255) NOT NULL,
 							created #getDateTimeColumnType()# NOT NULL,
 							token #getTextColumnType()# NOT NULL,
+							subject VARCHAR(255) NOT NULL,
 							PRIMARY KEY (id)
 						)",
 						{},

test-harness/config/Coldbox.cfc

@@ -138,9 +138,9 @@
 					"tokenStorage"            : {
 						"enabled"       : true,
 						"keyPrefix"     : "cbjwt_",
-						"driver"        : "db",
+						"driver"        : "cachebox",
 						"properties"    : {
-							"table" : "jwtTokens"
+							"cacheName" : "default"
 						}
 					}
 				}