Merge ad7bc04 into 4ec6fd7

app/Http/Middleware/CheckDemoExpiration.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Ushahidi\App\Http\Middleware;
+
+use Closure;
+
+class CheckDemoExpiration
+{
+
+   /**
+    * Handle an incoming request.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @param  \Closure  $next
+    * @param  string|null  $guard
+    * @return mixed
+    */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        $multisite = config('multisite.enabled');
+        $isDemoTier = service('site.config')['tier'] === 'demo';
+        $isNotGet = !$request->isMethod('get');
+
+        if ($multisite && $isNotGet && $isDemoTier) {
+            $now = new DateTime();
+            $expiration_date = strtotime(service('site.config')['expiration_date']);
+            $extension_date = strtotime(service('site.config')['extension_date']);
+
+            if ($expiration_date < $now && (!$extension_date || $extension_date < $now)) {
+                abort(503, 'The demo period for this deployment has expired.');
+            }
+        }
+        return $next($request);
+    }
+}

bootstrap/lumen.php

@@ -69,8 +69,7 @@
     // Customised scope middleware
     'scopes' => Ushahidi\App\Http\Middleware\CheckScopes::class,
     'scope'  => Ushahidi\App\Http\Middleware\CheckForAnyScope::class,
-    //'scopes' => Laravel\Passport\Http\Middleware\CheckScopes::class,
-    //'scope'  => Laravel\Passport\Http\Middleware\CheckForAnyScope::class,
+    'expiration' => Ushahidi\App\Http\Middleware\CheckDemoExpiration::class,
     'signature' => Ushahidi\App\Http\Middleware\SignatureAuth::class,
     'feature' => Ushahidi\App\Http\Middleware\CheckFeature::class,
 ]);

routes/apikeys.php

@@ -1,5 +1,5 @@
 <?php
 
 resource($router, 'apikeys', 'ApiKeysController', [
-    'middleware' => ['auth:api', 'scope:apikeys'],
+    'middleware' => ['auth:api', 'scope:apikeys', 'expiration'],
 ]);

routes/collections.php

