From 89dd41d81f16f9d6c0bc1e67652127f8a667e466 Mon Sep 17 00:00:00 2001
From: Andrew Nicolaou <me@andrewnicolaou.co.uk>
Date: Wed, 15 May 2019 12:28:18 +0200
Subject: [PATCH] lastUserAt should be null if the key has never been used

---
 client/modules/User/components/APIKeyForm.jsx | 5 +++--
 client/modules/User/components/APIKeyList.jsx | 4 ++--
 server/models/user.js                         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/modules/User/components/APIKeyForm.jsx b/client/modules/User/components/APIKeyForm.jsx
index 17ec61e7..94850099 100644
--- a/client/modules/User/components/APIKeyForm.jsx
+++ b/client/modules/User/components/APIKeyForm.jsx
@@ -10,9 +10,10 @@ const plusIcon = require('../../../images/plus-icon.svg');
 
 export const APIKeyPropType = PropTypes.shape({
   id: PropTypes.object.isRequired,
+  token: PropTypes.object,
   label: PropTypes.string.isRequired,
-  createdAt: PropTypes.object.isRequired,
-  lastUsedAt: PropTypes.object.isRequired,
+  createdAt: PropTypes.string.isRequired,
+  lastUsedAt: PropTypes.string,
 });
 
 class APIKeyForm extends React.Component {
diff --git a/client/modules/User/components/APIKeyList.jsx b/client/modules/User/components/APIKeyList.jsx
index b3df65dd..3f036318 100644
--- a/client/modules/User/components/APIKeyList.jsx
+++ b/client/modules/User/components/APIKeyList.jsx
@@ -22,13 +22,13 @@ function APIKeyList({ apiKeys, onRemove }) {
       </thead>
       <tbody>
         {orderBy(apiKeys, ['createdAt'], ['desc']).map((key) => {
-          const hasNewToken = !!key.token;
+          const lastUsed = key.lastUsedAt ? distanceInWordsToNow(new Date(key.lastUsedAt), { addSuffix: true }) : 'Never';
 
           return (
             <tr key={key.id}>
               <td>{key.label}</td>
               <td>{format(new Date(key.createdAt), 'MMM D, YYYY h:mm A')}</td>
-              <td>{distanceInWordsToNow(new Date(key.lastUsedAt), { addSuffix: true })}</td>
+              <td>{lastUsed}</td>
               <td className="api-key-list__action">
                 <button className="api-key-list__delete-button" onClick={() => onRemove(key)}>
                   <InlineSVG src={trashCan} alt="Delete Key" />
diff --git a/server/models/user.js b/server/models/user.js
index 8bd33782..fc137be6 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -12,7 +12,7 @@ const { Schema } = mongoose;
 
 const apiKeySchema = new Schema({
   label: { type: String, default: 'API Key' },
-  lastUsedAt: { type: Date, required: true, default: Date.now },
+  lastUsedAt: { type: Date },
   hashedKey: { type: String, required: true },
 }, { timestamps: true, _id: true });