Merge pull request #708 from LearningLocker/develop

daniel-abbey · daniel-abbey · commit aba802e3441c · 2015-08-07T16:37:21.000+01:00
v1.8.0
diff --git a/.env.local.php b/.env.local.php
diff --git a/.env.php b/.env.php
@@ -2,5 +2,6 @@
 
 return [
   'LOCAL_FILESTORE' => __DIR__.'/uploads',
-  'SESSION_FILESTORE' => __DIR__.'/app/storage/sessions'
+  'SESSION_FILESTORE' => __DIR__.'/app/storage/sessions',
+  'LOG_FILESTORE' => __DIR__.'/app/storage/logs/laravel.log',
 ];
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ Thumbs.db
 /app/config/ht2
 /app/config/production
 /app/config/staging
+/app/config/local/*.php
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.1
+1.8.0
diff --git a/app/config/app.php b/app/config/app.php
@@ -117,8 +117,8 @@
     'Barryvdh\Cors\CorsServiceProvider',
     'JsLocalization\JsLocalizationServiceProvider',
     'locker\RequestServiceProvider',
-    'Philo\Translate\TranslateServiceProvider'
-
+    'Philo\Translate\TranslateServiceProvider',
+    'Jenssegers\Mongodb\Auth\ReminderServiceProvider',
   ),
 
   /*
diff --git a/app/config/database.php b/app/config/database.php
@@ -1,107 +1,17 @@
 <?php
 
-return array(
-
-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
-
-	'fetch' => PDO::FETCH_CLASS,
-
-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
-
-	'default' => 'mongodb',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
-
-	'connections' => array(
-
-		'mysql' => array(
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'll_staging',
-			'username'  => 'root',
-			'password'  => '',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		),
-
-		'mongodb' => array(
+return [
+  'fetch' => PDO::FETCH_CLASS,
+  'default' => 'mongodb',
+  'connections' => [
+		'mongodb' => [
 		    'driver'   => 'mongodb',
 		    'host'     => 'localhost',
 		    'port'     => 27017,
 		    'username' => '',
 		    'password' => '',
-		    'database' => 'learninglocker' // Default name (removing this makes Travis fail).
-		),
-
-	),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk haven't actually been run in the database.
-	|
-	*/
-
+		    'database' => 'll_staging' // Default name (removing this makes Travis fail).
+		],
+	],
 	'migrations' => 'migrations',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
-
-	'redis' => array(
-
-		'cluster' => false,
-
-		'default' => array(
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
-			'database' => 0,
-		),
-
-	),
-
-);
+];
diff --git a/app/config/local/.gitkeep b/app/config/local/.gitkeep
diff --git a/app/config/local/app.php b/app/config/local/app.php
diff --git a/app/config/local/database.php b/app/config/local/database.php
diff --git a/app/config/local/mail.php b/app/config/local/mail.php
diff --git a/app/config/mail.php b/app/config/mail.php
@@ -119,6 +119,6 @@
   |
   */
 
-  'pretend' => false,
+  'pretend' => true,
 
 );
