Merge branch 'master' into role-status-log

# Conflicts:
#	app/Providers/RepositoryServiceProvider.php

Author: dpslwk

Vagrantfile

@@ -10,14 +10,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "debian/contrib-jessie64"
+  config.vm.box = "NottingHack/hms2"
   config.vm.hostname = "hmsdev.nottingtest.org.uk"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/bootstrap.sh"
+  
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ['modifyvm', :id, '--memory', '2048']
+    vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
+    vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
+  end
+
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/nginx.sh"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/database.sh"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/php.sh"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/kerberos.sh"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/node.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/laravel.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/mix.sh", privileged: false
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/finish.sh"

app/HMS/Entities/User.php

@@ -3,6 +3,7 @@
 namespace HMS\Entities;
 
 use HMS\Entities\Banking\Account;
+use Laravel\Passport\HasApiTokens;
 use HMS\Traits\Entities\SoftDeletable;
 use HMS\Traits\Entities\Timestampable;
 use LaravelDoctrine\ACL\Roles\HasRoles;
@@ -19,7 +20,7 @@
 
 class User implements AuthenticatableContract, CanResetPasswordContract, HasRoleContract, HasPermissionsContract, AuthorizableContract
 {
-    use CanResetPassword, Notifiable, HasRoles, HasPermissions, SoftDeletable, Timestampable, Authorizable;
+    use CanResetPassword, Notifiable, HasRoles, HasPermissions, SoftDeletable, Timestampable, Authorizable, HasApiTokens;
 
     const MIN_PASSWORD_LENGTH = 3;
 
@@ -247,4 +248,13 @@ public function setAccount(?Account $account): User
 
         return $this;
     }
+
+    /**
+     * use by passport.
+     * @return int
+     */
+    public function getKey()
+    {
+        return $this->getAuthIdentifier();
+    }
 }

app/Http/Kernel.php

@@ -34,6 +34,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \App\Http\Middleware\SubstituteEntityBindings::class,
+            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
         ],
 
         'api' => [

app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use HMS\Auth\PasswordStore;
+use Laravel\Passport\Passport;
 use Faker\Factory as FakerFactory;
 use HMS\Auth\PasswordStoreManager;
 use Faker\Generator as FakerGenerator;
@@ -36,5 +37,8 @@ public function register()
         $this->app->singleton(FakerGenerator::class, function () {
             return FakerFactory::create('en_GB');
         });
+
+        // Don't need the passport migrations as we have custom laravel-doctrine ones.
+        Passport::ignoreMigrations();
     }
 }

app/Providers/AuthServiceProvider.php

@@ -2,8 +2,10 @@
 
 namespace App\Providers;
 
+use Carbon\Carbon;
 use HMS\Auth\PasswordStore;
 use HMS\Auth\HmsUserProvider;
+use Laravel\Passport\Passport;
 use Illuminate\Support\Facades\Auth;
 use Doctrine\ORM\EntityManagerInterface;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -31,5 +33,10 @@ public function boot(EntityManagerInterface $em, PasswordStore $passwordStore)
         Auth::provider('hms', function ($app, array $config) use ($em, $passwordStore) {
             return new HmsUserProvider($app['hash'], $em, $config['model'], $passwordStore);
         });
+
+        // Passport bits.
+        Passport::routes();
+        Passport::tokensExpireIn(Carbon::now()->addDays(env('PASSPORT_TOKEN_EXPIRE_DAYS', 15)));
+        Passport::refreshTokensExpireIn(Carbon::now()->addDays(env('PASSPORT_REFRESH_TOKEN_EXPIRE_DAYS', 30)));
     }
 }

app/Providers/RepositoryServiceProvider.php

@@ -2,34 +2,10 @@
 
 namespace App\Providers;
 
-use HMS\Entities\Link;
-use HMS\Entities\Meta;
-use HMS\Entities\Role;
-use HMS\Entities\User;
-use HMS\Entities\Invite;
-use HMS\Entities\Profile;
-use HMS\Entities\RoleUpdate;
-use HMS\Entities\Banking\Account;
-use HMS\Repositories\LinkRepository;
-use HMS\Repositories\MetaRepository;
-use HMS\Repositories\RoleRepository;
-use HMS\Repositories\UserRepository;
-use HMS\Repositories\InviteRepository;
-use HMS\Repositories\ProfileRepository;
 use Illuminate\Support\ServiceProvider;
 use HMS\Repositories\PermissionRepository;
