Merge branch 'feature/Teleport' into 'develop'

logout

See merge request witel-back-end/crm!33

app/Http/Controllers/HeadquartersDashboard/LoginToProvinceController.php

@@ -20,11 +20,13 @@ class LoginToProvinceController extends Controller
             ->value('ip');
 
         $data = [
-            'user_id' => auth()->user()->id,
+            'user_id' => auth()->user()->username,
             'token' => Hash::make(config('globalVariables.LOGIN_HASH_VALUE')),
             'ip' => $province_ip,
         ];
 
+        auth()->user()->currentAccessToken()->delete();
+
         return $this->successResponse($data);
     }
 }

app/Http/Controllers/ProvinceDashboard/VerifyAuthenticationController.php

@@ -19,7 +19,7 @@ class VerifyAuthenticationController extends Controller
             return $this->errorResponse('Invalid token');
         }
 
-        $user = User::query()->findOrFail($request->user_id);
+        $user = User::query()->firstWhere('username', '=', $request->user_id);
 
         $token = $user->createToken("{$user->username}", ['*'], now()->addWeek())->plainTextToken;
 

app/Models/Cdr.php

@@ -2,9 +2,18 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Storage;
 
 class Cdr extends Model
 {
-    protected $table = 'cdr';
+    protected $table = 'asteriskcdrdb.cdr';
+
+    protected function recordingfile(): Attribute
+    {
+        return Attribute::make(
+            get: fn($value) => $value == null ? null : url('/') . 'recordingfiles/' . $value
+        );
+    }
 }