Merges ubc branch.

Author: ryasmi

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/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/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);
   }

app/controllers/xapi/StatementIndexController.php

@@ -21,10 +21,10 @@ public function __construct(StatementRepo $statement_repo) {
   /**
    * Gets an array of statements.
    * https://github.com/adlnet/xAPI-Spec/blob/master/xAPI.md#723-getstatements
-   * @param String $lrs_id
+   * @param [String => mixed] $options
    * @return Response
    */
-  public function index($lrs_id) {
+  public function index($options) {
     // Gets the acceptable languages.
     $langs = LockerRequest::header('Accept-Language', []);
     $langs = is_array($langs) ? $langs : explode(',', $langs);
@@ -43,9 +43,8 @@ public function index($lrs_id) {
 
     // Gets an index of the statements with the given options.
     list($statements, $count, $opts) = $this->statements->index(array_merge([
-      'lrs_id' => $lrs_id,
       'langs' => $langs
-    ], $params));
+    ], $params, $options));
 
     // Defines the content type and body of the response.
     if ($opts['attachments'] === true) {

app/controllers/xapi/StatementStoreController.php

@@ -55,24 +55,24 @@ private function getParts() {
 
   /**
    * Stores (POSTs) a newly created statement in storage.
-   * @param String $lrs_id
+   * @param [String => mixed] $options
    * @return Response
    */
-  public function store($lrs_id) {
+  public function store($options) {
     if (LockerRequest::hasParam(StatementController::STATEMENT_ID)) {
       throw new Exceptions\Exception('Statement ID parameter is invalid.');
     }
 
-    return IlluminateResponse::json($this->createStatements($lrs_id), 200, $this->getCORSHeaders());
+    return IlluminateResponse::json($this->createStatements($options), 200, $this->getCORSHeaders());
   }
 
   /**
    * Updates (PUTs) Statement with the given id.
-   * @param String $lrs_id
+   * @param [String => mixed] $options
    * @return Response
    */
-  public function update($lrs_id) {
-    $this->createStatements($lrs_id, function ($statements) {
+  public function update($options) {
+    $this->createStatements($options, function ($statements) {
       $statement_id = \LockerRequest::getParam(StatementController::STATEMENT_ID);
 
       // Returns a error if identifier is not present.
@@ -90,11 +90,11 @@ public function update($lrs_id) {
 
   /**
    * Creates statements from the content of the request.
-   * @param String $lrs_id
+   * @param [String => mixed] $options
    * @param Callable|null $modifier A function that modifies the statements before storing them.
    * @return AssocArray Result of storing the statements.
    */
-  private function createStatements($lrs_id, Callable $modifier = null) {
+  private function createStatements($options, Callable $modifier = null) {
     Helpers::validateAtom(new XApiImt(explode(';', LockerRequest::header('Content-Type'))[0]));
 
     // Gets parts of the request.
@@ -123,21 +123,13 @@ private function createStatements($lrs_id, Callable $modifier = null) {
     return $this->statements->store(
       $statements,
       is_array($parts['attachments']) ? $parts['attachments'] : [],
-      [
-        'lrs_id' => $lrs_id,
-        'authority' => $this->getAuthority()
-      ]
+      array_merge([
+        'authority' => $this->getAuthority($options['client'])
+      ], $options)
     );
   }
 
-  private function getAuthority() {
-    list($username, $password) = Helpers::getUserPassFromAuth();
-    $client = Helpers::getClient($username, $password);
-
-    if ($client === null) {
-      throw new Exceptions\Exception('No authority.');
-    }
-    
+  private function getAuthority($client) {
     return json_decode(json_encode($client['authority']));
   }
 

app/database/migrations/2015_05_26_084856_add_scopes_to_clients.php

@@ -0,0 +1,16 @@
+<?php
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddScopesToClients extends Migration {
+
+  public function up() {
+    (new \Client)->get()->each(function ($client) {
+      $client->scopes = isset($client->scopes) ? $client->scopes : ['all'];
+      $client->save();
+    });
+  }
+
+  public function down() {}
+
+}

app/lang/en/site.php

@@ -23,6 +23,7 @@
   	'title'       => 'Title',
   	'name'		    => 'Name',
   	'description' => 'Description',
+    'scopes'      => 'Scopes',
   	'logo'		    => 'Logo',
   	'language'    => 'Language',
   	'submit'	    => 'Submit',