Lineblocs · nadirhamid · Jun 10, 2026 · Jun 9, 2026 · Jun 10, 2026 · Jun 10, 2026
diff --git a/app/app/Enums/WorkspaceUserStatus.php b/app/app/Enums/WorkspaceUserStatus.php
@@ -10,6 +10,8 @@ abstract class WorkspaceUserStatus
     public const ACTIVE = 'ACTIVE';
     public const INVITED = 'INVITED';
     public const TERMINATED = 'TERMINATED';
+    public const DEACTIVATED = 'DEACTIVATED';
+
 
     /**
      * Optional: Helper to get all values for validation
@@ -20,6 +22,7 @@ public static function all(): array
             self::ACTIVE,
             self::INVITED,
             self::TERMINATED,
+            self::DEACTIVATED,
         ];
     }
 }
diff --git a/app/app/Helpers/MainHelper.php b/app/app/Helpers/MainHelper.php
@@ -781,13 +781,14 @@ public static function sortAlphabet(&$items, $key) {
         return strcmp(strtolower($a[$key]), strtolower($b[$key]));
       });
     }
-    public static function createWorkspaceLoginResult($token, $user, $workspace){
+    public static function createWorkspaceLoginResult($token, $user, $workspace, $availableWorkspaces = []){
         $result = [
             'token' => MainHelper::createJWTPayload($token),
             'workspace' => $workspace->toArrayWithRoles($user),
             'enable_2fa' => $user->enable_2fa,
             'isAdmin' => FALSE,
-            'adminWorkspaceToken' => ''
+            'adminWorkspaceToken' => '',
+            'availableWorkspaces' => $availableWorkspaces
             //'expire_in' => \Carbon\Carbon::now()->addMinutes(config('jwt.ttl'))->format('Y-m-d H:i:s')
         ];
         if ($user->admin) {

diff --git a/app/app/Helpers/WorkflowTraits/User/UserWorkflow.php b/app/app/Helpers/WorkflowTraits/User/UserWorkflow.php
@@ -16,7 +16,7 @@
 use \App\Helpers\WorkspaceHelper;
 use \App\Helpers\EmailHelper;
 use \App\Helpers\WorkflowTraits\User\UserWorkflow;
-use \App\Enum\WorkspaceUserStatus;
+use \App\Enums\WorkspaceUserStatus;
 use App\WorkspaceUser;
 use App\WorkspaceInvite;
 use DB;
@@ -50,7 +50,6 @@ public function createInvite($workspaceUser) {
     private function sendInvite($invite, $newUser, $workspaceUser, $workspace) {
         $mail = Config::get("mail");
         $mailData = compact('newUser', 'workspace');
-        $invite = $this->createInvite($workspaceUser);
         //$hash = $workspaceUser->createJoinHash();
         $link = MainHelper::createPortalLink("/#/join-workspace/". $invite->hash);
         $mailData['link'] =  $link;
@@ -89,10 +88,14 @@ public function addUser(Request $request)
         }
 
         $resource = WorkspaceUser::create($attrs);
+
         UserEmailOption::create([
             'user_id' =>$resource->id,
         ]);
         $invite = $this->createInvite($resource);
+        $resource->update([
+            'hash' => $invite->hash
+        ]);
         $this->sendInvite($invite, $reqUser,$resource, $workspace);
         return $this->response->array($resource->toArray())->withHeader('X-WorkspaceUser-ID', $resource->public_id);
     }
@@ -168,6 +171,52 @@ public function terminateUser(Request $request, $userId)
         return $this->response->noContent();
     }
 
+
+    public function deactivateUser(Request $request, $userId)
+    {
+        $data = $request->json()->all();
+        $user = $this->getUser($request);
+        $workspaceUser = WorkspaceUser::select(DB::raw("workspaces_users.*, users.email, users.first_name, users.last_name"))->join('users', 'users.id', '=', 'workspaces_users.user_id')->where('workspaces_users.public_id', '=', $userId)->firstOrFail();
+        if (!$this->hasPermissions($request, $workspaceUser, 'manage_users')) {
+            return $this->response->errorForbidden();
+        }
+        $workspaceUser->update([
+            'status' => WorkspaceUserStatus::DEACTIVATED
+        ]);
+
+        $workspace = $this->getWorkspace($request);
+        $mailData = compact('user', 'workspace', 'workspaceUser');
+        $subject = "Your account has been deactivated";
+
+        \Log::info("Sending email to workspace user email address: " . $workspaceUser->email);
+        EmailHelper::sendEmail($subject, $workspaceUser->email, 'deactivated_account', $mailData);
+
+        return $this->response->noContent();
+    }
+
+
+    public function reactivateUser(Request $request, $userId)
+    {
+        $data = $request->json()->all();
+        $user = $this->getUser($request);
+        $workspaceUser = WorkspaceUser::select(DB::raw("workspaces_users.*, users.email, users.first_name, users.last_name"))->join('users', 'users.id', '=', 'workspaces_users.user_id')->where('workspaces_users.public_id', '=', $userId)->firstOrFail();
+        if (!$this->hasPermissions($request, $workspaceUser, 'manage_users')) {
+            return $this->response->errorForbidden();
+        }
+        $workspaceUser->update([
+            'status' => WorkspaceUserStatus::ACTIVE
+        ]);
+
+        $workspace = $this->getWorkspace($request);
+        $mailData = compact('user', 'workspace', 'workspaceUser');
+        $subject = "Your account has been reactivated";
+
+        \Log::info("Sending email to workspace user email address: " . $workspaceUser->email);
+        EmailHelper::sendEmail($subject, $workspaceUser->email, 'reactivated_account', $mailData);
+
+        return $this->response->noContent();
+    }
+
     public function resendInvite(Request $request, $userId)
     {
         $data = $request->json()->all();
@@ -181,8 +230,31 @@ public function resendInvite(Request $request, $userId)
 
         WorkspaceInvite::where("workspace_user_id", $resource->id)->update(['valid' => FALSE]);
         $invite = $this->createInvite($resource);
-        //invalidate current invite if needed
+        $resource->update([
+            'hash' => $invite->hash
+        ]);
+
         $this->sendInvite($invite, $reqUser,$resource, $workspace);
         return $this->response->noContent();
     }
+
+    public function changeAccountType(Request $request, $userId)
+    {
+        $data = $request->json()->all();
+        $user = $this->getUser($request);
+        $workspace = $this->getWorkspace($request);
+        $resource = WorkspaceUser::where('public_id', $userId)->firstOrFail();
+        if (!WorkspaceHelper::canPerformAction($user, $workspace, 'manage_users')) {
+            return $this->response->errorForbidden();
+        }
+
+        if (!empty($data['assigned_role_id'])) {
+            $resource->update([
+                'assigned_role_id' => $data['assigned_role_id']
+            ]);
+        }
+
+        return $this->response->array($resource->toArray());
+    }
+
 }
diff --git a/app/app/Http/Controllers/JWT/AuthenticateController.php b/app/app/Http/Controllers/JWT/AuthenticateController.php
@@ -105,6 +105,17 @@ public function authenticate(Request $request)
         $currentUser = Auth::user();
 
         $workspace = $this->getRequestedWorkspace($request, $currentUser);
+        $availableWorkspaces = Workspace::join('workspaces_users', 'workspaces_users.workspace_id', '=', 'workspaces.id')
+            ->where('workspaces_users.user_id', $currentUser->id)
+            ->select('workspaces.id', 'workspaces.name')
+            ->get()
+            ->map(function ($workspace) {
+                return [
+                    'id' => $workspace->id,
+                    'name' => $workspace->name
+                ];
+            })
+            ->toArray();
         $workspaceUser = WorkspaceUser::select(array('workspaces_users.*'));
         $workspaceUser->where('workspaces_users.user_id', $currentUser->id);
         if (!empty($workspace)) {
@@ -167,9 +178,39 @@ public function authenticate(Request $request)
             return $this->response->array($result);
         }
 
-        $result = MainHelper::createWorkspaceLoginResult($token, $currentUser, $workspace);
+        $result = MainHelper::createWorkspaceLoginResult($token, $currentUser, $workspace, $availableWorkspaces);
         return $this->response->array($result);
     }
+
+    public function requestWorkspaceToken(Request $request)
+    {
+        $currentUser = Auth::user();
+        $workspaceId = $request->get('workspace_id');
+        $workspace = Workspace::find($workspaceId);
+        if (empty($workspace)) {
+            return $this->errorInternal($request, 'No workspace found for user.');
+        }
+
+        if (!$token = JWTAuth::fromUser($currentUser)) {
+            return response()->json(['error' => 'could not create token'], 401);
+        }
+
+        $availableWorkspaces = Workspace::join('workspaces_users', 'workspaces_users.workspace_id', '=', 'workspaces.id')
+            ->where('workspaces_users.user_id', $currentUser->id)
+            ->select('workspaces.id', 'workspaces.name')
+            ->get()
+            ->map(function ($workspace) {
+                return [
+                    'id' => $workspace->id,
+                    'name' => $workspace->name
+                ];
+            })
+            ->toArray();
+
+        $result = MainHelper::createWorkspaceLoginResult($token, $currentUser, $workspace, $availableWorkspaces);
+        return $this->response->array($result);
+    }
+
     public function heartbeat(Request $request)
     {
       return $this->response->noContent();

diff --git a/app/app/Http/routes.php b/app/app/Http/routes.php
@@ -533,6 +533,7 @@
       $api->post('authenticate', '\App\Http\Controllers\JWT\AuthenticateController@authenticate');
       $api->post('publicAuthenticate', '\App\Http\Controllers\JWT\AuthenticateController@authenticatePublic');
       $api->get('heartbeat', '\App\Http\Controllers\JWT\AuthenticateController@heartbeat');
+      $api->get('requestWorkspaceToken', '\App\Http\Controllers\JWT\AuthenticateController@requestWorkspaceToken');
     });
 
     $api->group([ 'prefix' => 'account'], function($api) {
@@ -583,6 +584,7 @@
     $api->get('getCallRoutingTemplates', '\App\Http\Controllers\MergedController@getCallRoutingTemplates');
     $api->get('getWorkspaceTokens', '\App\Http\Controllers\MergedController@getWorkspaceTokens');
     $api->get('refreshWorkspaceTokens', '\App\Http\Controllers\MergedController@refreshWorkspaceTokens');
+    $api->post('requestWorkspaceToken', '\App\Http\Controllers\MergedController@requestWorkspaceToken');
     $api->get('getConfig', '\App\Http\Controllers\ConfigController@getConfig');
     $api->get('dashboard', '\App\Http\Controllers\MergedController@dashboard');
     $api->get('feed', '\App\Http\Controllers\MergedController@feed');
@@ -824,6 +826,11 @@
         $api->post("/", "WorkspaceUserController@addUser");
         //$api->delete("/{userId}", "WorkspaceUserController@deleteUser");
         $api->post("/{userId}/terminate", "WorkspaceUserController@terminateUser");
+        $api->post("/{userId}/deactivate", "WorkspaceUserController@deactivateUser");
+        $api->post("/{userId}/reactivate", "WorkspaceUserController@reactivateUser");
+
+        $api->post("/{userId}/changeAccountType", "WorkspaceUserController@changeAccountType");
+
         $api->post("/{userId}", "WorkspaceUserController@updateUser");
         $api->put("/{userId}", "WorkspaceUserController@updateUser");
         $api->get("/{userId}", "WorkspaceUserController@userData");

diff --git a/app/resources/views/emails/deactivated_account.blade.php b/app/resources/views/emails/deactivated_account.blade.php
@@ -0,0 +1,43 @@
+@extends('emails.layouts.account_invite')
+@section('title') About :: @parent @endsection
+@section('content')
+        <tr>
+            <td valign="top" class="mobilespacer">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td width="100" class="hide">&nbsp;</td>
+                        <td class="mobilespacer2">
+                            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                  <td valign="top" height="70" class="vspacer40" style="mso-line-height-rule:exactly; font-size:1px; line-height:1px;">&nbsp;</td>
+                                </tr>
+
+                                <tr>
+                                    <td align="left" valign="top" style="font-family:Roboto, Arial, sans-serif;font-size:28px;line-height:36px;color:#0a1247;font-weight: bold; text-align: left;">Hello {{$workspaceUser->first_name}} {{$workspaceUser->last_name}}, your account has been deactivated
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td valign="top" height="20" style="mso-line-height-rule:exactly;font-size:1px;line-height:20px;">&nbsp;</td>
+                                </tr>
+
+                                <tr>
+                                    <td align="left" valign="top" style="font-family:'Roboto', Arial, Helvetica, sans-serif; font-size:14px;line-height:23px;color:#252f5a; text-align: left;">
+Your account in workspace {{$workspace->name}} has been deactivated. If you believe this was done in error, please contact your workspace administrator.<br /><br />
+                                    </td>
+                                </tr>  
+                                 <tr>
+                                    <td style="line-height: 30px; mso-line-height-rule: exactly; font-size: 0;" height="30">&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td style="line-height: 20px; mso-line-height-rule: exactly; font-size: 0;" height="20">&nbsp;</td>
+                                </tr> 
+
+                            </table>
+                        </td>
+                        <td width="100" class="hide">&nbsp;</td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+
+@endsection
diff --git a/app/resources/views/emails/reactivated_account.blade.php b/app/resources/views/emails/reactivated_account.blade.php
@@ -0,0 +1,43 @@
+@extends('emails.layouts.account_invite')
+@section('title') About :: @parent @endsection
+@section('content')
+        <tr>
+            <td valign="top" class="mobilespacer">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td width="100" class="hide">&nbsp;</td>
+                        <td class="mobilespacer2">
+                            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                <tr>
+                                  <td valign="top" height="70" class="vspacer40" style="mso-line-height-rule:exactly; font-size:1px; line-height:1px;">&nbsp;</td>
+                                </tr>
+
+                                <tr>
+                                    <td align="left" valign="top" style="font-family:Roboto, Arial, sans-serif;font-size:28px;line-height:36px;color:#0a1247;font-weight: bold; text-align: left;">Hello {{$workspaceUser->first_name}} {{$workspaceUser->last_name}}, your account has been reactivated
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td valign="top" height="20" style="mso-line-height-rule:exactly;font-size:1px;line-height:20px;">&nbsp;</td>
+                                </tr>
+
+                                <tr>
+                                    <td align="left" valign="top" style="font-family:'Roboto', Arial, Helvetica, sans-serif; font-size:14px;line-height:23px;color:#252f5a; text-align: left;">
+Your account in workspace {{$workspace->name}} has been reactivated. You can now access the workspace again. If you have any questions, please contact your workspace administrator.<br /><br />
+                                    </td>
+                                </tr>  
+                                 <tr>
+                                    <td style="line-height: 30px; mso-line-height-rule: exactly; font-size: 0;" height="30">&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td style="line-height: 20px; mso-line-height-rule: exactly; font-size: 0;" height="20">&nbsp;</td>
+                                </tr> 
+
+                            </table>
+                        </td>
+                        <td width="100" class="hide">&nbsp;</td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+
+@endsection