Optimize & group dapp requests (#7083)
* Group similar methods in same grouping * Add a shell_getMethodGroups API * Small code clean changes * Fix bug dapp.name not showing * Additional error handling * Store sources in own map * Remove observable variables where not needed * Refactor code and fix bug dapp not showing on approve
This commit is contained in:
Amaury Martiny
Jaco Greeff
parent
2650154cd7
commit
570fc56af7
9
js/src/DappRequests/README.md
Normal file
9
js/src/DappRequests/README.md
Normal file
@ -0,0 +1,9 @@
|
||||
# Terminology used
|
||||
|
||||
To be clear with the terminology used in the code here:
|
||||
|
||||
- a *method* is an allowed JSON-RPC api method or a shell method
|
||||
- a *methodGroup* is the grouping of similar methods (see `methodGroups.js`)
|
||||
- a *permission* is a boolean which tells if an app is allowed to call a method or not
|
||||
- a *request* is when an app prompts the shell to call a method
|
||||
- a *requestGroup* is an array of *requests* whose methods are in the same *methodGroup*
|
||||
@ -1,85 +0,0 @@
|
||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import Button from '@parity/ui/lib/Button';
|
||||
|
||||
import DappsStore from '@parity/shared/lib/mobx/dappsStore';
|
||||
|
||||
export default function Request ({ appId, className, approveRequest, denyRequest, queueId, request: { from, method } }) {
|
||||
const _onApprove = () => approveRequest(queueId, false);
|
||||
const _onApproveAll = () => approveRequest(queueId, true);
|
||||
const _onReject = () => denyRequest(queueId);
|
||||
|
||||
const app = DappsStore.get().getAppById(appId);
|
||||
|
||||
return (
|
||||
<div className={ className }>
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.info'
|
||||
defaultMessage='Received request for {method} from {appName}'
|
||||
values={ {
|
||||
appName:
|
||||
app
|
||||
? app.name
|
||||
: appId,
|
||||
method
|
||||
} }
|
||||
/>
|
||||
<div>
|
||||
<Button
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.buttons.approve'
|
||||
defaultMessage='Approve'
|
||||
/>
|
||||
}
|
||||
onClick={ _onApprove }
|
||||
/>
|
||||
<Button
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.buttons.approveAll'
|
||||
defaultMessage='Approve All'
|
||||
/>
|
||||
}
|
||||
onClick={ _onApproveAll }
|
||||
/>
|
||||
<Button
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.buttons.reject'
|
||||
defaultMessage='Reject'
|
||||
/>
|
||||
}
|
||||
onClick={ _onReject }
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Request.propTypes = {
|
||||
appId: PropTypes.string.isRequired,
|
||||
className: PropTypes.string,
|
||||
approveRequest: PropTypes.func.isRequired,
|
||||
denyRequest: PropTypes.func.isRequired,
|
||||
queueId: PropTypes.number.isRequired,
|
||||
request: PropTypes.object.isRequired
|
||||
};
|
||||
39
js/src/DappRequests/RequestGroups/RequestGroups.css
Normal file
39
js/src/DappRequests/RequestGroups/RequestGroups.css
Normal file
@ -0,0 +1,39 @@
|
||||
/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
/* This file is part of Parity.
|
||||
/*
|
||||
/* Parity is free software: you can redistribute it and/or modify
|
||||
/* it under the terms of the GNU General Public License as published by
|
||||
/* the Free Software Foundation, either version 3 of the License, or
|
||||
/* (at your option) any later version.
|
||||
/*
|
||||
/* Parity is distributed in the hope that it will be useful,
|
||||
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
/* GNU General Public License for more details.
|
||||
/*
|
||||
/* You should have received a copy of the GNU General Public License
|
||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
$backgroundOne: #f80;
|
||||
$backgroundTwo: #e57a00;
|
||||
|
||||
.requestGroups {
|
||||
background: $backgroundOne;
|
||||
background: linear-gradient($backgroundOne, $backgroundTwo);
|
||||
padding: 0.5em;
|
||||
text-align: right;
|
||||
color: white;
|
||||
|
||||
> span {
|
||||
margin-right: 30px;
|
||||
}
|
||||
|
||||
.requestGroup {
|
||||
margin-top: 2px;
|
||||
|
||||
.requestGroupTitle {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
116
js/src/DappRequests/RequestGroups/RequestGroups.js
Normal file
116
js/src/DappRequests/RequestGroups/RequestGroups.js
Normal file
@ -0,0 +1,116 @@
|
||||
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { PureComponent } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import Popup from 'semantic-ui-react/dist/commonjs/modules/Popup';
|
||||
import Button from '@parity/ui/lib/Button';
|
||||
|
||||
import DappsStore from '@parity/shared/lib/mobx/dappsStore';
|
||||
|
||||
import styles from './RequestGroups.css';
|
||||
|
||||
export default class RequestGroups extends PureComponent {
|
||||
state = {
|
||||
opened: false
|
||||
};
|
||||
|
||||
handleApproveRequestGroup = groupId => {
|
||||
const { requestGroups, onApproveRequestGroup } = this.props;
|
||||
|
||||
onApproveRequestGroup(Object.values(requestGroups[groupId].map(({ requestId }) => requestId)));
|
||||
}
|
||||
|
||||
handleRejectRequestGroup = groupId => {
|
||||
const { requestGroups, onRejectRequestGroup } = this.props;
|
||||
|
||||
onRejectRequestGroup(Object.values(requestGroups[groupId].map(({ requestId }) => requestId)));
|
||||
}
|
||||
|
||||
renderPopupContent = groupId => {
|
||||
const { requestGroups } = this.props;
|
||||
// Get unique list of methods in that request group
|
||||
const requestedMethods = [...new Set(
|
||||
Object.values(requestGroups[groupId])
|
||||
.map(request => request.data.method || request.data.params[0])
|
||||
)];
|
||||
|
||||
return `Requested methods: ${requestedMethods.join(', ')}`;
|
||||
}
|
||||
|
||||
render () {
|
||||
const {
|
||||
appId,
|
||||
requestGroups
|
||||
} = this.props;
|
||||
|
||||
const app = DappsStore.get().getAppById(appId);
|
||||
|
||||
return (
|
||||
<div className={ styles.requestGroups }>
|
||||
<FormattedMessage
|
||||
className={ styles.requestGroups }
|
||||
id='dappRequests.request.info'
|
||||
defaultMessage='{appName} wants to request permissions:'
|
||||
values={ {
|
||||
appName: app ? app.name : `Dapp ${appId}`
|
||||
} }
|
||||
/>
|
||||
{Object.keys(requestGroups).map(groupId => (
|
||||
<div key={ `${appId}-${groupId}` } className={ styles.requestGroup }>
|
||||
<span className={ styles.requestGroupTitle }>
|
||||
Permission for{' '}
|
||||
<Popup
|
||||
trigger={ <span>{groupId}</span> }
|
||||
content={ this.renderPopupContent(groupId) }
|
||||
/>
|
||||
</span>
|
||||
<Button
|
||||
size='mini'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.buttons.approve'
|
||||
defaultMessage='Approve'
|
||||
/>
|
||||
}
|
||||
onClick={ () => this.handleApproveRequestGroup(groupId) }
|
||||
/>
|
||||
<Button
|
||||
size='mini'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='dappRequests.request.buttons.reject'
|
||||
defaultMessage='Reject'
|
||||
/>
|
||||
}
|
||||
onClick={ () => this.handleRejectRequestGroup(groupId) }
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
RequestGroups.propTypes = {
|
||||
appId: PropTypes.string.isRequired,
|
||||
className: PropTypes.string,
|
||||
onApproveRequestGroup: PropTypes.func.isRequired,
|
||||
onRejectRequestGroup: PropTypes.func.isRequired,
|
||||
requestGroups: PropTypes.object.isRequired
|
||||
};
|
||||
@ -14,4 +14,4 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './request';
|
||||
export default from './RequestGroups';
|
||||
@ -15,27 +15,10 @@
|
||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
$backgroundOne: #f80;
|
||||
$backgroundTwo: #e57a00;
|
||||
|
||||
.requests {
|
||||
color: white;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 1001; /* sits above sync warning */
|
||||
|
||||
.request {
|
||||
align-items: center;
|
||||
background: $backgroundOne;
|
||||
background: linear-gradient($backgroundOne, $backgroundTwo);
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding: 0.5em;
|
||||
|
||||
> span {
|
||||
margin-right: 1em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,36 +15,43 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { observer } from 'mobx-react';
|
||||
import React from 'react';
|
||||
import React, { PureComponent } from 'react';
|
||||
|
||||
import Request from './Request';
|
||||
import RequestGroups from './RequestGroups';
|
||||
import Store from './store';
|
||||
import styles from './dappRequests.css';
|
||||
|
||||
function DappRequests () {
|
||||
const store = Store.get();
|
||||
class DappRequests extends PureComponent {
|
||||
store = Store.get();
|
||||
|
||||
if (!store || !store.hasRequests) {
|
||||
handleApproveRequestGroup = requestIds => {
|
||||
requestIds.forEach(this.store.approveRequest);
|
||||
}
|
||||
|
||||
handleRejectRequestGroup = requestIds => {
|
||||
requestIds.forEach(this.store.rejectRequest);
|
||||
}
|
||||
|
||||
render () {
|
||||
if (!this.store || !this.store.hasRequests) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={ styles.requests }>
|
||||
{
|
||||
store.squashedRequests.map(({ appId, queueId, request: { data } }) => (
|
||||
<Request
|
||||
{Object.keys(this.store.groupedRequests)
|
||||
.map(appId => (
|
||||
<RequestGroups
|
||||
key={ appId }
|
||||
appId={ appId }
|
||||
className={ styles.request }
|
||||
approveRequest={ store.approveRequest }
|
||||
denyRequest={ store.rejectRequest }
|
||||
key={ queueId }
|
||||
queueId={ queueId }
|
||||
request={ data }
|
||||
onApproveRequestGroup={ this.handleApproveRequestGroup }
|
||||
onRejectRequestGroup={ this.handleRejectRequestGroup }
|
||||
requestGroups={ this.store.groupedRequests[appId] }
|
||||
/>
|
||||
))
|
||||
}
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default observer(DappRequests);
|
||||
|
||||
@ -14,21 +14,19 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default {
|
||||
const methodGroups = {
|
||||
shell: {
|
||||
methods: [
|
||||
'shell_getApps',
|
||||
'shell_getFilteredMethods',
|
||||
'shell_getMethodGroups',
|
||||
'shell_getMethodPermissions',
|
||||
'shell_setAppVisibility',
|
||||
'shell_setMethodPermissions'
|
||||
]
|
||||
},
|
||||
accountsView: {
|
||||
methods: [
|
||||
'parity_accountsInfo',
|
||||
'parity_allAccountsInfo'
|
||||
]
|
||||
methods: ['parity_accountsInfo', 'parity_allAccountsInfo']
|
||||
},
|
||||
accountsCreate: {
|
||||
methods: [
|
||||
@ -42,10 +40,7 @@ export default {
|
||||
]
|
||||
},
|
||||
accountsEdit: {
|
||||
methods: [
|
||||
'parity_setAccountName',
|
||||
'parity_setAccountMeta'
|
||||
]
|
||||
methods: ['parity_setAccountName', 'parity_setAccountMeta']
|
||||
},
|
||||
upgrade: {
|
||||
methods: [
|
||||
@ -76,3 +71,15 @@ export default {
|
||||
]
|
||||
}
|
||||
};
|
||||
|
||||
const methodGroupFromMethod = {}; // Maps method to methodGroup
|
||||
|
||||
// Populate methodGroupFromMethod
|
||||
Object.keys(methodGroups).forEach(groupId => {
|
||||
methodGroups[groupId].methods.forEach(method => {
|
||||
methodGroupFromMethod[method] = groupId;
|
||||
});
|
||||
});
|
||||
|
||||
export { methodGroupFromMethod };
|
||||
export default methodGroups;
|
||||
@ -19,19 +19,17 @@ import store from 'store';
|
||||
|
||||
import { sha3 } from '@parity/api/lib/util/sha3';
|
||||
|
||||
import filteredRequests from './filteredRequests';
|
||||
import { methodGroupFromMethod } from './methodGroups';
|
||||
|
||||
const LS_PERMISSIONS = '_parity::dapps::methods';
|
||||
|
||||
let nextQueueId = 0;
|
||||
|
||||
export default class Store {
|
||||
@observable permissions = {};
|
||||
@observable requests = [];
|
||||
@observable tokens = {};
|
||||
@observable requests = {}; // Maps requestId to request
|
||||
|
||||
middleware = [];
|
||||
sources = {};
|
||||
permissions = {}; // Maps `${method}:${appId}` to true/false
|
||||
sources = {}; // Maps requestId to a postMessage source
|
||||
tokens = {}; // Maps token to appId
|
||||
|
||||
constructor (provider) {
|
||||
this.provider = provider;
|
||||
@ -41,131 +39,112 @@ export default class Store {
|
||||
}
|
||||
|
||||
@computed get hasRequests () {
|
||||
return this.requests.length !== 0;
|
||||
return Object.keys(this.requests).length !== 0;
|
||||
}
|
||||
|
||||
@computed get squashedRequests () {
|
||||
const duplicates = {};
|
||||
|
||||
return this.requests.filter(({ request: { data: { method, token } } }) => {
|
||||
const section = this.getFilteredSectionName(method);
|
||||
const id = `${token}:${section}`;
|
||||
|
||||
if (!duplicates[id]) {
|
||||
duplicates[id] = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
@action createToken = (appId) => {
|
||||
const token = sha3(`${appId}:${Date.now()}`);
|
||||
|
||||
this.tokens = Object.assign({}, this.tokens, {
|
||||
[token]: appId
|
||||
});
|
||||
|
||||
return token;
|
||||
}
|
||||
|
||||
@action removeRequest = (_queueId) => {
|
||||
this.requests = this.requests.filter(({ queueId }) => queueId !== _queueId);
|
||||
delete this.sources[_queueId];
|
||||
}
|
||||
|
||||
@action queueRequest = (request) => {
|
||||
const { data, origin, source } = request;
|
||||
@computed get groupedRequests () {
|
||||
// Group by appId on top level, and by methodGroup on 2nd level
|
||||
return Object.keys(this.requests).reduce((accumulator, requestId) => {
|
||||
const { data } = this.requests[requestId];
|
||||
const appId = this.tokens[data.token];
|
||||
const method = this.getMethodFromRequest(requestId);
|
||||
const methodGroup = methodGroupFromMethod[method]; // Get the methodGroup the current request belongs to
|
||||
|
||||
let queueId = ++nextQueueId;
|
||||
accumulator[appId] = accumulator[appId] || {};
|
||||
accumulator[appId][methodGroup] = accumulator[appId][methodGroup] || [];
|
||||
accumulator[appId][methodGroup].push({ data, requestId }); // Append the requestId field in the request object
|
||||
|
||||
this.sources[queueId] = source;
|
||||
this.requests = this.requests.concat([{
|
||||
appId,
|
||||
queueId,
|
||||
request: {
|
||||
data,
|
||||
origin
|
||||
}
|
||||
}]);
|
||||
return accumulator;
|
||||
}, {});
|
||||
}
|
||||
|
||||
@action addTokenPermission = (method, token) => {
|
||||
const id = `${method}:${this.tokens[token]}`;
|
||||
@action queueRequest = (requestId, { data, source }) => {
|
||||
this.sources[requestId] = source;
|
||||
// Create a new this.requests object to update mobx store
|
||||
this.requests = {
|
||||
...this.requests,
|
||||
[requestId]: { data }
|
||||
};
|
||||
};
|
||||
|
||||
this.permissions = Object.assign({}, this.permissions, {
|
||||
[id]: true
|
||||
});
|
||||
this.savePermissions();
|
||||
}
|
||||
@action approveRequest = requestId => {
|
||||
const { data } = this.requests[requestId];
|
||||
const method = this.getMethodFromRequest(requestId);
|
||||
const appId = this.tokens[data.token];
|
||||
const source = this.sources[requestId];
|
||||
|
||||
@action approveSingleRequest = ({ queueId, request: { data } }) => {
|
||||
const source = this.sources[queueId];
|
||||
|
||||
this.removeRequest(queueId);
|
||||
this.addAppPermission(method, appId);
|
||||
this.removeRequest(requestId);
|
||||
|
||||
if (data.api) {
|
||||
this.executePubsubCall(data, source);
|
||||
} else {
|
||||
this.executeMethodCall(data, source);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@action approveRequest = (queueId, approveAll) => {
|
||||
const queued = this.findRequest(queueId);
|
||||
@action rejectRequest = requestId => {
|
||||
const { data } = this.requests[requestId];
|
||||
const source = this.sources[requestId];
|
||||
|
||||
if (approveAll) {
|
||||
const { request: { data: { method, token, params } } } = queued;
|
||||
|
||||
this.getFilteredSection(method || params[0]).methods.forEach((m) => {
|
||||
this.addTokenPermission(m, token);
|
||||
this.findMatchingRequests(m, token).forEach(this.approveSingleRequest);
|
||||
});
|
||||
} else {
|
||||
this.approveSingleRequest(queued);
|
||||
}
|
||||
}
|
||||
|
||||
@action rejectRequest = (queueId) => {
|
||||
const { request: { data } } = this.findRequest(queueId);
|
||||
const source = this.sources[queueId];
|
||||
|
||||
this.removeRequest(queueId);
|
||||
this.removeRequest(requestId);
|
||||
this.rejectMessage(source, data);
|
||||
};
|
||||
|
||||
@action removeRequest = requestId => {
|
||||
delete this.requests[requestId];
|
||||
delete this.sources[requestId];
|
||||
|
||||
// Create a new object to update mobx store
|
||||
this.requests = { ...this.requests };
|
||||
};
|
||||
|
||||
getPermissionId = (method, appId) => `${method}:${appId}` // Create an id to identify permissions based on method and appId
|
||||
|
||||
getMethodFromRequest = requestId => {
|
||||
const { data: { method, params } } = this.requests[requestId];
|
||||
|
||||
return method || params[0];
|
||||
}
|
||||
|
||||
@action rejectMessage = (source, { id, from, method, token }) => {
|
||||
rejectMessage = (source, { id, from, method, token }) => {
|
||||
if (!source) {
|
||||
return;
|
||||
}
|
||||
|
||||
source.postMessage({
|
||||
source.postMessage(
|
||||
{
|
||||
error: `Method ${method} not allowed`,
|
||||
id,
|
||||
from: 'shell',
|
||||
result: null,
|
||||
to: from,
|
||||
token
|
||||
}, '*');
|
||||
}
|
||||
},
|
||||
'*'
|
||||
);
|
||||
};
|
||||
|
||||
@action setPermissions = (_permissions) => {
|
||||
addAppPermission = (method, appId) => {
|
||||
this.permissions[this.getPermissionId(method, appId)] = true;
|
||||
this.savePermissions();
|
||||
};
|
||||
|
||||
setPermissions = _permissions => {
|
||||
const permissions = {};
|
||||
|
||||
Object.keys(_permissions).forEach((id) => {
|
||||
Object.keys(_permissions).forEach(id => {
|
||||
permissions[id] = !!_permissions[id];
|
||||
});
|
||||
|
||||
this.permissions = Object.assign({}, this.permissions, permissions);
|
||||
this.permissions = permissions;
|
||||
this.savePermissions();
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
addMiddleware (middleware) {
|
||||
if (!middleware || (typeof middleware !== 'function')) {
|
||||
if (!middleware || typeof middleware !== 'function') {
|
||||
throw new Error('Interceptor middleware does not implement a function');
|
||||
}
|
||||
|
||||
@ -174,83 +153,83 @@ export default class Store {
|
||||
return true;
|
||||
}
|
||||
|
||||
createToken = appId => {
|
||||
const token = sha3(`${appId}:${Date.now()}`);
|
||||
|
||||
this.tokens[token] = appId;
|
||||
return token;
|
||||
};
|
||||
|
||||
hasValidToken = (method, appId, token) => {
|
||||
if (!token) {
|
||||
return method === 'shell_requestNewToken';
|
||||
}
|
||||
|
||||
return this.tokens[token] === appId;
|
||||
}
|
||||
};
|
||||
|
||||
hasTokenPermission = (method, token) => {
|
||||
return this.hasAppPermission(method, this.tokens[token]);
|
||||
}
|
||||
};
|
||||
|
||||
hasAppPermission = (method, appId) => {
|
||||
return this.permissions[`${method}:${appId}`] || false;
|
||||
}
|
||||
return !!this.permissions[this.getPermissionId(method, appId)];
|
||||
};
|
||||
|
||||
savePermissions = () => {
|
||||
store.set(LS_PERMISSIONS, this.permissions);
|
||||
}
|
||||
|
||||
findRequest (_queueId) {
|
||||
return this.requests.find(({ queueId }) => queueId === _queueId);
|
||||
}
|
||||
|
||||
findMatchingRequests (_method, _token) {
|
||||
return this.requests.filter(({ request: { data: { method, token, params } } }) => (method === _method || (params && params[0] === _method)) && token === _token);
|
||||
}
|
||||
};
|
||||
|
||||
_methodCallbackPost = (id, from, source, token) => {
|
||||
return (error, result) => {
|
||||
if (!source) {
|
||||
return;
|
||||
}
|
||||
|
||||
source.postMessage({
|
||||
error: error
|
||||
? error.message
|
||||
: null,
|
||||
source.postMessage(
|
||||
{
|
||||
error: error ? error.message : null,
|
||||
id,
|
||||
from: 'shell',
|
||||
to: from,
|
||||
result,
|
||||
token
|
||||
}, '*');
|
||||
},
|
||||
'*'
|
||||
);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
executePubsubCall = ({ api, id, from, token, params }, source) => {
|
||||
const callback = this._methodCallbackPost(id, from, source, token);
|
||||
|
||||
this.provider
|
||||
.subscribe(api, callback, params)
|
||||
.then((result, error) => {
|
||||
this.provider.subscribe(api, callback, params).then((result, error) => {
|
||||
this._methodCallbackPost(id, from, source, token)(null, result);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
executeMethodCall = ({ id, from, method, params, token }, source) => {
|
||||
try {
|
||||
const callback = this._methodCallbackPost(id, from, source, token);
|
||||
const isHandled = this.middleware.find((middleware) => middleware(from, method, params, callback));
|
||||
const isHandled = this.middleware.some(middleware => {
|
||||
try {
|
||||
return middleware(from, method, params, callback);
|
||||
} catch (error) {
|
||||
console.error(`Middleware error handling '${method}'`, error);
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
if (!isHandled) {
|
||||
this.provider.send(method, params, callback);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Execution error handling '${method}'`, error);
|
||||
}
|
||||
};
|
||||
|
||||
getFilteredSectionName = (method) => {
|
||||
return Object.keys(filteredRequests).find((key) => {
|
||||
return filteredRequests[key].methods.includes(method);
|
||||
});
|
||||
}
|
||||
|
||||
getFilteredSection = (method) => {
|
||||
return filteredRequests[this.getFilteredSectionName(method)];
|
||||
}
|
||||
|
||||
receiveMessage = ({ data, origin, source }) => {
|
||||
receiveMessage = ({ data, source }) => {
|
||||
try {
|
||||
if (!data) {
|
||||
return;
|
||||
}
|
||||
@ -266,22 +245,39 @@ export default class Store {
|
||||
return;
|
||||
}
|
||||
|
||||
if ((method && this.getFilteredSection(method) && !this.hasTokenPermission(method, token)) ||
|
||||
(api && this.getFilteredSection(params[0]) && !this.hasTokenPermission(method, token))) {
|
||||
this.queueRequest({ data, origin, source });
|
||||
if (
|
||||
(method &&
|
||||
methodGroupFromMethod[method] &&
|
||||
!this.hasTokenPermission(method, token)) ||
|
||||
(api &&
|
||||
methodGroupFromMethod[params[0]] &&
|
||||
!this.hasTokenPermission(method, token))
|
||||
) {
|
||||
this.queueRequest(id, { // The requestId of a request is the id inside data
|
||||
data,
|
||||
source
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (api) {
|
||||
this.executePubsubCall(data, source);
|
||||
} else if (subId) {
|
||||
subId === '*'
|
||||
? this.provider.unsubscribeAll().then(v => this._methodCallbackPost(id, from, source, token)(null, v))
|
||||
: this.provider.unsubscribe(subId).then(v => this._methodCallbackPost(id, from, source, token)(null, v));
|
||||
const unsubscribePromise = subId === '*'
|
||||
? this.provider.unsubscribeAll()
|
||||
: this.provider.unsubscribe(subId);
|
||||
|
||||
unsubscribePromise
|
||||
.then(v =>
|
||||
this._methodCallbackPost(id, from, source, token)(null, v)
|
||||
);
|
||||
} else {
|
||||
this.executeMethodCall(data, source);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Exception handling data', data, error);
|
||||
}
|
||||
};
|
||||
|
||||
static instance = null;
|
||||
|
||||
|
||||
@ -14,13 +14,14 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import mobx from 'mobx';
|
||||
import flatten from 'lodash.flatten';
|
||||
|
||||
import { sha3 } from '@parity/api/lib/util/sha3';
|
||||
import VisibleStore from '@parity/shared/lib/mobx/dappsStore';
|
||||
|
||||
import RequestStore from './DappRequests/store';
|
||||
import filteredRequests from './DappRequests/filteredRequests';
|
||||
import methodGroups from './DappRequests/methodGroups';
|
||||
|
||||
export default function execute (appId, method, params, callback) {
|
||||
const visibleStore = VisibleStore.get();
|
||||
@ -30,29 +31,35 @@ export default function execute (appId, method, params, callback) {
|
||||
case 'shell_getApps':
|
||||
const [displayAll] = params;
|
||||
|
||||
callback(null, displayAll
|
||||
? visibleStore.allApps.slice()
|
||||
: visibleStore.visibleApps.slice()
|
||||
callback(
|
||||
null,
|
||||
displayAll
|
||||
? visibleStore.allApps.slice().map(mobx.toJS)
|
||||
: visibleStore.visibleApps.slice().map(mobx.toJS)
|
||||
);
|
||||
return true;
|
||||
|
||||
case 'shell_getFilteredMethods':
|
||||
callback(null, flatten(
|
||||
Object
|
||||
.keys(filteredRequests)
|
||||
.map((key) => filteredRequests[key].methods)
|
||||
));
|
||||
callback(
|
||||
null,
|
||||
flatten(Object.keys(methodGroups).map(key => methodGroups[key].methods))
|
||||
);
|
||||
return true;
|
||||
|
||||
case 'shell_getMethodGroups':
|
||||
callback(
|
||||
null,
|
||||
methodGroups
|
||||
);
|
||||
return true;
|
||||
|
||||
case 'shell_getMethodPermissions':
|
||||
callback(null, requestStore.permissions);
|
||||
callback(null, mobx.toJS(requestStore.permissions));
|
||||
return true;
|
||||
|
||||
case 'shell_loadApp':
|
||||
const [_loadId, loadParams] = params;
|
||||
const loadId = _loadId.substr(0, 2) !== '0x'
|
||||
? sha3(_loadId)
|
||||
: _loadId;
|
||||
const loadId = _loadId.substr(0, 2) !== '0x' ? sha3(_loadId) : _loadId;
|
||||
const loadUrl = `/${loadId}/${loadParams || ''}`;
|
||||
|
||||
window.location.hash = loadUrl;
|
||||
@ -67,7 +74,9 @@ export default function execute (appId, method, params, callback) {
|
||||
case 'shell_setAppVisibility':
|
||||
const [changeId, visibility] = params;
|
||||
|
||||
callback(null, visibility
|
||||
callback(
|
||||
null,
|
||||
visibility
|
||||
? visibleStore.showApp(changeId)
|
||||
: visibleStore.hideApp(changeId)
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user