Changeset 593084

Timestamp:

08/31/2012 06:08:13 PM (14 years ago)

Author:

wordpress@…

Message:

moved over version2.0 api

Location:

tinypass/branches/silver_bullet/api

Files:

• TPClientMsgBuilder.php (modified) (1 diff)
• TPOffer.php (modified) (4 diffs)
• TPPriceOption.php (modified) (6 diffs)
• TPRIDHash.php (modified) (1 diff)
• TPSettings.php (deleted)
• TPUtils.php (added)
• TPVersion.php (deleted)
• TinyPass.php (modified) (2 diffs)
• TinyPassException.php (modified) (1 diff)
• TinyPassGateway.php (added)
• builder/TPClientBuilder.php (modified) (3 diffs)
• builder/TPClientParser.php (modified) (2 diffs)
• builder/TPCookieParser.php (added)
• builder/TPJsonMsgBuilder.php (modified) (6 diffs)
• builder/TPSecurityUtils.php (modified) (2 diffs)
• policies/Policies.php (modified) (5 diffs)
• policies/TPPolicy.php (modified) (1 diff)
• token/TPAccessToken.php (modified) (3 diffs)
• token/TPAccessTokenList.php (modified) (4 diffs)
• token/TPAccessTokenStore.php (added)
• token/TPMeter.php (added)
• token/TPMeterDetails.php (deleted)
• token/TPMeterStore.php (added)
• token/TPToken.php (deleted)
• token/TPTokenData.php (added)
• token/TPTokenWrapper.php (deleted)
• ui/TPHtmlWidget.php (added)
• ui/TPPurchaseRequest.php (added)
• ui/TPTicket.php (deleted)
• ui/TPWebRequest.php (deleted)
• ui/TPWebWidget.php (deleted)
• ui/widget.html (deleted)
• util (added)
• util/TPPaySettings.php (added)
• util/TPSettings.php (added)

tinypass/branches/silver_bullet/api/TPClientMsgBuilder.php

@@ -19 +19 @@
     }
 
-    public function buildTicketRequest($tickets) {
-        return $this->builder->buildTicketRequest($tickets);
+    public function buildPurchaseRequest($tickets) {
+        return $this->builder->buildPurchaseRequest($tickets);
     }
 

tinypass/branches/silver_bullet/api/TPOffer.php

@@ -7 +7 @@
     private $pricing;
     private $policies = array();
+    private $tags = array();
 
     public function __construct(TPResource $resource, $priceOptions) {
         $this->resource = $resource;
 
-        if(!is_array($priceOptions))
-            $priceOptions = array($priceOptions);
-
-        $this->pricing = TPPricingPolicy::createBasic($priceOptions);
+        if($priceOptions instanceof TPBasicPricing) {
+            $this->pricing = $priceOptions;
+        } else {
+            if(!is_array($priceOptions))
+                $priceOptions = array($priceOptions);
+            $this->pricing = TPPricingPolicy::createBasic($priceOptions);
+        }
+    
     }
 
@@ -25 +30 @@
     }
 
-    public function isMetered() {
-        foreach ($this->policies as $policy) {
-            if ($policy instanceof TPMeteredPolicyImpl)
-                return true;
-        }
-        return false;
-    }
-
     public function addPolicy($policy) {
         $this->policies[] = $policy;
@@ -40 +37 @@
     public function getPolicies() {
         return $this->policies;
-    }
-
-    public function getMeteredPolicy() {
-        foreach ($this->policies as $policy) {
-            if ($policy instanceof TPMeteredPolicyImpl)
-                return $policy;
-        }
-        return new TPPolicy();
     }
 
@@ -60 +49 @@
         }
     }
+
+    public function hasActivePrices() {
+        return $this->getPricing()->hasActiveOptions();
+    }
+
+    public function addTags($tags) {
+        if(!is_array($tags)) {
+            $tags = func_get_args();
+        }
+        $this->tags = array_merge($this->tags, $tags);
+        return $this;
+    }
+
+    public function getTags() {
+        return $this->tags;
+    }
+
+
+
 }
 ?>

tinypass/branches/silver_bullet/api/TPPriceOption.php

@@ -8 +8 @@
     protected $price;
     protected $accessPeriod;
-    protected $initAccessPeriod;
     protected $startDateInSecs;
     protected $endDateInSecs;
     protected $caption;
+    protected $trialPeriod;
+    protected $recurring = false;
 
     protected $splitPay = array();
 
-    private static $EXPIRE_PARSER = '/(\d+)\s*(\w+)/';
 
     public function __construct($price = null, $acessPeriod = null, $startDateInSecs = null, $endDateInSecs = null) {
@@ -21 +21 @@
         $this->accessPeriod = $acessPeriod;
         if($startDateInSecs)
-            $this->startDateInSecs = TPToken::convertToEpochSeconds($startDateInSecs);
+            $this->startDateInSecs = TPTokenData::convertToEpochSeconds($startDateInSecs);
         if($endDateInSecs)
-            $this->endDateInSecs = TPToken::convertToEpochSeconds($endDateInSecs);
+            $this->endDateInSecs = TPTokenData::convertToEpochSeconds($endDateInSecs);
     }
 
@@ -40 +40 @@
 
     public function getAccessPeriodInMsecs() {
-        if ($this->initAccessPeriod != null) return $this->initAccessPeriod;
-
-        if ($this->accessPeriod == null) return null;
-
-        return $this->initAccessPeriod = $this->parseLoosePeriod($this->accessPeriod);
+        return TPUtils::parseLoosePeriodInMsecs($this->accessPeriod);
     }
 
     public function getAccessPeriodInSecs() {
         return $this->getAccessPeriodInMsecs() / 1000;
-    }
-
-    public static function parseLoosePeriod($period) {
-        if (preg_match("/^-?\d+$/", $period)) {
-            return (int)$period;
-        }
-        $matches = array();
-        if (preg_match(TPPriceOption::$EXPIRE_PARSER, $period, $matches)) {
-            $num = $matches[1];
-            $str = $matches[2];
-            switch ($str[0]) {
-                case 's':
-                    return $num * 1000;
-                case 'm':
-
-                    if (strlen($str) > 1 && $str[1] == 'i')
-                        return $num * 60 * 1000;
-                    else if (strlen($str) > 1 && $str[1] == 's')
-                        return $num * 60;
-                    else if (strlen($str) == 1 || $str[1] == 'o')
-                        return $num * 30 * 24 * 60 * 60 * 1000;
-
-                case 'h':
-                    return $num * 60 * 60 * 1000;
-                case 'd':
-                    return $num * 24 * 60 * 60 * 1000;
-             case 'w':
-                    return $num * 7 * 24 * 60 * 60 * 1000;
-            }
-        }
-
-        throw new TinyPassException("Cannot parse the specified period: " . $period);
     }
 