@@ -4,7 +4,7 @@
 $router->group([
         'namespace' => 'Collections',
         'prefix' => 'collections',
-        'middleware' => ['scope:collections,sets']
+        'middleware' => ['scope:collections, sets, expiration']
 ], function () use ($router) {
     // Public access
     resource($router, '/', 'CollectionsController', [

routes/config.php

@@ -14,7 +14,7 @@
     $router->options('/', ['uses' => 'ConfigController@indexOptions']);
 
     // Restricted access
-    $router->group(['middleware' => ['auth:api', 'scope:config']], function () use ($router) {
+    $router->group(['middleware' => ['auth:api', 'scope:config', 'expiration']], function () use ($router) {
         $router->put('/{id}', ['uses' => 'ConfigController@update']);
     });
 });

routes/contacts.php

@@ -2,5 +2,5 @@
 
 // Contacts
 resource($router, 'contacts', 'ContactsController', [
-    'middleware' => ['auth:api', 'scope:contacts']
+    'middleware' => ['auth:api', 'scope:contacts', 'expiration']
 ]);

routes/csv.php

@@ -7,7 +7,7 @@
     'prefix' => 'csv'
 ], function () use ($router) {
     resource($router, '/', 'CSVController', [
-        'middleware' => ['auth:api', 'scope:csv']
+        'middleware' => ['auth:api', 'scope:csv', 'expiration']
     ]);
 
     $router->post('/{id}/import', 'CSVImportController@store');

routes/dataproviders.php

@@ -2,7 +2,7 @@
 
 // Data providers
 resource($router, 'dataproviders', 'DataProvidersController', [
-    'middleware' => ['auth:api', 'scope:dataproviders'],
+    'middleware' => ['auth:api', 'scope:dataproviders', 'expiration'],
     'only' => ['index', 'show'],
     'id' => 'id' // Override id to allow non-numeric IDs
 ]);

routes/forms.php

@@ -4,7 +4,7 @@
 $router->group([
     'namespace' => 'Forms',
     'prefix' => 'forms',
-    'middleware' => ['scope:forms']
+    'middleware' => ['scope:forms', 'expiration']
 ], function () use ($router) {
     // Public access
     $router->get('/', 'FormsController@index');

routes/layers.php

@@ -3,7 +3,7 @@
 // Layers
 $router->group([
     'prefix' => 'layers',
-    'middleware' => ['scope:layers']
+    'middleware' => ['scope:layers', 'expiration']
 ], function () use ($router) {
     // Public access
     resource($router, '/', 'LayersController', [

routes/media.php

@@ -3,7 +3,7 @@
 // Media
 $router->group([
     'prefix' => 'media',
-    'middleware' => ['scope:media']
+    'middleware' => ['scope:media', 'expiration']
 ], function () use ($router) {
     // Public access
     $router->get('/', 'MediaController@index');

routes/messages.php

@@ -2,7 +2,7 @@
 
 // Messages
 $router->group([
-    'middleware' => ['auth:api', 'scope:messages'],
+    'middleware' => ['auth:api', 'scope:messages', 'expiration'],
     'prefix' => 'messages'
 ], function () use ($router) {
     $router->get('/', 'MessagesController@index');

routes/notifications.php

@@ -2,5 +2,5 @@
 
 // Notifications
 resource($router, 'notifications', 'NotificationsController', [
-    'middleware' => ['auth:api', 'scope:notifications'],
+    'middleware' => ['auth:api', 'scope:notifications', 'expiration'],
 ]);

routes/permissions.php

@@ -2,6 +2,6 @@
 
 // Permissions
 resource($router, 'permissions', 'PermissionsController', [
-    'middleware' => ['auth:api', 'scope:permissions'],
+    'middleware' => ['auth:api', 'scope:permissions', 'expiration'],
     'only' => ['index', 'show'],
 ]);

routes/posts.php

@@ -4,7 +4,7 @@
 $router->group([
     'namespace' => 'Posts',
     'prefix' => 'posts',
-    'middleware' => ['scope:posts']
+    'middleware' => ['scope:posts', 'expiration']
 ], function () use ($router) {
     // Public access
     $router->get('/', 'PostsController@index');

routes/roles.php

@@ -3,7 +3,7 @@
 // Roles
 $router->group([
     'prefix' => 'roles',
-    'middleware' => ['scope:roles']
+    'middleware' => ['scope:roles', 'expiration']
 ], function () use ($router) {
     // Public access
     resource($router, '/', 'RolesController', [

routes/savedsearches.php

@@ -3,7 +3,7 @@
 // Saved Searches
 $router->group([
     'prefix' => 'savedsearches',
-    'middleware' => ['scope:savedsearches']
+    'middleware' => ['scope:savedsearches', 'expiration']
 ], function () use ($router) {
     // Public access
     resource($router, '/', 'SavedSearchesController', [

routes/tags.php

@@ -3,7 +3,7 @@
 // Tags
 $router->group([
     'prefix' => 'tags',
-    'middleware' => ['scope:tags']
+    'middleware' => ['scope:tags', 'expiration']
 ], function () use ($router) {
     // Public access
     resource($router, '/', 'TagsController', [

routes/users.php

@@ -3,7 +3,7 @@
 // Users
 $router->group([
     'namespace' => 'Users',
-    'middleware' => ['scope:users']
+    'middleware' => ['scope:users', 'expiration']
 ], function () use ($router) {
     // Public access
     resource($router, 'users', 'UsersController', [

routes/webhooks.php

@@ -2,7 +2,7 @@
 
 // Web hooks
 resource($router, 'webhooks', 'WebhooksController', [
-    'middleware' => ['auth:api', 'scope:webhooks']
+    'middleware' => ['auth:api', 'scope:webhooks', 'expiration']
 ]);
 
 // Webhook posts update endpoint