Reviewers: shindig-dev, panjie, chabotc, chabotc,
Description:
Revision 754879 added container id into security token. This patch fixed
a bug when constructing BasicSecurityToken. Also put container id to
config file.
Please review this at http://codereview.appspot.com/27062
Affected files:
php/config/container.php
php/src/social/servlet/ApiServlet.php
Index: php/config/container.php
===================================================================
--- php/config/container.php (revision 755097)
+++ php/config/container.php (working copy)
@@ -151,5 +151,8 @@
'curl_connection_timeout' => '10',
// If your development server is behind a proxy, enter the proxy details
here in 'proxy.host.com:port' format.
- 'proxy' => ''
+ 'proxy' => '',
+
+ // Container id, used for security token
+ 'container_id' => 'default'
);
Index: php/src/social/servlet/ApiServlet.php
===================================================================
--- php/src/social/servlet/ApiServlet.php (revision 755097)
+++ php/src/social/servlet/ApiServlet.php (working copy)
@@ -104,7 +104,7 @@
//FIXME change this to a new AnonymousToken when reworking auth
token
$gadgetSigner = Config::get('security_token');
- return new $gadgetSigner(null, 0, 0, 0, 0, '', '', 0);
+ return new $gadgetSigner(null, 0, 0, 0, 0, '', '', 0,
Config::get('container_id'));
} else {
return null;
}