@@ -124 +88 @@
 
     public function setCaption($caption) {
-        if($caption!=null && strlen($caption) > 23)
-            $caption = substr($caption, 0, 23);
+        if($caption!=null && strlen($caption) > 50)
+            $caption = substr($caption, 0, 50);
         $this->caption = $caption;
         return $this;
@@ -131 +95 @@
 
     public function isActive($timestampSecs) {
-        $timestampSecs = TPToken::convertToEpochSeconds($timestampSecs);
+        $timestampSecs = TPTokenData::convertToEpochSeconds($timestampSecs);
         if ($this->getStartDateInSecs() != null && $this->getStartDateInSecs() > $timestampSecs) return false;
         if ($this->getEndDateInSecs() != null && $this->getEndDateInSecs() < $timestampSecs) return false;
@@ -137 +101 @@
     }
 
+    public function isRecurring() {
+        return $this->recurring;
+    }
+
+    public function getTrialPeriod() {
+        return $this->trialPeriod;
+    }
+
+    public function getBillingPeriod() {
+        return $this->accessPeriod;
+    }
+
+    public function setRecurringBilling($billingPeriod, $trialPeriod = null) {
+        $this->recurring = true;
+        $this->accessPeriod = $billingPeriod;
+        if ($trialPeriod)
+            $this->trialPeriod = $trialPeriod;
+        return $this;
+    }
 
     public function __toString() {
         $sb = "";
-        sb.("Price:").($this->getPrice());
-        sb.("\tPeriod:").($this->getAccessPeriod());
+        $sb.("Price:").($this->getPrice());
+        $sb.("\tPeriod:").($this->getAccessPeriod());
+        $sb.("\tTrial Period:").($this->getAccessPeriod());
 
         if ($this->getStartDateInSecs() != null) {
-            sb.("\tStart:").($this->getStartDateInSecs()).(":").( date('D, d M Y H:i:s' , $this->getStartDateInSecs()));
+            $sb.("\tStart:").($this->getStartDateInSecs()).(":").( date('D, d M Y H:i:s' , $this->getStartDateInSecs()));
         }
 
         if ($this->getEndDateInSecs() != null) {
-            sb.("\tEnd:").($this->getEndDateInSecs()).(":").(date('D, d M Y H:i:s', $this->getEndDateInSecs()));
+            $sb.("\tEnd:").($this->getEndDateInSecs()).(":").(date('D, d M Y H:i:s', $this->getEndDateInSecs()));
         }
 
         if ($this->getCaption() != null) {
-            sb.("\tCaption:").($this->getCaption());
+            $sb.("\tCaption:").($this->getCaption());
         }
 
         if ($this->splitPay != null) {
             foreach ($this->splitPay as $key => $value)
-                sb.("\tSplit:").($key).(":").($value);
+                $sb.("\tSplit:").($key).(":").($value);
         }
+
+        if($this->isRecurring()) {
+            $sb.("\n\tBilling Period:").($this->getBillingPeriod());
+            $sb.("\tTrial Period:").($this->getTrialPeriod());
+        }
+    
         return $sb;
     }

tinypass/branches/silver_bullet/api/TPRIDHash.php

@@ -1 +1 @@
 <?php
 
-class TPRIDHash {
+class TPRID {
 
-    public static $ENCODER = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-";
-    private $hash;
+    private $id;
 
-
-    /**
-     * @rid = String
-     */
-    function __construct($rid = null) {
-        $this->hash = $this->hashCode($rid);
+    function __construct($id = null) {
+        $this->id = $id;
     }
 
-    /**
-     * @return RIDHash
-     */
-    public static function parse($hashCode) {
-        $hash = new TPRIDHash();
-        $hash->hash = $hashCode;
-        return $hash;
+    public function getID() {
+        return $this->id;
     }
 
-    public function getHash(){
-        return $this->hash;
+    public function __toString() {
+        return $this->id;
+    }
+    public function toString() {
+        return $this->id;
     }
 
-    public function __toString(){
-        return $this->hash;
-    }
-    public function toString(){
-        return $this->hash;
-    }
-
-    private static function addNum($a, $b) {
-        $dif = 2147483647 - $b;
-        if($dif>$a){ return $a+$b;}
-        return -2147483648 + ($a-$dif) - 1;
-    }
-
-    private static function multBy31($num) {
-        $res = ($num<<5) & 0xFFFFFFFF;
-        if($res>=0) {
-            if($num>=0) return $res-$num;
-            $dif = 2147483647 + $num;
-            if($dif>$res) return $res-$num;
-            return -2147483648 + ($res-$dif) - 1;
-        } else {
-            if($num<=0) return $res-$num;
-            $dif = -2147483648 + $num;
-            if($dif<$res) return $res-$num;
-            return 2147483647 - ($dif-$res) + 1;
+    public static function parse($s) {
+        if(is_numeric($s)) {
+            return new TPRID("" . $s);
+        } else if(is_string($s)) {
+            return new TPRID($s);
+        }else if(is_a($s, 'TPRID')) {
+            return $s;
         }
     }
 
-    public static function hashCode($s) {
-        if ($s == null || strlen($s) == 0) return "0";
-
-        $h1 = 0;
-        $chars =  TPRIDHash::unistr_to_ords($s);
-        $h2 = count($chars) * 31;
-
-        for ($i = 0; $i < count($chars); $i++) {
-            $h1 = self::addNum(self::multBy31($h1), $chars[$i]);
-
-            $charAt = $chars[$i];
-            $adnum = self::addNum($h2, $chars[$i]);
-
-            $mult = self::multBy31($adnum);
-            $h2 = self::addNum($h2, $mult);
-        }
-
-        $bld = "";
-        $bld.=(self::$ENCODER{($h1) & (0xF)});
-        $bld.=(self::$ENCODER{($h1>>4) & (0x3F)});
-        $bld.=(self::$ENCODER{($h1>>10) & (0x3F)});
-        $bld.=(self::$ENCODER{($h1>>16) & (0x3F)});
-        $bld.=(self::$ENCODER{($h1>>22) & (0x3F)});
-
-        $bld.=(self::$ENCODER{((($h1>>28) & 0xF) | ($h2<<4)) & (0x3F)});
-
-        $bld.=(self::$ENCODER{($h2=($h2>>2)&1073741823) & (0x3F)});
+}
 
 
-        while(($h2>>=6)!=0)
-            $bld.=(self::$ENCODER{($h2 & (0x3F))});
-
-        $leadzeros = -1;
-        while(++$leadzeros<strlen($bld)){
-            if($bld{$leadzeros}!='0') break;
-        }
-
-        return substr($bld, $leadzeros);
-    }
-
-    static function unistr_to_ords($str, $encoding = 'UTF-8') {
-// Turns a string of unicode characters into an array of ordinal values,
-// Even if some of those characters are multibyte.
-        $str = mb_convert_encoding($str,"UCS-4BE",$encoding);
-        $ords = array();
-
-// Visit each unicode character
-        for($i = 0; $i < mb_strlen($str,"UCS-4BE"); $i++) {
-// Now we have 4 bytes. Find their total
-// numeric value.
-            $s2 = mb_substr($str,$i,1,"UCS-4BE");
-            $val = unpack("N",$s2);
-            $ords[] = $val[1];
-        }
-        return($ords);
-    }
-
-
-}
-
 ?>

tinypass/branches/silver_bullet/api/TinyPass.php

@@ -4 +4 @@
 require_once "policies/Policies.php";
 require_once "TPRIDHash.php";
+require_once "TinyPassGateway.php";
 require_once "TPResource.php";
 require_once "TPOffer.php";
 require_once "TinyPassException.php";
-require_once "TPVersion.php";
 require_once "TPPriceOption.php";
-require_once "ui/TPTicket.php";
-require_once "ui/TPWebWidget.php";
-require_once "ui/TPWebRequest.php";
+require_once "TPUtils.php";
+require_once "ui/TPPurchaseRequest.php";
+require_once "ui/TPHtmlWidget.php";
 require_once "TPClientMsgBuilder.php";
 require_once "builder/TPClientBuilder.php";
 require_once "builder/TPClientParser.php";
+require_once "builder/TPCookieParser.php";
 require_once "builder/TPSecureEncoder.php";
 require_once "builder/TPOpenEncoder.php";
 require_once "builder/TPJsonMsgBuilder.php";
 require_once "builder/TPSecurityUtils.php";
-require_once "token/TPTokenWrapper.php";
-require_once "token/TPMeterDetails.php";
+require_once "token/TPAccessTokenStore.php";
+require_once "token/TPMeterStore.php";
+require_once "token/TPMeter.php";
 require_once "token/TPAccessToken.php";
 require_once "token/TPAccessTokenList.php";
-require_once "token/TPToken.php";
+require_once "token/TPTokenData.php";
 
 
 class TinyPass {
 
-    public static $API_PREPARE = "/jsapi/prepare.js";
-    public static $API_DATA = "/jsapi/data";
-    public static $API_AUTH = "/jsapi/auth.js";
+    public static $API_ENDPOINT_PROD = "https://api.tinypass.com";
+    public static $API_ENDPOINT_SANDBOX = "https://sandbox.tinypass.com";
+    public static $API_ENDPOINT_DEV = "";
 
-    protected $accessTokenList;
-    protected $localAccessTokenList;
-    protected $localBindList;
+    public static $AID = "";
+    public static $PRIVATE_KEY = "";
+    public static $SANDBOX = false;
 
-    protected $aid;
-    protected $privateKey;
-    protected $apiEndpoint;
-    protected $msgbuilder;
+    public static $CONNECTION_TIMEOUT = 5000;
+    public static $READ_TIMEOUT = 10000;
 
-    private $clientIP;
-    private $lastState;
-
-    private $webRequest;
-
-    static $LOCAL_COOKIE_SUFFIX = "_TR";
-    static $COOKIE_SUFFIX = "_TOKEN";
-    static $COOKIE_PREFIX = "__TP_";
-
-    public function __construct($apiEndpoint, $aid, $privateKey) {
-        $this->apiEndpoint = $apiEndpoint;
-        $this->aid = $aid;
-        $this->privateKey = $privateKey;
-        $this->localBindList = new TPAccessTokenList();
-
-        $this->msgbuilder = new TPClientMsgBuilder($privateKey);
-        $this->setClientCookies($_COOKIE);
-
-        if($this->localAccessTokenList == null)
-            $this->localAccessTokenList = new TPAccessTokenList();
-
-        if($this->accessTokenList == null)
-            $this->accessTokenList = new TPAccessTokenList();
+    public static function config($aid = null, $privateKey = null, $sandbox = null) {
+        if($aid)
+            return new TPConfig($aid, $privateKey, $sandbox);
+        return new TPConfig(self::$AID, self::$PRIVATE_KEY, self::$SANDBOX);
     }
 
-    public function setClientCookies(array $cookies) {
-        if(count($cookies) == 0)
-            return;
-
-        try {
-            $this->accessTokenList = $this->msgbuilder->parseAccessTokenList($this->aid, $cookies);
-            $this->accessTokenList->setAID($this->aid);
-        } catch (Exception $e) {
-        }
-        try {
-            $this->localAccessTokenList = $this->msgbuilder->parseLocalTokenList($this->aid, $cookies);
-            $this->localAccessTokenList->setAID($this->aid);
-        } catch (Exception $e) {
-            $this->localAccessTokenList = new TPAccessTokenList();
-            $this->localAccessTokenList->setAID($this->aid);
-        }
-        $this->_cleanLocalTokens();
-
+    public static function fetchAccessDetails($params, $page = 0, $pagesize = 500) {
+        return TinyPassGateway::fetchAccessDetails($params);
     }
 
-
-    private function isAccessGrantedForRID($rid) {
-        $this->lastState = TPAccessState::ACCESS_GRANTED;
-
-        if ($this->accessTokenList == null) {
-            $this->lastState = TPAccessState::NO_TOKENS_FOUND;
-            return false;
-        }
-
-        if ($this->accessTokenList->hasIPs() && $this->isClientIPValid() && $this->accessTokenList->containsIP($this->clientIP) == false) {
-            $this->lastState = TPAccessState::CLIENT_IP_DOES_NOT_MATCH_TOKEN;
-            return false;
-        }
-
-        if ($this->accessTokenList->isAccessGranted($rid)) {
-            return true;
-        } else {
-            $this->lastState = $this->accessTokenList->getLastError();
-            return false;
-        }
-
+    public static function fetchAccessDetail($params) {
+        return TinyPassGateway::fetchAccessDetail($params);
     }
 
-    public function isAccessGranted($obj) {
-        if(is_string($obj)) {
-            return $this->isAccessGrantedForRID($obj);
-        }
-
-        if($obj instanceof TPResource) {
-            return $this->isAccessGrantedForRID($obj->getRID());
-        }
-
-        if($obj instanceof TPOffer) {
-            $granted = $this->isAccessGrantedForRID($obj->getResource()->getRID());
-
-            if ($granted) {
-                return true;
-            } else {
-                if ($obj->getPricing()->hasActiveOptions() == false) {
-                    $this->lastState = TPAccessState::NO_ACTIVE_PRICES;
-                    return true;
-                }
-            }
-            return false;
-
-        }
-
+    public static function revokeAccess($params) {
+        return TinyPassGateway::revokeAccess($params);
     }
 
-
-    public function getMeterDetails($offer) {
-        $resource = $offer->getResource();
-        $meterDetails = null;
-
-        /*
-            Check for token in both places.  Because MeteredB from from the server we must check both places.
-        */
-        if ($this->accessTokenList != null
-                        && $this->accessTokenList->getToken($resource->getRID()) != null
-                        && TPMeterDetails::is($this->accessTokenList->getToken($resource->getRID()))) {
-            $token = $this->accessTokenList->getToken($resource->getRID());
-            $meterDetails = TPMeterDetails::createWithToken($token);
-
-        } else if ($this->localAccessTokenList == null || $this->localAccessTokenList->getToken($resource->getRID()) == null) {
-
-            $meterDetails = TPMeterDetails::createWithValues($resource->getRIDHash(), $offer->getMeteredPolicy()->toMap());
-            $this->localBindList->add($resource->getRIDHash(), $meterDetails->getToken());
-
-        } else {
-
-            $token = $this->localAccessTokenList->getToken($resource->getRID());
-            $meterDetails = TPMeterDetails::createWithToken($token);
-            $this->localBindList->add($resource->getRIDHash(), $token);
-        }
-        try {
-            $meterDetails->touch();
-        } catch (Exception $tokenUnparseable) {
-            //tokenUnparseable.printStackTrace();
-        }
-
-        return $meterDetails;
+    public static function cancelSubscription($params) {
+        return TinyPassGateway::cancelSubscription($params);
     }
 
-    public function __generateLocalCookie() {
+}
 
+class TPConfig {
 
-        foreach($this->localBindList->getTokens() as $key => $token) {
-            $this->localAccessTokenList->add($key, $token);
-        }
+    public static $VERSION = "2.0";
+    public static $MSG_VERSION = "2.0p";
 
-        if ($this->localAccessTokenList->size() > 0)
-            return self::getAppPrefix($this->getAID()) . TinyPass::$LOCAL_COOKIE_SUFFIX  . "=" . urlencode($this->getMsgbuilder()->buildAccessTokenList($this->getLocalAccessTokenList()));
+    public static $CONTEXT = "/v2";
+    public static $REST_CONTEXT = "/r2";
 
-        return "";
+    public static $COOKIE_SUFFIX = "_TOKEN";
+    public static $COOKIE_PREFIX = "__TP_";
+
+    public $AID;
+    public $PRIVATE_KEY;
+    public $SANDBOX;
+
+    public function __construct($aid, $privateKey, $sandbox) {
+        $this->AID = $aid;
+        $this->PRIVATE_KEY = $privateKey;
+        $this->SANDBOX = $sandbox;
     }
 
-    public function __hasLocalTokenChanges() {
-        return $this->localBindList->isEmpty() == false;
-    }
-
-    private function _cleanLocalTokens() {
-        $tokens = $this->localAccessTokenList->getTokens();
-
-        foreach($tokens as $rid => $token) {
-
-            if(TPMeterDetails::is($token)) {
-                $meterDetails = new TPMeterDetails($token);
-                if ($meterDetails->isDead())
-                    $this->localAccessTokenList->remove($rid);
-
-            } else {
-                $accessToken = new TPAccessToken($token);
-                if($accessToken->isExpired())
-                    $this->localAccessTokenList->remove($rid);
-            }
-
+    public function getEndPoint() {
+        if(TinyPass::$API_ENDPOINT_DEV != null && strlen(TinyPass::$API_ENDPOINT_DEV)>0) {
+            return TinyPass::$API_ENDPOINT_DEV;
+        } else if(TinyPass::$SANDBOX) {
+            return TinyPass::$API_ENDPOINT_SANDBOX;
+        } else {
+            return TinyPass::$API_ENDPOINT_PROD;
         }
     }
 
-    public function isClientIPValid() {
-        return $this->clientIP && preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}/", $this->clientIP);
-    }
-
-    public function getAID() {
-        return $this->aid;
-    }
-
-    protected function getPrivateKey() {
-        return $this->privateKey;
+    public static function getTokenCookieName($aid) {
+        return self::$COOKIE_PREFIX . $aid . self::$COOKIE_SUFFIX;
     }
 
@@ -221 +104 @@
     }
 
-    public function getApiEndPoint() {
-        return $this->apiEndpoint;
-    }
-
-    public function getMsgBuilder() {
-        return $this->msgbuilder;
-    }
-
-    public function getAccessTokenList() {
-        return $this->accessTokenList;
-    }
-
-    public function getWebRequest() {
-        if(!isset($this->webRequest))
-            $this->webRequest = new TPWebRequest($this);
-        return $this->webRequest;
-    }
-
-    public function setClientIP($s) {
-        $this->clientIP = $s;
-    }
-
-    public function getLocalAccessTokenList() {
-        return $this->localAccessTokenList;
-    }
-
-    public function __getLocalBindingList() {
-        return $this->localBindList;
-    }
-
-    public function getClientIP() {
-        return $this->clientIP;
-    }
-
-    public function getAccessError() {
-        return $this->lastState;
-    }
-
 }
 
-
-class TPAccessState {
-
-    const ACCESS_GRANTED = 100;
-    const CLIENT_IP_DOES_NOT_MATCH_TOKEN = 200;
-    const RID_NOT_FOUND = 201;
-    const NO_TOKENS_FOUND = 202;
-    const METERED_TOKEN_ALWAYS_DENIED = 203;
-    const EXPIRED = 204;
-    const NO_ACTIVE_PRICES = 205;
-
-}
 ?>

tinypass/branches/silver_bullet/api/TinyPassException.php

@@ -3 +3 @@
 class TinyPassException extends Exception {
 
-    public function __construct($message) {
+    public $code = 0;
+
+    public function __construct($message, $code = 0) {
         parent::__construct($message);
+        $this->code = 0;
     }
+
 
 }

tinypass/branches/silver_bullet/api/builder/TPClientBuilder.php

@@ -8 +8 @@
     const ENCODING_OPEN = 'o';
 
+    const STD_ENC = "{jax}";
+    const ZIP_ENC = "{jzx}";
+    const OPEN_ENC = "{jox}";
+
     private $builder;
     private $encoder;
@@ -15 +19 @@
     private $mask = "";
 
-    function __construct($privateKey, $settings = null) {
-        $this->privateKey = $privateKey;
+    function __construct($settings = null) {
+        $this->privateKey = TinyPass::$PRIVATE_KEY;
         $this->mask.=("{");
         switch ($settings!=null && strlen($settings)>1 ? $settings{1} : self::TYPE_JSON) {
@@ -38 +42 @@
     }
 
-    public function buildAccessTokenList(TPAccessTokenList $accesstokenlist) {
-        return $this->mask . $this->encoder->encode($this->builder->buildAccessTokenList($accesstokenlist));
+    /**
+     *
+     * @param <type> $tokens - can be a TPAccessTokne or TPAccessTokenList
+     * @return <type>
+     */
+    public function buildAccessTokens($tokens) {
+
+        if($tokens instanceof TPAccessToken) {
+//          $tokens = array($tokens);
+            $tokens = new TPAccessTokenList(array($tokens));
+        }
+
+        return $this->mask . $this->encoder->encode($this->builder->buildAccessTokens($tokens));
     }
 
-    public function buildTicketRequest($tickets) {
+    public function buildPurchaseRequest($tickets) {
 
-        if($tickets instanceof TPTicket) {
+        if($tickets instanceof TPPurchaseRequest) {
             $tickets = array($tickets);
         }
 
-        return $this->mask . $this->encoder->encode($this->builder->buildTicketRequest($tickets));
+        return $this->mask . $this->encoder->encode($this->builder->buildPurchaseRequest($tickets));
     }
 

tinypass/branches/silver_bullet/api/builder/TPClientParser.php

@@ -3 +3 @@
 class TPClientParser {
 
-    private $privateKey;
-    private $builder;
+    private $parser;
     private $encoder;
 
-    function __construct($privateKey) {
-        $this->privateKey = $privateKey;
+    const DATA_BLOCK_START_SIGNATURE = '/[{]\w\w\w[}]/';
+    private $config;
+
+    function __construct() {
+        $this->config = TinyPass::config();
     }
 
-    private function checkSettings($str) {
+    public function parseAccessTokens($message) {
+        $tokens = array();
+        $blocks = $this->splitMessageString($message);
+        foreach($blocks as $block) {
+            $s = $this->setupImpls($block);
+            $list = $this->parser->parseAccessTokens($this->encoder->decode($s));
+            $tokens  = array_merge($tokens, $list->getTokens());
+        }
+        return new TPAccessTokenList($tokens);
+    }
 
-        switch ($str!=null && strlen($str)>1 ? $str{1} : TPClientBuilder::TYPE_JSON) {
+    function splitMessageString($message) {
+        $list = array();
+        $start = -1;
+
+        $matches  = array();
+        preg_match_all(TPClientParser::DATA_BLOCK_START_SIGNATURE, $message, $matches, PREG_OFFSET_CAPTURE);
+
+        if(count($matches) == 0)
+            return $list;
+
+        $matches = $matches[0];
+
+
+        foreach($matches as $match) {
+            if($start >= 0) {
+                $list[] = trim(substr($message, $start, ($match[1]-$start)));
+            }
+            $start = $match[1];
+        }
+
+        if($start >= 0) {
+            $list[] = trim(substr($message, $start));
+        }
+
+        return $list;
+    }
+
+
+    private function setupImpls($str) {
+
+        if(!$str)
+            $str = TPClientBuilder::STD_ENC;
+
+        switch (strlen($str)>1 ? $str{1} : TPClientBuilder::TYPE_JSON) {
 
             case TPClientBuilder::TYPE_JSON:
             default:
-                $this->builder = new TPJsonMsgBuilder();
+                $this->parser = new TPJsonMsgBuilder();
 
         }
-        switch ($str!=null && strlen($str)>2 ? $str{2} : TPClientBuilder::ENCODING_AES) {
+        switch (strlen($str)>2 ? $str{2} : TPClientBuilder::ENCODING_AES) {
 
             case TPClientBuilder::ENCODING_OPEN:
@@ -28 +72 @@
             case TPClientBuilder::ENCODING_AES:
             default:
-                $this->encoder = new TPSecureEncoder($this->privateKey);
+                $this->encoder = new TPSecureEncoder($this->config->PRIVATE_KEY);
         }
         return preg_replace('/^{...}/','', $str);
     }
 
-    public function parseAccessTokenList($message) {
-        $s = $this->checkSettings($message);
-        return $this->builder->parseAccessTokenList($this->encoder->decode($s));
-    }
+
 
 }

tinypass/branches/silver_bullet/api/builder/TPJsonMsgBuilder.php

@@ -3 +3 @@
 class TPJsonMsgBuilder {
 
-    public function buildTicketRequest(array $tickets) {
+    public function parseAccessTokens($raw) {
+
+        if($raw == null || $raw == "") return null;
+
+        $json = (array)json_decode($raw);
+        $accessTokenList = array();
+
+        if(!is_array($json)) {
+            $tokenMap = $json;
+            $ridHash = TPRIDHash::parse($tokenMap[TPTokenData::RID]);
+            $token = $this->parseAccessToken($ridHash, $tokenMap);
+            $accessToken = new TPAccessToken($token);
+            $accessTokenList[] = $accessToken;
+        }else {
+            foreach($json as $tokenMap) {
+                $tokenMap = (array)$tokenMap;
+                $rid = TPRID::parse($tokenMap[TPTokenData::RID]);
+                $token = $this->parseAccessToken($rid->toString(), $tokenMap);
+                $accessToken = new TPAccessToken($token);
+                $accessTokenList[] = $accessToken;
+            }
+        }
+
+        return new TPAccessTokenList($accessTokenList);
+    }
+
+    private function parseAccessToken($rid, $map) {
+
+        $token = new TPTokenData($rid);
+
+        $fields = array(
+                        TPTokenData::ACCESS_ID,
+                        TPTokenData::EX,
+                        TPTokenData::IPS,
+                        TPTokenData::UID,
+                        TPTokenData::EARLY_EX,
+                        TPTokenData::METER_TRIAL_ENDTIME,
+                        TPTokenData::METER_LOCKOUT_PERIOD,
+                        TPTokenData::METER_LOCKOUT_ENDTIME,
+                        TPTokenData::METER_TRIAL_ACCESS_ATTEMPTS,
+                        TPTokenData::METER_TRIAL_MAX_ACCESS_ATTEMPTS,
+                        TPTokenData::METER_TYPE,
+        );
+
+
+        foreach($fields as $f) {
+            if(isset($map[$f]))
+                $token->addField($f, $map[$f]);
+        }
+
+
+        return $token;
+    }
+
+
+
+    public function buildPurchaseRequest(array $requestData) {
         $list = array();
 
-        foreach($tickets as $ticket) {
-            $list[] = $this->buildTicket($ticket);
+        foreach($requestData as $request) {
+            $list[] = $this->buildRequest($request);
         }
 
@@ -13 +69 @@
     }
 
-    public function buildTicket(TPTicket $ticket) {
+    public function buildRequest(TPPurchaseRequest $request) {
 
         $ticketMap = array();
 
-        $ticketMap["o1"] = $this->buildOffer($ticket->getPrimaryOffer());
-        $ticketMap["t"] =  $ticket->getTimestampSecs();
-        $ticketMap["tags"] =  $ticket->getTags();
-        $ticketMap["v"] =  $ticket->getVersion();
-        $ticketMap["ip"] =  $ticket->getClientIP();
+        $ticketMap["o1"] = $this->buildOffer($request->getPrimaryOffer());
+        $ticketMap["t"] =  TPUtils::now();
+        $ticketMap["v"] =  TPConfig::$MSG_VERSION;
+        $ticketMap["cb"] =  $request->getCallback();
 
+        if($request->getClientIP())
+            $ticketMap["ip"] =  $request->getClientIP();
 
-        if ($ticket->getOptions() != null && count($ticket->getOptions()) > 0)
-            $ticketMap["opts"] =  $ticket->getOptions();
+        if($request->getUserRef() != null)
+            $ticketMap["uref"] = $request->getUserRef();
 
-        if ($ticket->getSecondaryOffer() != null) {
-            $ticketMap["o2"] = $this->buildOffer($ticket->getSecondaryOffer());
+        if ($request->getOptions() != null && count($request->getOptions()) > 0)
+            $ticketMap["opts"] =  $request->getOptions();
+
+        if ($request->getSecondaryOffer() != null) {
+            $ticketMap["o2"] = $this->buildOffer($request->getSecondaryOffer());
         }
 
 
         return $ticketMap;
-
-//      $ticketMap["rid"] = $ticket->getResource()->getRID();
-//      $ticketMap["rnm"] =  $ticket->getResource()->getResourceName();
-//      $ticketMap["t"] = $ticket->getTimestamp()*1000;
-//      $ticketMap["tags"] = $ticket->getTags();
-
-//      $pos = array();
-//      for ($i = 0; $i < count($ticket->getPriceOptions()); $i++) {
-//          $options = $ticket->getPriceOptions();
-//          $pos["opt" . $i] = $this->buildPriceOption($options[$i], $i);
-//      }
-//      $ticketMap["pos"] = $pos;
 
     }
@@ -55 +103 @@
         $map["rurl"] = $offer->getResource()->getURL();
 
-        if ($options != null)
-            $map["opts"] = $options;
+        if ($offer->getTags())
+            $map["tags"] = $offer->getTags();
 
         $pos = array();
@@ -75 +123 @@
     }
 
-    public function buildAccessTokenList(TPAccessTokenList $list) {
-        $map = array();
-        $map["aid"] = $list->getAID();
-        $map["uid"] = $list->getUID();
-        $map["built"] = time();
-        $map["ips"] = $list->getIPs();
-
-
+    public function buildAccessTokens(TPAccessTokenList $list) {
         $tokens = array();
 
-        foreach($list->getTokens() as $rid => $token) {
-            array_push($tokens, $token->getValues());
+        foreach($list->getTokens() as $token) {
+            $tokens[] = $token->getTokenData()->getValues();
         }
+        return json_encode($tokens);
+    }
 
-        $map["tokens"] = $tokens;
-        return json_encode($map);
+    public function buildAccessToken($accessToken) {
+        return json_encode($accessToken->getTokenData()->getValues());
     }
 
@@ -108 +151 @@
             $map["ed"] = $this->nuller($po->getEndDateInSecs());
 
+        if ($po->isRecurring()) {
+            $map["recur"] = "true";
+        }
 
         $map["cpt"] =  $this->nuller($po->getCaption());
@@ -121 +167 @@
     }
 
-    public function parseAccessTokenList($raw) {
-        $json = (array)json_decode($raw);
-        $tokenList = new TPAccessTokenList();
-
-        $tokenList->setAID($json["aid"]);
-        $tokenList->setUID($json["uid"]);
-        $tokenList->setBuildTime($json["built"]);
-
-        $ips = array();
-        if(isset($json["ips"]))
-            $ips = $json["ips"];
-        $tokenList->setIPs($ips);
-
-        $list = (array)$json["tokens"];
-        for ($i = 0; $i < count($list); $i++) {
-            $map = (array)$list[$i];
-
-
-            if(!isset($map[TPToken::RID]))
-                $ridHash = TPRIDHash::parse("");
-            else
-                $ridHash = TPRIDHash::parse($map["rid"]);
-
-            $token = new TPToken($ridHash);
-
-
-            $fields = array(
-                            TPToken::EX,
-                            TPToken::EARLY_EX,
-                            TPToken::METER_TRIAL_ENDTIME,
-                            TPToken::METER_LOCKOUT_PERIOD,
-                            TPToken::METER_LOCKOUT_ENDTIME,
-                            TPToken::METER_TRIAL_ACCESS_ATTEMPTS,
-                            TPToken::METER_TRIAL_MAX_ACCESS_ATTEMPTS,
-                            TPToken::METER_TYPE,
-            );
-
-
-            foreach($fields as $f) {
-                if(isset($map[$f]))
-                    $token->addField($f, $map[$f]);
-            }
-
-            $tokenList->add($ridHash, $token);
-        }
-
-        return $tokenList;
-    }
-
-
 }
 

tinypass/branches/silver_bullet/api/builder/TPSecurityUtils.php

@@ -2 +2 @@
 
 class TPSecurityUtils {
-
-    //private static $LONG_MAX = "9223372036854775807";
-    //private static $LONG_MIN = "-9223372036854775808";
 
     public static function hashCode($s) {
@@ -121 +118 @@
         return $string;
     }
+
+    public static function hashHmacSha1($key, $value) {
+        return self::urlensafe(hash_hmac('sha1', $value, $key, true));
+    }
+
+    public static function hashHmacSha256($key, $value) {
+        return self::urlensafe(hash_hmac('sha256', $value, $key, true));
+    }
+
+    public static function hashHmacSha($key, $value) {
+        if(in_array('sha256', hash_algos()))
+            return self::hashHmacSha256($key, $value);
+        else if(in_array('sha1', hash_algos()))
+            return self::hashHmacSha1($key, $value);
+        else
+            throw new Exception("Could not load hashing algorithm sha1/sha256");
+
+    }
+
 }
 

tinypass/branches/silver_bullet/api/policies/Policies.php

@@ -16 +16 @@
 }
 
-class TPMeteredPolicyImpl extends TPPolicy {
-
-}
-class TPReminderMeteredPricing extends TPMeteredPolicyImpl {
+class TPReminderMeteredPricing extends TPPolicy {
 
     public static function createByAccessCount($trialCount, $lockoutPeriod) {
@@ -25 +22 @@
         $meter = new TPReminderMeteredPricing();
 
-        $meter->set(TPToken::METER_LOCKOUT_PERIOD, $lockoutPeriod);
+        $meter->set(TPTokenData::METER_LOCKOUT_PERIOD, $lockoutPeriod);
         $meter->set(TPPolicy::POLICY_TYPE, TPPolicy::REMINDER_METER_BY_COUNT);
-        $meter->set(TPToken::METER_TYPE, TPMeterDetails::REMINDER);
-        $meter->set(TPToken::METER_TRIAL_MAX_ACCESS_ATTEMPTS, $trialCount);
-        $meter->set(TPToken::METER_TRIAL_ACCESS_ATTEMPTS, 0);
+        $meter->set(TPTokenData::METER_TYPE, TPTokenData::METER_REMINDER);
+        $meter->set(TPTokenData::METER_TRIAL_MAX_ACCESS_ATTEMPTS, $trialCount);
+        $meter->set(TPTokenData::METER_TRIAL_ACCESS_ATTEMPTS, 0);
         return $meter;
 
@@ -38 +35 @@
         $meter = new TPReminderMeteredPricing();
 
-        $meter->set(TPToken::METER_TRIAL_ACCESS_PERIOD, $trialPeriod);
-        $meter->set(TPToken::METER_LOCKOUT_PERIOD, $lockoutPeriod);
-        $meter->set(TPToken::METER_TYPE, TPMeterDetails::REMINDER);
+        $meter->set(TPTokenData::METER_TRIAL_ACCESS_PERIOD, $trialPeriod);
+        $meter->set(TPTokenData::METER_LOCKOUT_PERIOD, $lockoutPeriod);
+        $meter->set(TPTokenData::METER_TYPE, TPTokenData::METER_REMINDER);
         $meter->set(TPPolicy::POLICY_TYPE, TPPolicy::REMINDER_METER_BY_TIME);
 
-        $parsed = TPPriceOption::parseLoosePeriod($trialPeriod);
-        $trialEndTime = (time()*1000) + $parsed;
-        $meter->set(TPToken::METER_TRIAL_ENDTIME, TPToken::convertToEpochSeconds($trialEndTime));
-        $meter->set(TPToken::METER_LOCKOUT_ENDTIME, TPToken::convertToEpochSeconds($trialEndTime + TPPriceOption::parseLoosePeriod($lockoutPeriod)));
+        $parsed = TPUtils::parseLoosePeriodInSecs($trialPeriod);
+        $trialEndTime = time() + $parsed;
+        $meter->set(TPTokenData::METER_TRIAL_ENDTIME, TPTokenData::convertToEpochSeconds($trialEndTime));
+        $meter->set(TPTokenData::METER_LOCKOUT_ENDTIME, TPTokenData::convertToEpochSeconds($trialEndTime + TPUtils::parseLoosePeriodInSecs($lockoutPeriod)));
         return $meter;
     }
@@ -54 +51 @@
  * Metered Pricing
  */
-class TPStrictMeteredPricing extends TPMeteredPolicyImpl {
+class TPStrictMeteredPricing extends TPPolicy {
 
     public static function createByPeriod($trialPeriod, $lockoutPeriod) {
         $meter = new TPStrictMeteredPricing();
-        $meter->set(TPToken::METER_TRIAL_ACCESS_PERIOD, $trialPeriod);
-        $meter->set(TPToken::METER_LOCKOUT_PERIOD, $lockoutPeriod);
-        $meter->set(TPToken::METER_TYPE, TPMeterDetails::STRICT);
+        $meter->set(TPTokenData::METER_TRIAL_ACCESS_PERIOD, $trialPeriod);
+        $meter->set(TPTokenData::METER_LOCKOUT_PERIOD, $lockoutPeriod);
+        $meter->set(TPTokenData::METER_TYPE, TPTokenData::METER_STRICT);
         $meter->set(TPPolicy::POLICY_TYPE, TPPolicy::STRICT_METER_BY_TIME);
         return $meter;
@@ -96 +93 @@
         $r->set(TPPolicy::POLICY_TYPE, TPPolicy::RESTRICT_MAX_PURCHASES);
         $r->set("amount", $maxAmount);
-        $r->set("withInPeriod", $withInPeriod);
+        $r->set("withinPeriod", $withInPeriod);
         if($linkWithDetails)
             $r->set("linkWithDetails", $linkWithDetails);

tinypass/branches/silver_bullet/api/policies/TPPolicy.php

@@ -27 +27 @@
 class TPPricingPolicy {
 
-    public static function createBasic(array $priceOptions) {
+    public static function createBasic(array $priceOptions = null) {
+        if($priceOptions == null)
+                $priceOptions = array();
         return new TPBasicPricing($priceOptions);
     }

tinypass/branches/silver_bullet/api/token/TPAccessToken.php

@@ -10 +10 @@
  * cURL with HTTPS support
  */
-class TPAccessToken extends TPTokenWrapper {
+class TPAccessToken {
+
+    private $token;
+    private $accessState;
 
     public function __construct() {
-        parent::__construct();
 
         $numargs = func_num_args();
-
-        if($numargs == 1 && func_get_arg(0) instanceof TPToken) {
+        $this->token = new TPTokenData();
+
+        if($numargs == 1 && func_get_arg(0) instanceof TPTokenData) {
             $this->token = func_get_arg(0);
             return;
         }
 
+        if($numargs == 1 && func_get_arg(0) instanceof TPRID) {
+            $rid = TPRID::parse(func_get_arg(0));
+            $this->token->addField(TPTokenData::RID,$rid->toString());
+            return;
+        }
+
         if($numargs == 2) {
-            $ridhash = func_get_arg(0);
+            $rid = TPRID::parse(func_get_arg(0));
             $expiration = func_get_arg(1);
-            $this->token->addField(TPToken::RID,$ridhash->toString());
-            $this->token->addField(TPToken::EX, $expiration != null ? TPToken::convertToEpochSeconds($expiration) : 0);
+            $this->token->addField(TPTokenData::RID,$rid->toString());
+            $this->token->addField(TPTokenData::EX, $expiration != null ? TPTokenData::convertToEpochSeconds($expiration) : 0);
             return;
         }
 
         if($numargs == 3) {
-            $ridhash = func_get_arg(0);
+            $rid = TPRID::parse(func_get_arg(0));
             $expiration = func_get_arg(1);
             $eex = func_get_arg(2);
-            $this->token->addField(TPToken::RID,$ridhash->toString());
-            $this->token->addField(TPToken::EX, $expiration != null ? TPToken::convertToEpochSeconds($expiration) : 0);
-            $this->token->addField(TPToken::EARLY_EX, $eex != null ? TPToken::convertToEpochSeconds($eex) : 0);
-            return;
-        }
-
-
+            $this->token->addField(TPTokenData::RID,$rid->toString());
+            $this->token->addField(TPTokenData::EX, $expiration != null ? TPTokenData::convertToEpochSeconds($expiration) : 0);
+            $this->token->addField(TPTokenData::EARLY_EX, $eex != null ? TPTokenData::convertToEpochSeconds($eex) : 0);
+            return;
+        }
+
+
+    }
+
+    public function getTokenData() {
+        return $this->token;
+    }
+
+    public function getAccessID() {
+        return $this->token->getField(TPTokenData::ACCESS_ID);
+    }
+
+    public function getRID() {
+        return new TPRID($this->token->getRID());
     }
 
     public function getExpirationInMillis() {
-        return $this->getExpirationInSeconds() * 1000;
+        return $this->getExpirationInSecs() * 1000;
+    }
+
+    public function getExpirationInSecs() {
+        return $this->token->getFromMap(TPTokenData::EX, 0);
     }
 
     public function getExpirationInSeconds() {
-        return $this->token->getFromMap(TPToken::EX, 0);
-    }
-
-    public function getPreExpirationInSeconds() {
-        return $this->token->getFromMap(TPToken::EARLY_EX, 0);
-    }
+        return $this->token->getFromMap(TPTokenData::EX, 0);
+    }
+
+    public function getEarlyExpirationInSecs() {
+        return $this->token->getFromMap(TPTokenData::EARLY_EX, 0);
+    }
+
+    public function getEarlyExpirationInSeconds() {
+        return $this->token->getFromMap(TPTokenData::EARLY_EX, 0);
+    }
+
+    public function isMetered() {
+        return array_key_exists(TPTokenData::METER_TYPE, $this->token->getValues());
+    }
+
+    public function getMeterType() {
+        return $this->token->getFromMap(TPTokenData::METER_TYPE, 0);
+    }
+
+    public function isTrialPeriodActive() {
+
+        if($this->isMetered()) {
+
+            if ($this->getMeterType() == TPTokenData::METER_STRICT) {
+
+                $expires = $this->getTrialEndTimeSecs();
+                if ($expires == null || $expires == 0)
+                    return false;
+                return time() <= $expires;
+
+            } else {
+
+                if ($this->isMeterViewBased()) {
+                    return $this->getTrialViewCount() <= $this->getTrialViewLimit();
+                } else {
+                    $expires = $this->getTrialEndTimeSecs();
+                    if ($expires == null || $expires == 0)
+                        return true;
+                    return time() <= $expires;
+                }
+
+            }
+        }
+        return false;
+    }
+
+    public function isMeterViewBased() {
+        return $this->isMetered() && array_key_exists(TPTokenData::METER_TRIAL_MAX_ACCESS_ATTEMPTS, $this->token->getValues());
+    }
+
+    public function isMeterPeriodBased() {
+        return $this->isMetered() && !$this->isMeterViewBased();
+    }
+
+    public function isLockoutPeriodActive() {
+        if($this->isMetered()) {
+            $expires = $this->getLockoutEndTimeSecs();
+
+            if ($this->isTrialPeriodActive())
+                return false;
+
+            if ($expires == null || $expires == 0)
+                return false;
+
+            return time() <= $expires;
+        }
+        return false;
+    }
+
+    public function _isTrialDead() {
+        return $this->isLockoutPeriodActive() == false && $this->isTrialPeriodActive() == false;
+    }
+
+    public function getTrialEndTimeSecs() {
+        return $this->token->getFromMap(TPTokenData::METER_TRIAL_ENDTIME, 0);
+    }
+
+    public function getLockoutEndTimeSecs() {
+        return $this->token->getFromMap(TPTokenData::METER_LOCKOUT_ENDTIME, 0);
+    }
+
+    public function getTrialViewCount() {
+        return $this->token->getFromMap(TPTokenData::METER_TRIAL_ACCESS_ATTEMPTS, 0);
+    }
+
+    public function getTrialViewLimit() {
+        return $this->token->getFromMap(TPTokenData::METER_TRIAL_MAX_ACCESS_ATTEMPTS, 0);
+    }
+
+    public function getUID() {
+        return $this->token->getFromMap(TPTokenData::UID, 0);
+    }
+
+    /*
+    public function incrementViewCount() {
+        if ($this->getMeterType() != TPAccessToken::METER_STRICT && $this->isMeterViewBased()) {
+            if ($this->getTrialViewCount() == $this->getTrialViewLimit()) {
+                $this->token->addField(
+                                TPTokenData::METER_LOCKOUT_ENDTIME,
+                                time() +
+                                (TPUtils::parseLoosePeriodInMsecs( $this->token->getField(TPTokenData::METER_LOCKOUT_PERIOD))/1000)
+                );
+            }
+        }
+        $this->token->addField(TPTokenData::METER_TRIAL_ACCESS_ATTEMPTS, $this->getTrialViewCount() + 1);
+    }
+    */
+
+    public function containsIP($currentIP) {
+        $list = $this->token->getFromMap(TPTokenData::IPS, null);
+        if($list == null) return false;
+        return in_array(TPUtils::shortenIP($currentIP), $this->token->getField(TPTokenData::IPS));
+    }
+
+    public function hasIPs() {
+        if($this->token->getFromMap(TPTokenData::IPS, null) == null) return false;
+        return count($this->getIPs()) > 0;
+    }
+
+    public function getIPs() {
+        $list = $this->token->getFromMap(TPTokenData::IPS, null);
+        $res = array();
+        if($list==null) return $res;
+        foreach($list as $ip) {
+            $res[] = TPUtils::unshortenIP($ip);
+        }
+        return $res;
+    }
+
 
     /**
@@ -60 +208 @@
 
     public function isExpired() {
-        $time = $this->getPreExpirationInSeconds();
+        $time = $this->getEarlyExpirationInSeconds();
 
         if ($time == null || $time == 0)
-            $time = $this->getExpirationInSeconds();
+            $time = $this->getExpirationInSecs();
 
         if ($time == null || $time == 0)
@@ -70 +218 @@
         return $time <= time();
     }
-
+    public function isAccessGranted($clientIP = null) {
+        if($this->getExpirationInSecs() == -1) {
+            //special case. RID_NOT_FOUND
+            if($this->accessState!=TPAccessState::NO_TOKENS_FOUND) $this->accessState = TPAccessState::RID_NOT_FOUND;
+            return false;
+        }
+
+        if(TPUtils::isIpValid($clientIP) && $this->hasIPs() && !$this->containsIP($clientIP)) {
+            $this->accessState = TPAccessState::CLIENT_IP_DOES_NOT_MATCH_TOKEN;
+            return false;
+        }
+
+        if ($this->isMetered()) {
+            if ($this->isTrialPeriodActive()) {
+                $this->accessState = TPAccessState::METERED_IN_TRIAL;
+                return true;
+            } else if ($this->isLockoutPeriodActive()) {
+                $this->accessState = TPAccessState::METERED_IN_LOCKOUT;
+                return false;
+            } else {
+                $this->accessState = TPAccessState::METERED_TRIAL_DEAD;
+                return false;
+            }
+        } else if ($this->isExpired()) {
+            $this->accessState = TPAccessState::EXPIRED;
+            return false;
+        } else {
+            $this->accessState = TPAccessState::ACCESS_GRANTED;
+            return true;
+        }
+    }
+
+
+//V2-CHANGE moved from TinyPass class
+    public function setAccessState($accessState) {
+        $this->accessState = $accessState;
+    }
+    public function getAccessState() {
+        if($this->accessState==null) $this->isAccessGranted();
+        return $this->accessState;
+    }
+
+
+
+
+
+
+}
+
+
+class TPAccessState {
+
+    const ACCESS_GRANTED = 100;
+    const CLIENT_IP_DOES_NOT_MATCH_TOKEN = 200;
+    const RID_NOT_FOUND = 201;
+    const NO_TOKENS_FOUND = 202;
+    const METERED_IN_TRIAL = 203;
+    const EXPIRED = 204;
+    const NO_ACTIVE_PRICES = 205;
+    const METERED_IN_LOCKOUT = 206;
+    const METERED_TRIAL_DEAD = 207;
 
 

tinypass/branches/silver_bullet/api/token/TPAccessTokenList.php

@@ -4 +4 @@
 
     public static $MAX = 20;
-    private $aid;
-    private $uid;
     private $tokens = array();
-    private $rawToken = "";
-    private $buildTime = 0;
-    private $ips = array();
-    private $lastError = 0;
 
 
-    function __construct($aid = null, $uid = null) {
-        $this->aid = $aid;
-        $this->uid = $uid;
+    function __construct(array $tokens = null) {
+        if($tokens) {
+            foreach($tokens as $token) {
+                $this->add($token, false);
+            }
+        }
+
     }
 
-    public function getAID() {
-        return $this->aid;
-    }
-
-    public function getUID() {
-        return $this->uid;
+    public function getAccessTokens() {
+        return $this->tokens;
     }
 
@@ -30 +24 @@
     }
 
-    function setAID($aid) {
-        $this->aid= $aid;
+    public function contains($rid) {
+        $rid = TPRID::parse($rid);
+        return array_key_exists($rid->toString(), $this->tokens);
     }
 
-    function setUID($uid) {
-        $this->uid = $uid;
+    public function remove($rid) {
+        $rid = TPRID::parse($rid);
+        unset($this->tokens[$rid->toString()]);
     }
 
-    public function contains($rid) {
-        $ridHash = TPRIDHash::hashCode($rid);
-        return array_key_exists($ridHash, $this->tokens);
+    public function add(TPAccessToken $token, $checkLimit = true) {
+        if ($checkLimit && count($this->tokens) >= TPAccessTokenList::$MAX) {
+            array_pop($this->tokens);
+        }
+        $this->tokens[$token->getRID()->getID()] = $token;
     }
 
-    /*
-    public function addResourceByHash($ridHash, $expiration) {
-        $this->add($ridHash, new TPAccessToken($ridHash, $expiration));
+    public function addAll($tokens) {
+        foreach($tokens as $token) {
+            $this->add($token);
+        }
     }
 
-    public function addResource($rid, $expiration) {
-        $ridHash = TPRIDHash::hashCode($rid);
-        $this->add($ridHash, new TPAccessToken($ridHash, $expiration));
-    }
-    */
-    public function remove($key) {
-        unset($this->tokens[$key]);
-    }
-
-    public function add($ridHash, $token) {
-        if (count($this->tokens) >= TPAccessTokenList::$MAX) {
-            array_pop($this->tokens);
-        }
-        if($ridHash instanceof TPRIDHash)
-            $this->tokens[$ridHash->getHash()] = $token;
-        else {
-            $hash = TPRIDHash::hashCode($ridHash);
-            $this->tokens[$hash] = $token;
-        }
-
-    }
-
-    public function isAccessGranted($rid) {
-        $this->lastError = TPAccessState::ACCESS_GRANTED;
-        $hash = TPRIDHash::hashCode($rid);
-
-        if (array_key_exists($hash, $this->tokens)) {
-            $token = $this->tokens[$hash];
-            if (TPMeterDetails::is($token) == false) {
-                $accessToken = new TPAccessToken($token);
-                $expired = $accessToken->isExpired();
-                if ($expired) {
-                    $this->lastError = TPAccessState::EXPIRED;
-                    return false;
-                }
-                return true;
-            } else {
-                $this->lastError = TPAccessState::METERED_TOKEN_ALWAYS_DENIED;
-                return false;
-            }
-        }
-        $this->lastError = TPAccessState::RID_NOT_FOUND;
-        return false;
-    }
-
-    public function setRawToken($rawToken) {
-        $this->rawToken = $rawToken;
-    }
-
-    public function getRawToken() {
-        return $this->rawToken;
-    }
 
     /**
@@ -105 +52 @@
      * @param <String> $rid String RID
      */
-    public function getToken($rid) {
-        $hash = TPRIDHash::hashCode($rid);
-        if (array_key_exists($hash, $this->tokens)) {
-            return $this->tokens[$hash];
+    public function getAccessTokenByRID($rid) {
+        $rid = TPRID::parse($rid);
+        if($this->contains($rid)) {
+            return $this->tokens[$rid->getID()];
         }
         return null;
     }
 
-    public function setBuildTime($time) {
-        $this->buildTime = $time;
-    }
 
     public function isEmpty() {
@@ -125 +69 @@
     }
 
-    public function containsIP($currentIP) {
-        return in_array($currentIP, $this->ips);
+    public function testGetAID() {
+        $list = new TPAccessToken(new TPTokenData());
+        $this->assertEquals("AID", $list->getAID());
     }
 
-    public function addIP($ip) {
-        $this->ips[] = $ip;
-        return $this;
-    }
-
-    public function getIPs() {
-        return $this->ips;
-    }
-
-    public function hasIPs() {
-        return $this->ips != null && count($this->ips) > 0;
-    }
-
-    public function setIPs($list) {
-        $this->ips = $list;
-    }
-
-    public function getLastError() {
-        return $this->lastError;
+    public function testGetUID() {
+        $list = new TPAccessToken("AID", "UID");
+        $this->assertEquals("UID", $list->getUID());
     }