r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

lastUserAt should be null if the key has never been used

This commit is contained in:
Andrew Nicolaou 2019-05-15 12:28:18 +02:00 committed by Cassie Tarakajian
parent 3e760ca0b8
commit 89dd41d81f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/modules/User/components/APIKeyForm.jsx
View File

@ -10,9 +10,10 @@ const plusIcon = require('../../../images/plus-icon.svg');
export const APIKeyPropType = PropTypes.shape({ export const APIKeyPropType = PropTypes.shape({
id: PropTypes.object.isRequired, id: PropTypes.object.isRequired,
token: PropTypes.object,
label: PropTypes.string.isRequired, label: PropTypes.string.isRequired,
createdAt: PropTypes.object.isRequired, createdAt: PropTypes.string.isRequired,
lastUsedAt: PropTypes.object.isRequired, lastUsedAt: PropTypes.string,
}); });
class APIKeyForm extends React.Component { class APIKeyForm extends React.Component {

4
client/modules/User/components/APIKeyList.jsx
View File

@ -22,13 +22,13 @@ function APIKeyList({ apiKeys, onRemove }) {
</thead> </thead>
<tbody> <tbody>
{orderBy(apiKeys, ['createdAt'], ['desc']).map((key) => { {orderBy(apiKeys, ['createdAt'], ['desc']).map((key) => {
const hasNewToken = !!key.token; const lastUsed = key.lastUsedAt ? distanceInWordsToNow(new Date(key.lastUsedAt), { addSuffix: true }) : 'Never';
return ( return (
<tr key={key.id}> <tr key={key.id}>
<td>{key.label}</td> <td>{key.label}</td>
<td>{format(new Date(key.createdAt), 'MMM D, YYYY h:mm A')}</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"> <td className="api-key-list__action">
<button className="api-key-list__delete-button" onClick={() => onRemove(key)}> <button className="api-key-list__delete-button" onClick={() => onRemove(key)}>
<InlineSVG src={trashCan} alt="Delete Key" /> <InlineSVG src={trashCan} alt="Delete Key" />

2
server/models/user.js
View File

@ -12,7 +12,7 @@ const { Schema } = mongoose;
const apiKeySchema = new Schema({ const apiKeySchema = new Schema({
label: { type: String, default: 'API Key' }, label: { type: String, default: 'API Key' },
lastUsedAt: { type: Date, required: true, default: Date.now }, lastUsedAt: { type: Date },
hashedKey: { type: String, required: true }, hashedKey: { type: String, required: true },
}, { timestamps: true, _id: true }); }, { timestamps: true, _id: true });