Skip to content

JPS: New params and compatibility fixes#7198

Merged
zinigor merged 5 commits intomasterfrom
add/jps-wpcom-id
May 23, 2017
Merged

JPS: New params and compatibility fixes#7198
zinigor merged 5 commits intomasterfrom
add/jps-wpcom-id

Conversation

@gravityrail
Copy link
Copy Markdown
Contributor

@gravityrail gravityrail commented May 17, 2017

Fixes some issues with the new return signature of the generate_secrets method, and adds a new parameter that selected partners can use to assign a specific WPCOM user to be the master user for a site.

Also makes the plan parameter optional.

@gravityrail gravityrail requested review from ebinnion and zinigor May 17, 2017 22:30
@gravityrail gravityrail self-assigned this May 17, 2017
@gravityrail gravityrail added [Status] Ready to Merge Go ahead, you can push that green button! [Status] In Progress and removed [Status] Ready to Merge Go ahead, you can push that green button! labels May 17, 2017

private function get_api_host() {
$env_api_host = getenv( 'JETPACK_START_API_HOST', true );
return $env_api_host ? $env_api_host : JETPACK__WPCOM_JSON_API_HOST;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how JETPACK_START_API_HOST is used, but when it is used, shouldn't it also be used in the Host header for requests to work properly?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's used for debugging, to send requests to our sandbox. Without Host: being public-api.wordpress.com, the sandbox doesn't know which domain should be receiving the request.

@gravityrail gravityrail added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] In Progress labels May 19, 2017
cd $SCRIPT_DIR

usage () {
echo "Usage: partner-provision.sh --partner_id=partner_id --partner_secret=partner_secret"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated so that it calls partner cancel

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

if ( is_wp_error( $result ) ) {
$this->partner_provision_error( $result );
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This caused a lot of extra lines when I cancelled a plan, which I didn't notice in provisioning. We may want to consider JSON stringifying the output.

@ebinnion
Copy link
Copy Markdown
Contributor

This LGTM other than the two things I pointed out. I'm glad to approve this after we update the usage command.

Copy link
Copy Markdown
Contributor

@ebinnion ebinnion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now

@zinigor zinigor merged commit 7557b38 into master May 23, 2017
@zinigor zinigor deleted the add/jps-wpcom-id branch May 23, 2017 14:01
@zinigor zinigor removed the [Status] Ready to Merge Go ahead, you can push that green button! label May 23, 2017
jeherve added a commit that referenced this pull request May 23, 2017
jeherve added a commit that referenced this pull request May 29, 2017
eliorivero pushed a commit that referenced this pull request May 30, 2017
* Changelog: first pass at a changelog for 5.0

* Changelog: delete 4.9 testing list.

* Changelog: update minimum WP version to match ver. in jetpack.php

Fixes #7158

* Changelog: add #6051

* Changelog: add #6753

* Changelog: add #6928

* Changelog: add #6964

* Changelog: add #7014

* Changelog: add #7057

* Changelog: add #7060

* Changelog: add #7068

* Changelog: add #7070

* Changelog: add #7072

* Changelog: add #7071

* Changelog: add release date and post shortlink.

* Changelog: add #7094

* Changelog: add #7100

* Changelog: add #7108

* Changelog: add #7113

* Changelog: add #7123

* Changelog: add #7135

* Changelog: add #7143

* Changelog: add #7151

* Changelog: add #6996

* Changelog: add #7105

* Changelog: add #7132

* Changelog: add #7166

* Changelog: fix typo in 4.9 changelog.

* Changelog: remove older releases' changelogs.

@see p1HpG7-42e-p2

* Changelog: add #7090

* Changelog: add #7095

* Changelog: add #7112

* Changelog: add #7115

* Changelog: add #7122

* Changelog: add #7137

* Changelog: add #7138

* Changelog: add #7140

* Changelog: add #7154

* Changelog: add ##7155

* Changelog: add #7163

* Changelog: add #7167

* Changelog: add #7171

* Changelog: add #7180

* Changelog: add #7181

* Changelog: add #7183

* Changelog: add #7184

* Changelog: add #7189

* Changelog: add #7191

* Changelog: add #7193

* Changelog: add #7198

* Changelog: add #7200

* Changelog: add #7209

* Changelog: add #7212

* Testing list: add instructions for #7115

* Changelog: add #7188

* Changelog: add #7205

* Changelog: add #7225

* Changelog: add #6872

* Changelog: add #7107

* Changelog: add #7118

* Changelog: add #7142

* Changelog: add #7170

* Changelog: add #7210

* Changelog: add #7218

* Changelog: add #7232

* Changelog: add #7211

* Changelog: add #7213

* Changelog: add #7229

* Changelog: add #7230

* Changelog: add #7214

* Draft changelog for 5.0

* Changelog updates: 2nd pass at a clearer changelog.

- Fix typos.
- Use consistent tense and tone across all changelog.
- Remove unclear items.

* Changelog: add #7026

* Changelog: add #7058

* Changelog: add #7125

* Changelog: add #7249

* Changelog: add #7185

* add mentions of image widget migration

* Changelog: add info about new output for CLI command.

* Changelog: add WP version number matching the new Image Widget.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants