fixup! add perm activity log ui

MetaMask · Sep 12, 2019 · 879ee72 · 879ee72
1 parent 163c214
commit 879ee72
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 23 deletions.
diff --git a/app/scripts/controllers/permissions/index.js b/app/scripts/controllers/permissions/index.js
@@ -1 +1 @@
-module.exports = require('./permissions')
+module.exports = require('./permissions')
diff --git a/app/scripts/controllers/permissions/loggerMiddleware.js b/app/scripts/controllers/permissions/loggerMiddleware.js
@@ -7,7 +7,7 @@ const LOG_LIMIT = 100
  * permissions-related methods.
  */
 module.exports = function createLoggerMiddleware ({
-  walletPrefix, restrictedMethods, store, storeKey
+  walletPrefix, restrictedMethods, store, storeKey,
 }) {
   return (req, res, next, _end) => {
 
@@ -30,6 +30,7 @@ module.exports = function createLoggerMiddleware ({
     const entry = {
       method: request.method,
       methodType: isInternal ? 'internal' : 'restricted',
+      origin: request.origin,
       request: cloneObj(request),
       requestTime: Date.now(),
       response: null,

diff --git a/app/scripts/controllers/permissions/permissions.js b/app/scripts/controllers/permissions/permissions.js
@@ -28,7 +28,7 @@ class PermissionsController {
     restoredState = {}) {
     this.store = new ObservableStore({
       [METADATA_STORE_KEY]: { ...restoredState[METADATA_STORE_KEY] },
-      [LOG_STORE_KEY]: restoredState[LOG_STORE_KEY] || []
+      [LOG_STORE_KEY]: restoredState[LOG_STORE_KEY] || [],
     })
     this._openPopup = openPopup
     this._closePopup = closePopup

diff --git a/app/scripts/controllers/permissions/requestMiddleware.js b/app/scripts/controllers/permissions/requestMiddleware.js
@@ -6,7 +6,7 @@ const { errors: rpcErrors } = require('eth-json-rpc-errors')
  * Create middleware for preprocessing permissions requests.
  */
 module.exports = function createRequestMiddleware ({
-  internalPrefix, store, storeKey
+  internalPrefix, store, storeKey,
 }) {
   return createAsyncMiddleware(async (req, res, next) => {
 
@@ -22,7 +22,7 @@ module.exports = function createRequestMiddleware ({
             req.siteMetadata &&
             typeof req.siteMetadata.name === 'string'
           ) {
-              store.updateState({
+            store.updateState({
               [storeKey]: {
                 ...store.getState()[storeKey],
                 [req.origin]: req.siteMetadata,

diff --git a/ui/app/pages/settings/permissions-tab/permissions-activity/index.js b/ui/app/pages/settings/permissions-tab/permissions-activity/index.js
@@ -1 +1 @@
-export { default } from './permissions-activity.component'
+export { default } from './permissions-activity.component'
diff --git a/ui/app/pages/settings/permissions-tab/permissions-activity/permissions-activity.component.js b/ui/app/pages/settings/permissions-tab/permissions-activity/permissions-activity.component.js
@@ -32,11 +32,23 @@ export default class PermissionsLog extends Component {
         {
           permissionsLog.map((e, i) => {
             const date = new Date(e.requestTime)
+            const dateString = date.toLocaleDateString()
+            const timeString = date.toLocaleTimeString(
+              [], {hour: '2-digit', minute: '2-digit'}
+            )
+            const methodName = (
+              e.method.startsWith('wallet_')
+                ? e.method.split('wallet_')[1]
+                : e.method
+            )
             return (
               <li key={i}>
                 <details className="settings-page__content-list-details">
                   <summary>
-                    {`${date.toLocaleDateString()} ${date.toLocaleTimeString()} | ${e.method}`}
+                    {
+                      `${dateString} ${timeString} | ` +
+                      `${e.origin} | ${methodName}`
+                    }
                     <i className="caret"></i>
                   </summary>
                   <ul>
@@ -58,11 +70,13 @@ export default class PermissionsLog extends Component {
         e.method.endsWith('getPermissions') ||
         e.method.endsWith('requestPermissions')
       ) {
-        if (e.response.result.length === 0) return (
-          <li className="settings-page__content-list-item">
-            {'[]'}
-          </li>
-        )
+        if (e.response.result.length === 0) {
+          return (
+            <li className="settings-page__content-list-item">
+              {'[]'}
+            </li>
+          )
+        }
         return e.response.result.map(perm => (
           <li
             key={perm.parentCapability}

diff --git a/ui/app/pages/settings/permissions-tab/permissions-list/index.js b/ui/app/pages/settings/permissions-tab/permissions-list/index.js
@@ -1 +1 @@
-export { default } from './permissions-list.component'
+export { default } from './permissions-list.component'
diff --git a/ui/app/pages/settings/permissions-tab/permissions-tab.component.js b/ui/app/pages/settings/permissions-tab/permissions-tab.component.js
@@ -67,21 +67,21 @@ export default class PermissionsTab extends Component {
           siteMetadata={this.props.siteMetadata}
         />
         {
-           this.renderClearButton(
-             'clearPermissions',
-             this.props.showClearPermissionsModal,
-             !hasPermissions
-           ) 
+          this.renderClearButton(
+            'clearPermissions',
+            this.props.showClearPermissionsModal,
+            !hasPermissions
+          )
         }
         <PermissionsActivity
           permissionsLog={this.props.permissionsLog}
         />
         {
-           this.renderClearButton(
-             'clearPermissionsActivity',
-             this.props.showClearPermissionsActivityModal,
-             !hasPermissionsActivity
-           ) 
+          this.renderClearButton(
+            'clearPermissionsActivity',
+            this.props.showClearPermissionsActivityModal,
+            !hasPermissionsActivity
+          )
         }
       </div>
     )