Fix FLEXIAPI-305 Add specific error page for Space Expiration

CHANGELOG.md

@@ -37,6 +37,7 @@ v2.0
 - Fix FLEXIAPI-293 Remove the (long) outdated general documentation
 - Fix FLEXIAPI-224 Add a console script to send Space Expiration emails
 - Fix FLEXIAPI-297 Fix PrId and CallId validations
+- Fix FLEXIAPI-305 Add specific error page for Space Expiration
 
 v1.6
 ----

README.md

@@ -138,7 +138,7 @@ The `POST /api/messages` endpoint allows you to send messages on the SIP network
 
     APP_LINPHONE_DAEMON_UNIX_PATH=/tmp/ld
 
-If you have issues connecting to that socket check the [`systemd restrictions`](#systemd-restrictions) part of this document.
+If you have issues connecting to that socket check the [`systemd restrictions`](INSTALL.md#systemd-restrictions) part of this document.
 
 The socket is located in the `/tmp` directory.
 

flexiapi/app/Http/Middleware/SpaceCheck.php

@@ -26,7 +26,7 @@ class SpaceCheck
             Config::set('app.sip_domain', $space->domain);
 
             if ($request->user() && !$request->user()->superAdmin && $space?->isExpired()) {
-                abort(403, 'The related Space has expired');
+                abort($request->expectsJson() ? 403 : 490, 'The related Space has expired');
             }
 
             // Custom email integration

flexiapi/lang/fr.json

@@ -83,6 +83,7 @@
     "Expired": "Expiré",
     "Export": "Exporter",
     "External Account": "Compte Externe",
+    "Expired Space": "Espace expiré",
     "Features": "Fonctionnalités",
     "Fill to change": "Remplir pour changer",
     "Fill the related columns if you want to add an external account as well": "Remplissez également les colonnes suivantes si vous souhaitez ajouter un compte externe",
@@ -217,5 +218,6 @@
     "You are going to permanently delete your account. Please enter your complete SIP address to confirm.": "Vous allez détruire défitivement votre compte. Veuillez entrer votre addresse SIP complète pour confirmer.",
     "You can now continue your registration process in the application": "Vous pouvez maintenant continuer le processus d'inscription dans l'application",
     "You didn't receive the code?": "Vous n'avez pas reçu le code ?",
-    "Your password was updated properly.": "Votre mot de passe a été mis à jour."
+    "Your password was updated properly.": "Votre mot de passe a été mis à jour.",
+    "Your space has expired. Access to your interface is now disabled, and your users can no longer benefit from the service. To reactivate your space, please contact your account manager.": "Votre espace est arrivé à expiration. L’accès à votre interface est désormais désactivé, et vos utilisateurs ne peuvent plus bénéficier du service. Pour réactiver votre espace, veuillez contacter votre responsable de compte."
 }

flexiapi/resources/views/errors/490.blade.php

@@ -0,0 +1,11 @@
+@extends('layouts.main')
+
+@section('content')
+
+<h2><i class="ph">globe-hemisphere-west</i> {{ __('Expired Space') }}</h2>
+
+<p class="text-center">
+    {{ __('Your space has expired. Access to your interface is now disabled, and your users can no longer benefit from the service. To reactivate your space, please contact your account manager.') }}
+</p>
+
+@endsection