SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1075 from iceljc/master

Browse source 
fix user permission
This commit is contained in:
iceljc 2025-06-12 17:15:22 -05:00 committed by GitHub
parent 36c568efac fa146fd517
commit 8e44bcad4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs
View file

@ -137,7 +137,7 @@ public class InstructModeController : ControllerBase
}
catch (Exception ex)
{
var error = $"Error in reading images. {ex.Message}";
var error = $"Error in reading multi-modal files. {ex.Message}";
_logger.LogError(ex, error);
return error;
}
@ -154,7 +154,8 @@ public class InstructModeController : ControllerBase
{
var fileModels = files.Select(x => new InstructFileModel
{
FileData = FileUtility.BuildFileDataFromFile(x)
FileData = FileUtility.BuildFileDataFromFile(x),
ContentType = x.ContentType
}).ToList();
var fileInstruct = _services.GetRequiredService<IFileInstructService>();
@ -170,7 +171,7 @@ public class InstructModeController : ControllerBase
}
catch (Exception ex)
{
var error = $"Error in reading image upload. {ex.Message}";
var error = $"Error in reading multi-modal files. {ex.Message}";
_logger.LogError(ex, error);
viewModel.Message = error;
return viewModel;
@ -481,7 +482,8 @@ public class InstructModeController : ControllerBase
{
var fileModels = files.Select(x => new InstructFileModel
{
FileData = FileUtility.BuildFileDataFromFile(x)
FileData = FileUtility.BuildFileDataFromFile(x),
ContentType = x.ContentType
}).ToList();
var fileInstruct = _services.GetRequiredService<IFileInstructService>();
@ -497,7 +499,7 @@ public class InstructModeController : ControllerBase
}
catch (Exception ex)
{
var error = $"Error in pdf completion upload. {ex.Message}";
var error = $"Error in pdf completion. {ex.Message}";
_logger.LogError(ex, error);
viewModel.Message = error;
return viewModel;
@ -571,7 +573,7 @@ public class InstructModeController : ControllerBase
}
catch (Exception ex)
{
var error = $"Error in speech-to-text upload. {ex.Message}";
var error = $"Error in speech-to-text. {ex.Message}";
_logger.LogError(ex, error);
viewModel.Message = error;
return viewModel;

8
src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs
View file

@ -1,4 +1,5 @@
using BotSharp.Abstraction.Infrastructures.Attributes;
using BotSharp.Abstraction.Roles;
using BotSharp.Abstraction.Users.Settings;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
@ -105,6 +106,13 @@ public class UserController : ControllerBase
Phone = identiy.Phone,
});
}
if (user != null)
{
var auth = await _userService.GetUserAuthorizations();
user.Permissions = auth?.Permissions ?? [];
}
return UserViewModel.FromUser(user);
}