-use HMS\Repositories\RoleUpdateRepository;
-use HMS\Repositories\Banking\AccountRepository;
 use LaravelDoctrine\ACL\Permissions\Permission;
-use HMS\Repositories\Doctrine\DoctrineLinkRepository;
-use HMS\Repositories\Doctrine\DoctrineMetaRepository;
-use HMS\Repositories\Doctrine\DoctrineRoleRepository;
-use HMS\Repositories\Doctrine\DoctrineUserRepository;
-use HMS\Repositories\Doctrine\DoctrineInviteRepository;
-use HMS\Repositories\Doctrine\DoctrineProfileRepository;
 use HMS\Repositories\Doctrine\DoctrinePermissionRepository;
-use HMS\Repositories\Doctrine\DoctrineRoleUpdateRepository;
-use HMS\Repositories\Banking\Doctrine\DoctrineAccountRepository;
 
 class RepositoryServiceProvider extends ServiceProvider
 {
@@ -50,40 +26,23 @@ public function boot()
      */
     public function register()
     {
-        $this->app->singleton(LinkRepository::class, function ($app) {
-            return new DoctrineLinkRepository($app['em'], $app['em']->getClassMetaData(Link::class));
-        });
-
-        $this->app->singleton(MetaRepository::class, function ($app) {
-            return new DoctrineMetaRepository($app['em'], $app['em']->getClassMetaData(Meta::class));
-        });
-
-        $this->app->singleton(InviteRepository::class, function ($app) {
-            return new DoctrineInviteRepository($app['em'], $app['em']->getClassMetaData(Invite::class));
-        });
-
-        $this->app->singleton(RoleRepository::class, function ($app) {
-            return new DoctrineRoleRepository($app['em'], $app['em']->getClassMetaData(Role::class));
-        });
-
-        $this->app->singleton(UserRepository::class, function ($app) {
-            return new DoctrineUserRepository($app['em'], $app['em']->getClassMetaData(User::class));
-        });
-
-        $this->app->singleton(ProfileRepository::class, function ($app) {
-            return new DoctrineProfileRepository($app['em'], $app['em']->getClassMetaData(Profile::class));
-        });
-
+        foreach (config('repositories.repositories') as $repository) {
+            $entity = config('repositories.entity_namespace') . '\\' . $repository;
+            $interface = config('repositories.repositoriy_namespace') . '\\' . $repository . 'Repository';
+            $implmentation = config('repositories.repositoriy_namespace') . '\\' .
+                (strpos($repository, '\\') ? explode('\\', $repository)[0] . '\\' : '') .
+                'Doctrine\\Doctrine' .
+                (strpos($repository, '\\') ? explode('\\', $repository)[1] : $repository) .
+                'Repository';
+
+            $this->app->singleton($interface, function ($app) use ($implmentation, $entity) {
+                return new $implmentation($app['em'], $app['em']->getClassMetaData($entity));
+            });
+        }
+
+        // Special case so do this one by hand
         $this->app->singleton(PermissionRepository::class, function ($app) {
             return new DoctrinePermissionRepository($app['em'], $app['em']->getClassMetaData(Permission::class));
         });
-
-        $this->app->singleton(AccountRepository::class, function ($app) {
-            return new DoctrineAccountRepository($app['em'], $app['em']->getClassMetaData(Account::class));
-        });
-
-        $this->app->singleton(RoleUpdateRepository::class, function ($app) {
-            return new DoctrineRoleUpdateRepository($app['em'], $app['em']->getClassMetaData(RoleUpdate::class));
-        });
     }
 }

composer.json

@@ -15,6 +15,7 @@
         "laravel-doctrine/migrations": "1.1.*",
         "laravel-doctrine/orm": "1.3.*",
         "laravel/framework": "5.4.*",
+        "laravel/passport": "^2.0",
         "laravel/tinker": "~1.0",
         "spatie/laravel-cookie-consent": "^1.6"
     },