<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2471] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php: WordCamp QBO: Add filter for switching between sandbox and production API URLs.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2471">2471</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2471","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-05 00:04:01 +0000 (Fri, 05 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp QBO: Add filter for switching between sandbox and production API URLs.
Without something like this, we'd have to manually switch all the calls to the sandbox URL during development, then back to the production URL before committing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-02-04 22:10:41 UTC (rev 2470)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-02-05 00:04:01 UTC (rev 2471)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static $consumer_secret;
</span><span class="cx" style="display: block; padding: 0 10px"> private static $hmac_key;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $api_base_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> private static $options;
</span><span class="cx" style="display: block; padding: 0 10px"> private static $categories_map;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,6 +50,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( self::$consumer_key ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$api_base_url = sprintf(
+ 'https://%squickbooks.api.intuit.com',
+ apply_filters( 'wordcamp_qbo_sandbox_mode', false ) ? 'sandbox-' : ''
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_menu', array( __CLASS__, 'admin_menu' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', array( __CLASS__, 'admin_init' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_api_init', array( __CLASS__, 'rest_api_init' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,8 +145,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $request->get_param('id') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $payload['Id'] = absint( $request->get_param('id') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request_url = esc_url_raw( sprintf( 'https://quickbooks.api.intuit.com/v3/company/%d/purchase/%d',
- self::$options['auth']['realmId'], $payload['Id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_url = esc_url_raw( sprintf( '%s/v3/company/%d/purchase/%d',
+ self::$api_base_url, self::$options['auth']['realmId'], $payload['Id'] ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $request_url, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,8 +168,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = json_encode( $payload );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request_url = esc_url_raw( sprintf( 'https://quickbooks.api.intuit.com/v3/company/%d/purchase',
- self::$options['auth']['realmId'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_url = esc_url_raw( sprintf( '%s/v3/company/%d/purchase',
+ self::$api_base_url, self::$options['auth']['realmId'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'POST', $request_url, $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_post( $request_url, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,8 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'minorversion' => 4,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request_url = esc_url_raw( sprintf( 'https://quickbooks.api.intuit.com/v3/company/%d/query',
- self::$options['auth']['realmId'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_url = esc_url_raw( sprintf( '%s/v3/company/%d/query',
+ self::$api_base_url, self::$options['auth']['realmId'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( esc_url_raw( add_query_arg( $args, $request_url ) ), array( 'headers' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,8 +348,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$options['auth'] = $data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth->set_token( self::$options['auth']['oauth_token'], self::$options['auth']['oauth_token_secret'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request_url = sprintf( 'https://quickbooks.api.intuit.com/v3/company/%d/companyinfo/%d',
- self::$options['auth']['realmId'], self::$options['auth']['realmId'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_url = sprintf( '%s/v3/company/%d/companyinfo/%d',
+ self::$api_base_url, self::$options['auth']['realmId'], self::$options['auth']['realmId'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $oauth_header = $oauth->get_oauth_header( 'GET', $request_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $request_url, array( 'headers' => array(
</span></span></pre>
</div>
</div>
</body>
</html>