Skip to content

Commit

Permalink
Fix siteMetadata property names
Browse files Browse the repository at this point in the history
In #7218 a few things were added to the site metadata, so the provider
approval controller was middleware was updated to accept the site
metadata as an object rather than accepting each property as a separate
parameter. Unfortunately we failed to notice that the site name and
icon were named differently in the site metadata than they were in the
provider approval controller, so the names of those properties were
unintentionally changed in the controller state.

The provider approval controller has been updated to restore the
original property names of `siteTitle` and `siteIcon`. An unused prop
that was added to the provider approval page in #7218 has also been
removed.
  • Loading branch information
Gudahtt committed Nov 4, 2019
1 parent a74bc3a commit da7f024
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion app/scripts/controllers/provider-approval.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class ProviderApprovalController extends SafeEventEmitter {
if (extensionId) {
metadata.extensionId = extensionId
} else {
Object.assign(metadata, await getSiteMetadata(origin))
const siteMetadata = await getSiteMetadata(origin)
Object.assign(metadata, { siteTitle: siteMetadata.name, siteImage: siteMetadata.icon})
}
this._handleProviderRequest(metadata)
// wait for resolution of request
Expand Down
9 changes: 7 additions & 2 deletions ui/app/pages/provider-approval/provider-approval.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ export default class ProviderApproval extends Component {
static propTypes = {
approveProviderRequestByOrigin: PropTypes.func.isRequired,
rejectProviderRequestByOrigin: PropTypes.func.isRequired,
providerRequest: PropTypes.object.isRequired,
providerRequest: PropTypes.exact({
hostname: PropTypes.string.isRequired,
siteImage: PropTypes.string,
siteTitle: PropTypes.string,
origin: PropTypes.string.isRequired,
extensionId: PropTypes.string,
}).isRequired,
};

static contextTypes = {
Expand All @@ -20,7 +26,6 @@ export default class ProviderApproval extends Component {
approveProviderRequestByOrigin={approveProviderRequestByOrigin}
rejectProviderRequestByOrigin={rejectProviderRequestByOrigin}
origin={providerRequest.origin}
tabID={providerRequest.tabID}
siteImage={providerRequest.siteImage}
siteTitle={providerRequest.siteTitle}
hostname={providerRequest.hostname}
Expand Down

0 comments on commit da7f024

Please sign in to comment.