Skip to content

Simplify permissions page logic #22850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Simplify permissions page logic #22850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 17 additions & 38 deletions ui/components/app/permission-page-container/permission-page-container.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { isEqual } from 'lodash';
///: BEGIN:ONLY_INCLUDE_IF(snaps)
import {
SnapCaveatType,
Expand Down Expand Up @@ -55,34 +54,22 @@ export default class PermissionPageContainer extends Component {
trackEvent: PropTypes.func,
};

state = {
selectedPermissions: this.getRequestedMethodState(
this.getRequestedMethodNames(this.props),
),
};

componentDidUpdate() {
const newMethodNames = this.getRequestedMethodNames(this.props);
state = {};

if (!isEqual(Object.keys(this.state.selectedPermissions), newMethodNames)) {
// this should be a new request, so just overwrite
this.setState({
selectedPermissions: this.getRequestedMethodState(newMethodNames),
});
}
}

getRequestedMethodState(methodNames) {
return methodNames.reduce((acc, methodName) => {
///: BEGIN:ONLY_INCLUDE_IF(snaps)
if (methodName === RestrictedMethods.wallet_snap) {
acc[methodName] = this.getDedupedSnapPermissions();
getRequestedPermissions() {
return Object.entries(this.props.request.permissions).reduce(
(acc, [permissionName, permissionValue]) => {
///: BEGIN:ONLY_INCLUDE_IF(snaps)
if (permissionName === RestrictedMethods.wallet_snap) {
acc[permissionName] = this.getDedupedSnapPermissions();
return acc;
}
///: END:ONLY_INCLUDE_IF
acc[permissionName] = permissionValue;
return acc;
}
///: END:ONLY_INCLUDE_IF
acc[methodName] = true;
return acc;
}, {});
},
{},
);
}

///: BEGIN:ONLY_INCLUDE_IF(snaps)
Expand Down Expand Up @@ -111,10 +98,6 @@ export default class PermissionPageContainer extends Component {
}
///: END:ONLY_INCLUDE_IF

getRequestedMethodNames(props) {
return Object.keys(props.request.permissions || {});
}

componentDidMount() {
this.context.trackEvent({
category: MetaMetricsEventCategory.Auth,
Expand Down Expand Up @@ -155,12 +138,6 @@ export default class PermissionPageContainer extends Component {
),
};

Object.keys(this.state.selectedPermissions).forEach((key) => {
if (!this.state.selectedPermissions[key]) {
delete request.permissions[key];
}
});

if (Object.keys(request.permissions).length > 0) {
approvePermissionsRequest(request);
} else {
Expand All @@ -176,6 +153,8 @@ export default class PermissionPageContainer extends Component {
allIdentitiesSelected,
} = this.props;

const requestedPermissions = this.getRequestedPermissions();

///: BEGIN:ONLY_INCLUDE_IF(snaps)
const setIsShowingSnapsPrivacyWarning = (value) => {
this.setState({
Expand Down Expand Up @@ -206,7 +185,7 @@ export default class PermissionPageContainer extends Component {
<PermissionPageContainerContent
requestMetadata={requestMetadata}
subjectMetadata={targetSubjectMetadata}
selectedPermissions={this.state.selectedPermissions}
selectedPermissions={requestedPermissions}
selectedIdentities={selectedIdentities}
allIdentitiesSelected={allIdentitiesSelected}
/>
Expand Down