Merge pull request #13 from Brightcookie/saas-consolidation

SaaS/CE version consolidation

public/index.php

@@ -56,6 +56,8 @@
     }
 }
 
+// Use Mongo's native long int
+ini_set('mongo.native_long', 1);
 
 // Only invoked if mode is "production"
 $app->configureMode('production', function () use ($app, $appRoot) {

src/xAPI/Document/Auth/AbstractToken.php

@@ -45,6 +45,10 @@ public function hasPermission($permissionName)
             if ($scope->getName() === $permissionName || $scope->getName() === 'super') {
                 return true;
             }
+
+            if ($permissionName !== 'super' && $scope->getName() === 'all') {
+                return true;
+            }
         }
 
         return false;
@@ -92,15 +96,6 @@ public function isExpired()
         }
     }
 
-    public function isValid()
-    {
-        if ($this->isExpired()) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     public function jsonSerialize()
     {
         return $this->_data;

src/xAPI/Document/Statement.php

@@ -137,7 +137,23 @@ public function extractActivities()
         $activities = [];
         // Main activity
         if ((isset($this->_data['statement']['object']['objectType']) && $this->_data['statement']['object']['objectType'] === 'Activity') || !isset($this->_data['statement']['object']['objectType'])) {
-            $activities[] = $this->_data['statement']['object'];
+            $activity = $this->_data['statement']['object'];
+
+            // Sort of a hack - PHP's copy-on-write needs to be executed, otherwise the MongoDB PHP driver
+            // overwrites the contents of the variable being passed to the batchInsert call - regardless of
+            // whether the variable has been passed by reference or not!
+            // See more:
+            // http://php.net/manual/en/mongocollection.insert.php Insert behaviour
+            // http://php.net/manual/en/mongocollection.batchinsert.php Should behave the same as insert, however, does not
+            // https://jira.mongodb.org/browse/PHP-383
+            // http://www.phpinternalsbook.com/zvals/memory_management.html#reference-counting-and-copy-on-write
+            // 
+            // TODO: Report bug to Mongo bug tracker
+            // 
+            $activity['DUMMY'] = 'DUMMY';
+            unset($activity['DUMMY']);
+
+            $activities[] = $activity;
         }
 
         /* Commented out for now due to performance reasons

src/xAPI/Service/Auth/Basic.php

@@ -114,8 +114,7 @@ public function fetchToken($key, $secret)
         $expiresAt = $accessTokenDocument->getExpiresAt();
 
         if ($expiresAt !== null) {
-            $dateTime = new \DateTime($expiresAt);
-            if ($dateTime->getTimestamp() >= time()) {
+            if ($expiresAt->sec <= time()) {
                 throw new \Exception('Expired token.', Resource::STATUS_FORBIDDEN);
             }
         }

src/xAPI/Service/Auth/OAuth.php

@@ -127,6 +127,14 @@ public function fetchToken($accessToken)
             throw new \Exception('Invalid access token specified.', Resource::STATUS_FORBIDDEN);
         }
 
+        $expiresAt = $accessTokenDocument->getExpiresAt();
+
+        if ($expiresAt !== null) {
+            if ($expiresAt->sec <= time()) {
+                throw new \Exception('Expired token.', Resource::STATUS_FORBIDDEN);
+            }
+        }
+
         $this->setAccessTokens([$accessTokenDocument]);
 
         return $accessTokenDocument;

src/xAPI/View/V10/BasicAuth/AccessToken.php

@@ -35,10 +35,10 @@ public function render()
         $view = [
             'key'       => $accessTokenDocument->getKey(),
             'secret'    => $accessTokenDocument->getSecret(),
-            'expiresAt' => $accessTokenDocument->getExpiresAt(),
+            'expiresAt' => $accessTokenDocument->getExpiresAt()->sec,
             'expiresIn' => $accessTokenDocument->getExpiresIn(),
-            'createdAt' => $accessTokenDocument->getCreatedAt(),
-            'expired'   => $accessTokenDocument->getExpired(),
+            'createdAt' => $accessTokenDocument->getCreatedAt()->sec,
+            'expired'   => $accessTokenDocument->isExpired(),
             'scopes'    => array_values($accessTokenDocument->scopes),
             'user'      => $accessTokenDocument->user->renderSummary(),
         ];