Merge pull request #647 from LearningLocker/develop

v1.5.0

Author: ryasmi

VERSION

@@ -1 +1 @@
-1.4.2
+1.5.0

app/controllers/ClientController.php

@@ -51,7 +51,16 @@ public function edit($lrs_id, $id) {
 	 	return View::make('partials.client.edit', [
       'client' => $client,
       'lrs' => $lrs,
-      'list' => $lrs_list
+      'list' => $lrs_list,
+      'scopes' => [
+        'all',
+        'all/read',
+        'statements/write',
+        'statements/read',
+        'statements/read/mine',
+        'state',
+        'profile',
+      ],
 		]);
   }
 
@@ -84,6 +93,7 @@ public function create($lrs_id) {
    */
   public function update($lrs_id, $id){
     $data = Input::all();
+    $data['scopes'] = array_values(isset($data['scopes']) ? $data['scopes'] : []);
     $authority = [
       'name' => $data['name'],
     ];

app/controllers/LrsController.php

@@ -193,8 +193,10 @@ public function statements($lrs_id){
     $statements = (new StatementIndexer)->index(new IndexOptions([
       'lrs_id' => $lrs_id,
       'limit' => $this->statement->count([
-        'lrs_id' => $lrs_id
-      ])
+        'lrs_id' => $lrs_id,
+        'scopes' => ['all']
+      ]),
+      'scopes' => ['all']
     ]))->orderBy('statement.stored', 'DESC')->paginate(15);
 
     return View::make('partials.statements.list', array_merge($this->getLrs($lrs_id), [

app/controllers/SiteController.php

@@ -122,7 +122,7 @@ public function lrs(){
     $lrss = $this->lrs->index($opts);
 
     return Response::json(array_map(function ($lrs) {
-      $lrs->statement_total = $this->statement->count(['lrs_id' => $lrs->_id]);
+      $lrs->statement_total = $this->statement->count(['lrs_id' => $lrs->_id, 'scopes' => ['all']]);
       return $lrs;
     }, $lrss));
   }

app/controllers/api/Base.php

@@ -20,6 +20,8 @@ class Base extends Controller {
    */
   public function __construct() {
     $this->lrs = Helpers::getLrsFromAuth();
+    list($username, $password) = Helpers::getUserPassFromAuth();
+    $this->client = Helpers::getClient($username, $password);
   }
 
   /**
@@ -28,7 +30,9 @@ public function __construct() {
    */
   protected function getOptions() {
     return [
-      'lrs_id' => $this->lrs->_id
+      'lrs_id' => $this->lrs->_id,
+      'scopes' => $this->client->scopes,
+      'client' => $this->client
     ];
   }
 

app/controllers/xapi/ActivityController.php

@@ -34,7 +34,7 @@ public function full() {
     if ($result = $this->checkVersion()) return $result;
 
     $documents = $this->document->all(
-      $this->lrs->_id,
+      $this->getOptions(),
       $this->document_type,
       $this->getIndexData([
         'since' => ['string', 'timestamp']

app/controllers/xapi/AgentController.php

@@ -26,7 +26,7 @@ public function search() {
 
     $agent = (array) $this->getIndexData()[key($this->required)];
     $agents = $this->document->all(
-      $this->lrs->_id,
+      $this->getOptions(),
       $this->document_type,
       $this->getIndexData([
         'since' => ['string', 'timestamp']

app/controllers/xapi/BasicRequestController.php

@@ -17,21 +17,23 @@ class BasicRequestController extends BaseController {
    *  @param Lrs $lrs
    *  @param Client $client
    */
-  public function __construct(Client $client){
-  	$this->client  = $client;
-    $this->beforeFilter('@getLrs');
-    $this->beforeFilter('@setParameters', ['except' => 'store', 'put']);
+  public function __construct(Client $client_repo){
+    parent::__construct();
+  	$this->client_repo  = $client_repo;
   }
 
   /**
    * Create a client and return the credentials.
    * @return Response
    */
   public function store(){
-    $content = \LockerRequest::getContent();
-	
   	$opts = ['lrs_id' => $this->lrs->_id];
-  	$client = $this->client->store([], $opts);
+  	$client = $this->client_repo->store([
+      'authority' => [
+        'name' => 'API Client',
+        'mbox' => 'mailto:[email protected]'
+      ]
+    ], $opts);
 
     if($client){
     	$returnCredentials = array(

app/controllers/xapi/DocumentController.php

@@ -46,7 +46,7 @@ public function index() {
 
     // Gets all documents.
     $documents = $this->document->all(
-      $this->lrs->_id,
+      $this->getOptions(),
       $this->document_type,
       $this->getIndexData([
         'since' => ['string', 'timestamp']
@@ -89,7 +89,7 @@ public function store() {
 
     // Stores the document.
     $document = $this->document->store(
-      $this->lrs->_id,
+      $this->getOptions(),
       $this->document_type,
       $data,
       $this->getUpdatedValue(),
@@ -139,7 +139,7 @@ public function destroy(){
   protected function completeDelete($data = null, $singleDelete = false) {
     // Attempts to delete the document.
     $success = $this->document->delete(
-      $this->lrs->_id,
+      $this->getOptions(),
       $this->document_type,
       $data ?: $this->getShowData(),
       $singleDelete
@@ -218,7 +218,7 @@ private function checkFormContentType($contentType = '') {
    * @return Response
    */
   public function documentResponse($data) {
-    $document = $this->document->find($this->lrs->_id, $this->document_type, $data);
+    $document = $this->document->find($this->getOptions(), $this->document_type, $data);
 
     if (!$document) {
       throw new Exceptions\NotFound($data[$this->identifier], $this->document_type);

app/controllers/xapi/StatementController.php

@@ -60,7 +60,7 @@ public function get() {
   public function update() {
     // Runs filters.
     if ($result = $this->checkVersion()) return $result;
-    return $this->store_controller->update($this->lrs->_id);
+    return $this->store_controller->update($this->getOptions());
   }
 
   /**
@@ -70,15 +70,15 @@ public function update() {
   public function store() {
     // Runs filters.
     if ($result = $this->checkVersion()) return $result;
-    return $this->store_controller->store($this->lrs->_id);
+    return $this->store_controller->store($this->getOptions());
   }
 
   /**
    * Gets an array of statements.
    * @return Response
    */
   public function index() {
-    return $this->index_controller->index($this->lrs->_id);
+    return $this->index_controller->index($this->getOptions());
   }
 
   /**
@@ -91,10 +91,9 @@ public function show($id, $voided = false) {
     // Runs filters.
     if ($result = $this->checkVersion()) return $result;
 
-    $statement = $this->statements->show($id, [
-      'lrs_id' => $this->lrs->_id,
+    $statement = $this->statements->show($id, array_merge([
       'voided' => $voided
-    ]);
+    ], $this->getOptions()));
 
     return \Response::json(Helpers::replaceHtmlEntity($statement), 200);
   }