finalized correct storage for db token storage, exists was also wrong

Author: lmajano

models/jwt/JwtService.cfc

@@ -171,6 +171,9 @@ component accessors="true" singleton{
 	 * @token The token to invalidate
 	 */
 	boolean function invalidate( required token ){
+		if( variables.log.canInfo() ){
+			variables.log.info( "Token invalidation request issued for :#arguments.token#" );
+		}
 		return getTokenStorage().clear( arguments.token );
 	}
 
@@ -314,6 +317,22 @@ component accessors="true" singleton{
 		return event.getPrivateValue( "jwt_payload" );
 	}
 
+	/**
+	 * Get the authenticated user stored on `prc` via the variables.settings.prcUserVariable setting.
+	 * if it doesn't exist, then call parseToken() and try to load it and authenticate it.
+	 *
+	 * @return The user that implements IAuth and IJwtSubject
+	 */
+	function getUser(){
+		var event = variables.requestService.getContext();
+
+		if( !event.privateValueExists( variables.settings.prcUserVariable ) ){
+			parseToken();
+		}
+
+		return event.getPrivateValue( variables.settings.prcUserVariable );
+	}
+
 	/************************************************************************************/
 	/****************************** RAW JWT Methods *************************************/
 	/************************************************************************************/

models/jwt/storages/CacheTokenStorage.cfc

@@ -10,6 +10,7 @@ component accessors="true" singleton{
 	property name="wirebox" 	inject="wirebox";
 	property name="cachebox" 	inject="cachebox";
 	property name="settings" 	inject="coldbox:moduleSettings:cbSecurity";
+	property name="jwtService"	inject="JwtService@cbSecurity";
 
 	/**
 	 * Storage properties
@@ -69,8 +70,8 @@ component accessors="true" singleton{
 			buildKey( arguments.key ),
 			{
 				token 		: arguments.token,
-				expiration 	: arguments.expiration,
-				created 	: now(),
+				expiration 	: jwtService.fromEpoch( arguments.payload.exp ),
+				issued 		: jwtService.fromEpoch( arguments.payload.iat ),
 				payload		: arguments.payload
 			},
 			arguments.expiration

models/jwt/storages/DBTokenStorage.cfc

@@ -15,7 +15,8 @@
  * - id : db identifier
  * - cacheKey : varchar 255
  * - token : text
- * - expiration : varchar 255 (unix timestamp)
+ * - expiration : (unix timestamp)
+ * - issued : (unix timestamp)
  * - subject : varchar 255
  *
  */
@@ -25,6 +26,7 @@ component accessors="true" singleton{
 	property name="wirebox" 	inject="wirebox";
 	property name="cachebox" 	inject="cachebox";
 	property name="settings" 	inject="coldbox:moduleSettings:cbSecurity";
+	property name="jwtService"	inject="JwtService@cbSecurity";
 
 	/**
 	 * Storage properties
@@ -41,7 +43,7 @@ component accessors="true" singleton{
 	 */
 	property name="keyPrefix";
 
-	variables.COLUMNS = "id,cacheKey,token,expiration,created,subject";
+	variables.COLUMNS = "id,cacheKey,token,expiration,issued,subject";
 
 	/**
 	 * Constructor
@@ -111,16 +113,16 @@ component accessors="true" singleton{
 					:cacheKey,
 					:token,
 					:expiration,
-					:created,
+					:issued,
 					: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() },
+				expiration 	= { cfsqltype="timestamp", 	value=jwtService.fromEpoch( arguments.payload.exp ) },
+				issued     = { cfsqltype="timestamp", 	value=jwtService.fromEpoch( arguments.payload.iat ) },
 				subject 	= { cfsqltype="varchar", 	value=arguments.payload.sub },
 			},
 			{
@@ -136,27 +138,16 @@ component accessors="true" singleton{
      * @key The cache key
      */
     boolean function exists( required key ){
-		queryExecute(
-			"INSERT INTO #getTable()# (#variables.COLUMNS#)
-				VALUES (
-					:uuid,
-					:cacheKey,
-					:token,
-					:expiration,
-					:created
-				)
-			",
+		var qResults = queryExecute(
+			"SELECT cacheKey FROM #getTable()# WHERE cacheKey = :cacheKey",
 			{
-				uuid      	= { cfsqltype="varchar", 	value="#variables.uuid.randomUUID().toString()#" },
-				cacheKey  	= { cfsqltype="varchar", 	value=arguments.key },
-				token  		= { cfsqltype="varchar", 	value=arguments.token },
-				expiration 	= { cfsqltype="timestamp", 	value=arguments.expiration },
-				created     = { cfsqltype="timestamp", 	value=now() }
+				cacheKey : arguments.key
 			},
 			{
-				datasource = variables.properties.dsn
+				datsource 	= variables.properties.dsn
 			}
 		);
+		return qResults.recordcount > 0;
 	}
 
     /**
@@ -170,7 +161,7 @@ component accessors="true" singleton{
     struct function get( required key, struct defaultValue ){
 		// select entry
 		var q = queryExecute(
-			"SELECT cacheKey, token, expiration, created
+			"SELECT cacheKey, token, expiration, issued
 				FROM #getTable()#
 				WHERE cacheKey = ?
 			",
@@ -183,10 +174,10 @@ component accessors="true" singleton{
 		// Just return if records found, else null
 		if( q.recordCount ){
 			return {
-				"token"      : q.token,
-				"cacheKey"   : q.cacheKey,
-				"expiration" : q.expiration,
-				"created"    : q.created
+				"token"      	: q.token,
+				"cacheKey"   	: q.cacheKey,
+				"expiration" 	: q.expiration,
+				"issued"    	: q.issued
 			};
 		}
 
@@ -333,8 +324,8 @@ component accessors="true" singleton{
 						"CREATE TABLE #getTable()# (
 							id VARCHAR(36) NOT NULL,
 							cacheKey VARCHAR(255) NOT NULL,
-							expiration VARCHAR(255) NOT NULL,
-							created #getDateTimeColumnType()# NOT NULL,
+							expiration #getDateTimeColumnType()# NOT NULL,
+							issued #getDateTimeColumnType()# NOT NULL,
 							token #getTextColumnType()# NOT NULL,
 							subject VARCHAR(255) NOT NULL,
 							PRIMARY KEY (id)

test-harness/config/Coldbox.cfc

@@ -124,8 +124,11 @@
 					"tokenStorage"        : {
 						"enabled"    : true,
 						"keyPrefix"  : "cbjwt_",
-						"driver"     : "cachebox",
-						"properties" : { "cacheName" : "default" }
+						//"driver"     : "cachebox",
+						//"properties" : { "cacheName" : "default" }
+
+						"driver"     : "db",
+						"properties" : { "table" : "jwtTokens" }
 					}
 				}
 			}