Merge pull request #87 from RedRoundRobin/feature/backendFixes

Feature/backend fixes
RedRoundRobin · May 9, 2020 · c9c34ce · c9c34ce
2 parents 5b463b0 + 5af856f
commit c9c34ce
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
@@ -72,9 +72,9 @@ public function index()
      */
     public function show($deviceId)
     {
-        $device = $this->deviceProvider->find($deviceId) ?? [];
-        $sensors = $this->sensorProvider->findAllFromDevice($device->deviceId) ?? [];
-        $gateway = $this->gatewayProvider->findAllFromDevice($device->deviceId)[0] ?? [];
+        $device = $this->deviceProvider->find($deviceId);
+        $sensors = $this->sensorProvider->findAllFromDevice($device->deviceId);
+        $gateway = $this->gatewayProvider->findAllFromDevice($device->deviceId)[0];
         return view('devices.show', compact(['device', 'sensors', 'gateway']));
     }
 

diff --git a/app/Http/Controllers/GatewayController.php b/app/Http/Controllers/GatewayController.php
@@ -80,7 +80,7 @@ public function edit($gateway)
     public function store()
     {
         $data = request()->validate([
-            'name' => 'required|string'
+            'name' => 'required|string|regex:/(gw_)([A-Za-z0-9_-]+){1,27}/'
         ]);
         return $this->gatewayProvider->store(json_encode($data)) ?
             redirect(route('gateways.index'))->withErrors(['GoodCreate' => 'Gateway creato con successo']) :
@@ -90,7 +90,7 @@ public function store()
     public function update($gatewayId)
     {
         $data = request()->validate([
-            'name' => 'required|string'
+            'name' => 'required|string|regex:/(gw_)([A-Za-z0-9_-]+){1,27}/'
         ]);
         return $this->gatewayProvider->update($gatewayId, json_encode($data)) ?
             redirect(route('gateways.index'))->withErrors(['GoodUpdate' => 'Gateway aggiornato con successo']) :

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -189,7 +189,8 @@ public function destroy($userId)
     public function restore($userId)
     {
         $user = $this->provider->retrieveById($userId);
-        return $this->provider->update($user->getAuthIdentifier(), '{"deleted":false}') ?
+        $data['deleted'] = false;
+        return $this->provider->update($user->getAuthIdentifier(), $data) ?
             redirect(route('users.index'))->withErrors(['GoodRestore' => 'Utente ripristinato con successo']) :
             redirect(route('users.index'))->withErrors(['NotRestore' => 'Utente non ripristinato']);
     }

diff --git a/app/Providers/BasicProvider.php b/app/Providers/BasicProvider.php
@@ -19,6 +19,8 @@ protected function isExpired(RequestException $e)
             session()->invalidate();
             session()->flush();
             return redirect(route('login'));
+        } elseif ($e->getCode() != 401 || $e->getCode() == 0) {
+            ($e->getCode()) ? abort($e->getCode()) : abort(409);
         }
     }
 

diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php
@@ -98,32 +98,33 @@
                                     @method('PUT')
                                 </form>
                             @endcan
-                        @endif
-                        @if($user->deleted)
-                            <!-- TODO - non previsto dal AdR, ma se c'è anche nelle API manteniamolo e lo aggiungiamo a mano -->
-                            <a class="btn btn-success btn-icon-split" href="{{ route('users.restore', ['userId' => $user->userId ]) }}"
-                               onclick="event.preventDefault(); document.getElementById('restore-form-{{$user->userId}}').submit();">
+                            @if($user->deleted )
+                                <a class="btn btn-success btn-icon-split" href="{{ route('users.restore', ['userId' => $user->userId ]) }}"
+                                   onclick="event.preventDefault(); document.getElementById('restore-form-{{$user->userId}}').submit();">
                                 <span class="icon text-white-50">
                                   <span class="fas fa-user-check"></span>
                                 </span>
-                                <span class="text">Ripristina</span>
-                            </a>
-                            <form id="restore-form-{{$user->userId}}" action="{{ route('users.restore', ['userId' => $user->userId ]) }}" method="POST" style="display: none;">
-                                @csrf
-                                @method('PUT')
-                            </form>
-                        @else
-                            <a class="btn btn-danger btn-icon-split" href="{{ route('users.destroy', ['userId' => $user->userId ]) }}"
-                               onclick="event.preventDefault(); document.getElementById('delete-form-{{$user->userId}}').submit();">
+                                    <span class="text">Ripristina</span>
+                                </a>
+                                <form id="restore-form-{{$user->userId}}" action="{{ route('users.restore', ['userId' => $user->userId ]) }}" method="POST" style="display: none;">
+                                    @csrf
+                                    @method('PUT')
+                                </form>
+                            @else
+                                <a class="btn btn-danger btn-icon-split" href="{{ route('users.destroy', ['userId' => $user->userId ]) }}"
+                                   onclick="event.preventDefault(); document.getElementById('delete-form-{{$user->userId}}').submit();">
                                 <span class="icon text-white-50">
                                   <span class="fas fa-user-times"></span>
                                 </span>
-                                <span class="text">Disattiva utente</span>
-                            </a>
-                            <form id="delete-form-{{$user->userId}}" action="{{ route('users.destroy', ['userId' => $user->userId ]) }}" method="POST" style="display: none;">
-                                @csrf
-                                @method('DELETE')
-                            </form>
+                                    <span class="text">Disattiva utente</span>
+                                </a>
+                                <form id="delete-form-{{$user->userId}}" action="{{ route('users.destroy', ['userId' => $user->userId ]) }}" method="POST" style="display: none;">
+                                    @csrf
+                                    @method('DELETE')
+                                </form>
+                            @endif
+                        @else
+                            Non ci sono opzioni disponibili
                         @endif
                     </div>
                 </div>