Sprint end pull request

LICENSE.txt

@@ -0,0 +1,30 @@
+Font license info
+
+
+## Font Awesome
+
+   Copyright (C) 2016 by Dave Gandy
+
+   Author:    Dave Gandy
+   License:   SIL ()
+   Homepage:  http://fortawesome.github.com/Font-Awesome/
+
+
+## Elusive
+
+   Copyright (C) 2013 by Aristeides Stathopoulos
+
+   Author:    Aristeides Stathopoulos
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://aristeides.com/
+
+
+## Entypo
+
+   Copyright (C) 2012 by Daniel Bruce
+
+   Author:    Daniel Bruce
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://www.entypo.com
+
+

README.md

@@ -11,16 +11,21 @@ A more detailed description is available in the Requirements Document under the
 
 Follow the instructions in the [Laravel documentation](https://laravel.com/docs/5.6/installation) to install required dependencies and the Laravel package itself.
 
-Clone the repository and create your own `.env` file by copying `.env.example` and providing necessary data. Please provide Evidencio API key here as well. Then run these commands inside the repository:
+Clone the repository and create your own `.env` file by copying `.env.example` and providing necessary data. Please provide Evidencio API key here as well and ensure that you have your database set up correctly. Then run this command inside the repository:
 
-    composer install
-    php artisan key:generate
+    ./install.sh
 
-To create the database structure please run the following command:
+You may need to run some of the commands in the installation script if there's a new migration or dependency.
 
-    php artisan migrate
+To enable the task scheduler, add the following cron entry:
 
-You will also need to run it every time there is a new database migration available.
+    * * * * * php /path-to-your-project/artisan schedule:run >> /dev/null 2>&1
+
+You can add this for example by running:
+
+    crontab -e
+
+and saving your file there
 
 ### How to run
 

app/Console/Kernel.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Carbon;
+use App\User;
 
 class Kernel extends ConsoleKernel
 {
@@ -24,8 +26,11 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+
+        // Remove accounts with unverified e-mail address after 24hrs
+        $schedule->call(function() {
+            \App\User::where('created_at','<=',Carbon::now()->subdays(1))->where('email_verified','is','false')->delete();
+        })->hourly();
     }
 
     /**

app/Field.php

@@ -24,6 +24,8 @@
  */
 class Field extends Model
 {
+    protected $touches = ['inputSteps'];
+
     public $timestamps = false;
 
     protected $fillable = [
@@ -40,10 +42,12 @@ public function options()
 
     /**
      * Input steps that have this field
+     * @property int order defines index of a field in a step by which it should
+     * be ordered
      */
     public function inputSteps()
     {
-        return $this->belongsToMany('App\Step','field_in_input_steps','field_id','input_step_id');
+        return $this->belongsToMany('App\Step','field_in_input_steps','field_id','input_step_id')->withPivot("order");
     }
 
     public function usedInRunsInSteps()

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -20,12 +22,7 @@ class LoginController extends Controller
 
     use AuthenticatesUsers;
 
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/designer';
+
 
     /**
      * Create a new controller instance.
@@ -36,4 +33,38 @@ public function __construct()
     {
         $this->middleware('guest')->except('logout');
     }
+
+    /**
+     * Function fired after user has been authenticated.
+     *
+     * @param Illuminate\Http\Request $request
+     * @param App\User $user
+     * @return Illuminate\Http\RedirectResponse
+     */
+    public function authenticated(Request $request, $user)
+    {
+        if (!$user->email_verified)
+        {
+            auth()->logout();
+            return back()->with('warning', _("You need to confirm your account. We have sent you an activation code, please check your email."));
+        }
+        return redirect()->intended($this->redirectPath());
+    }
+
+    /**
+     * Specified where to redirect users after login.
+     *
+     * @return string redirection url
+     */
+    protected function redirectTo()
+    {
+        if(Gate::allows('view-designer'))
+        {
+            return route('myworkflows');
+        }
+        else
+        {
+            return route('notverified');
+        }
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -3,10 +3,13 @@
 namespace App\Http\Controllers\Auth;
 
 use App\User;
+use App\Mail\VerifyMail;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Http\Request;
 
 class RegisterController extends Controller
 {
@@ -28,7 +31,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo;
 
     /**
      * Create a new controller instance.
@@ -37,9 +40,57 @@ class RegisterController extends Controller
      */
     public function __construct()
     {
+        $this->redirectTo = route('notverified');
         $this->middleware('guest');
     }
 
+    /**
+     * Function called just after registration
+     *
+     * @param Illuminate\Http\Request $request
+     * @param App\User $user
+     * @return Illuminate\Http\RedirectResponse
+     */
+    protected function registered(Request $request, $user)
+    {
+        $this->guard()->logout();
+        return redirect()->route("login")->with('status', _("We sent you an activation code. Check your email and click on the link to verify."));
+    }
+
+
+    /**
+     * Verify users when they provide a link containing the token they received
+     * by email
+     *
+     * @param string $token
+     * @return Illuminate\Http\RedirectResponse
+     */
+    public function verifyUser($token)
+    {
+        $user = User::where('email_token', $token)->first();
+        if(isset($user))
+        {
+            if(!$user->email_verified)
+            {
+                // We don't remove the token to be able to show information that
+                // the e-mail has already been verified.
+                $user->email_verified = true;
+                $user->save();
+                $status = _("Your e-mail is verified, you can now log in!");
+            }
+            else
+            {
+                $status = _("Your e-mail is already verified, you can now log in!");
+            }
+        }
+        else
+        {
+            return redirect()->route("login")->with('warning',_("Sorry your email cannot be identified!"));
+        }
+
+        return redirect()->route("login")->with('status',$status);
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *
@@ -48,11 +99,18 @@ public function __construct()
      */
     protected function validator(array $data)
     {
+
         return Validator::make($data, [
-            'name' => 'required|string|max:255',
-            'first_name' => 'required|string|max:30',
-            'last_name' => 'required|string|max:30',
+            'first_name' => 'required|string|max:255',
+            'last_name' => 'required|string|max:255',
+            'photo' => 'nullable|file|image|max:300',
+            'academic_degree' => 'nullable|string|max:30',
+            'big_code' => 'nullable|integer|digits:11',
+            'bio' => 'nullable|string|max:5000',
+            'organisation' => 'nullable|string|max:255',
             'email' => 'required|string|email|max:255|unique:users',
+            'file' => 'nullable|array|max:5',
+            'file.*' => 'nullable|mimes:pdf|max:1000',
             'password' => 'required|string|min:6|confirmed',
         ]);
     }
@@ -65,13 +123,33 @@ protected function validator(array $data)
      */
     protected function create(array $data)
     {
-        return User::create([
-            'name' => $data['name'],
+        $user = User::create([
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],
+            // TODO photo, language
             'language_code' => 'en',
+            'academic_degree' => $data['academic_degree'],
+            'big_code' => $data['big_code'],
+            'bio' => $data['bio'],
+            'organisation' => $data['organisation'],
             'email' => $data['email'],
-            'password' => Hash::make($data['password'])
+            'password' => Hash::make($data['password']),
+            'email_token' => bin2hex(openssl_random_pseudo_bytes(16)),
         ]);
+
+        if(array_key_exists('file',$data))
+        foreach($data['file'] as $file)
+        {
+            $path = $file->store('documents');
+
+            $user->registrationDocuments()->create([
+                'name' => $file->getClientOriginalName(),
+                'url' => $path
+            ]);
+        }
+
+        Mail::to($user)->queue(new VerifyMail($user));
+
+        return $user;
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo;
 
     /**
      * Create a new controller instance.
@@ -34,6 +34,7 @@ class ResetPasswordController extends Controller
      */
     public function __construct()
     {
+        $redirectTo = route("myworkflows");
         $this->middleware('guest');
     }
 }