diff --git a/app/controllers/SiteController.php b/app/controllers/SiteController.php
@@ -158,8 +158,13 @@ public function inviteUsersForm() {
    * Invite in the users
    **/
   public function inviteUsers() {
-    $invite = \Locker\Helpers\User::inviteUser(Input::all());
-    return Redirect::back()->with('success', trans('users.invite.invited'));
+    $tokens = \Locker\Helpers\User::inviteUser(Input::all());
+
+    return Redirect::back()->with('success', trans('users.invite.invited', [
+      'tokens' => array_reduce($tokens, function ($carry, $item) {
+        return $carry .= '</br>'.$item['email'].' must <a href="'.$item['url'].'">reset their password</a>.';
+      }, '')
+    ]));
   }
 
   /**
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
@@ -2,6 +2,7 @@
 
 use Locker\Repository\User\UserRepository as User;
 use Locker\Repository\Lrs\Repository as Lrs;
+use Locker\Helpers\User as UserHelpers;
 
 class UserController extends BaseController {
 
@@ -106,5 +107,11 @@ public function destroy( $id ){
     return Redirect::back()->with('success', Lang::get('users.deleted'));
   }
 
+  public function resetPassword($id) {
+    $user = $this->user->find($id);
+    $token = UserHelpers::setEmailToken($user, $user->email);
+    return \URL::route('email.invite', [$token]);
+  }
+
 
 }
diff --git a/app/lang/en/users.php b/app/lang/en/users.php
@@ -14,7 +14,7 @@
     'email'   => 'Email addresses (separate lines)',
     'message' => 'Message (optional)',
     'sample'  => 'I would like to invite you to join this Learning Record Store (LRS).',
-    'invited' => 'Those users have been invited.',
+    'invited' => 'Those users have been invited. :tokens</br></br>Share these one time password reset links with their respective user.</br>If you have emails configured these links will be emailed to the users.',
     'failed'  => 'Inviting that user failed, check the user is not already a member of the LRS and the email is valid.',
     'has_invited' => 'has invited you to join',
     'invite_instructions' => 'To do this, please click on the following link'
diff --git a/app/locker/helpers/User.php b/app/locker/helpers/User.php
@@ -36,6 +36,7 @@ public static function inviteUser( $data ){
 
     //explode email addresses
     $emails = explode("\r\n", $data['emails']);
+    $tokens = [];
 
     foreach( $emails as $e ){
 
@@ -105,7 +106,9 @@ public static function inviteUser( $data ){
           //if adding to lrs, get lrs title, otherwise use the site name
           isset($lrs) ? $title = 'the ' . $lrs->title . ' LRS' : $title = \Site::first()->name . '\'s Learning Locker';
           //set data to use in email
-          $set_data = array('token'          => User::setEmailToken( $user, $user->email ), 
+          $token = User::setEmailToken( $user, $user->email );
+          $tokens[] = ['email' => $user->email, 'url' => \URL::to('email/invite', array($token))];
+          $set_data = array('token'          => $token, 
                             'custom_message' => $data['message'],
                             'title'          => $title,
                             'sender'         => \Auth::user());
@@ -120,6 +123,8 @@ public static function inviteUser( $data ){
       }
 
     }
+
+    return $tokens;
     
   }
 
diff --git a/app/routes.php b/app/routes.php
@@ -289,6 +289,10 @@
   'before' => 'csrf',
   'uses'   => 'PasswordController@addPassword'
 ));
+Route::get('users/{id}/reset/password', array(
+  'as'     => 'users.resetpassword',
+  'uses'   => 'UserController@resetPassword'
+));
 
 /*
 |------------------------------------------------------------------
diff --git a/app/start/global.php b/app/start/global.php
@@ -31,7 +31,7 @@
 |
 */
 
-Log::useFiles(storage_path().'/logs/laravel.log');
+Log::useDailyFiles(Locker\Helpers\Helpers::getEnvVar('LOG_FILESTORE'));
 
 /*
 |--------------------------------------------------------------------------
diff --git a/app/views/partials/site/backbone/templates.blade.php b/app/views/partials/site/backbone/templates.blade.php
@@ -86,6 +86,9 @@
   <td class="col-sm-2">
     <%= created_at %>
   </td>
+  <td class="col-sm-2 text-center">
+    <button class="btn btn-danger btn-xs reset" title="{{ Lang::get('site.edit') }}"><i class="icon-refresh"></i></button>
+  </td>
   <td class="col-sm-2 text-center">
     <button class="btn btn-danger btn-xs delete" title="{{ Lang::get('site.delete') }}"><i class="icon-trash"></i></button>
   </td>
@@ -100,6 +103,7 @@
       <th>LRSs</th>
       <th>Role</th>
       <th>Joined</th>
+      <th>Reset Password</th>
       <th class="text-center">Delete</th>
     </tr>
   </thead>
diff --git a/public/assets/js/admin/views/users/UserListView.js b/public/assets/js/admin/views/users/UserListView.js
@@ -21,13 +21,20 @@ define([
     events: {
       'click div.verify': 'verifyUser',
       'click button.delete': 'deleteUser',
+      'click button.reset': 'resetUserPassword',
       'change select.role-select': 'changeRole',
     },
 
     unrender: function() {
       this.remove();
     },
 
+    resetUserPassword: function () {
+      $.get('users/'+this.model.id+'/reset/password', null, function (data) {
+        prompt('Send this URL to '+this.model.get('name')+' so they can reset their password.', data);
+      }.bind(this));
+    },
+
     deleteUser: function() {
       if(confirm(trans('site.sure'))){
         this.model.destroy({});
