kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

adding token to service to allow it to be used at constructor time by Object_* class

This commit is contained in:
Benjamin Sonntag 2014-09-21 00:19:21 +02:00
parent b516f22c1e
commit 5eb6ae6d47
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -10,6 +10,9 @@ debian/alternc-awstats
debian/alternc-awstats.debhelper.log
debian/alternc-awstats.postrm.debhelper
debian/alternc-awstats.substvars
debian/alternc-api
debian/alternc-api.debhelper.log
debian/alternc-api.substvars
debian/alternc-roundcube
debian/alternc-roundcube.debhelper.log
debian/alternc-roundcube.substvars

14
lib/Alternc/Api/Service.php
View File

@ -130,11 +130,11 @@ class Alternc_Api_Service {
if (!$request instanceof Alternc_Api_Request)
throw new \Exception("request must be an Alternc_Api_Request object", self::ERR_INVALID_ARGUMENT);
$token = Alternc_Api_Token::tokenGet($request->token_hash,$this->db);
if ($token instanceof Alternc_Api_Response) // bad token
return $token;
// we set the token in the Service object, so that other classes can use it :)
$this->token = Alternc_Api_Token::tokenGet($request->token_hash,$this->db);
if ($this->token instanceof Alternc_Api_Response) // bad token
return $this->token;
$className = "Alternc_Api_Object_".ucfirst(strtolower($request->object));
if (!class_exists($className))
return new Alternc_Api_Response( array("code" => self::ERR_OBJECT_NOT_FOUND, "message" => "Object not found in this AlternC's instance") );
@ -143,9 +143,9 @@ class Alternc_Api_Service {
$action=$request->action;
if (!method_exists($object, $action))
return new Alternc_Api_Response( array("code" => self::ERR_ACTiON_NOT_FOUND, "message" => "Action not found for this object in this AlternC's instance") );
return new Alternc_Api_Response( array("code" => self::ERR_ACTION_NOT_FOUND, "message" => "Action not found for this object in this AlternC's instance") );
$request->token=$token; // we receive $request->token_hash as a STRING, but we transmit its object as an Alternc_Api_Token.
$request->token=$this->token; // we receive $request->token_hash as a STRING, but we transmit its object as an Alternc_Api_Token.
// TODO: log this Api Call
return $object->$action($request);