Merge pull request #1075 from iceljc/master

fix user permission

Author: iceljc

src/Infrastructure/BotSharp.OpenAPI/Controllers/InstructModeController.cs

@@ -137,7 +137,7 @@ public async Task<string> MultiModalCompletion([FromBody] MultiModalFileRequest
         }
         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 async Task<MultiModalViewModel> MultiModalCompletion([FromForm] IEnumerab
         {
             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 async Task<MultiModalViewModel> MultiModalCompletion([FromForm] IEnumerab
         }
         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 async Task<PdfCompletionViewModel> PdfCompletion([FromForm] IEnumerable<I
         {
             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 async Task<PdfCompletionViewModel> PdfCompletion([FromForm] IEnumerable<I
         }
         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 async Task<SpeechToTextViewModel> SpeechToText(IFormFile file, [FromForm]
         }
         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;

src/Infrastructure/BotSharp.OpenAPI/Controllers/UserController.cs

@@ -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 async Task<UserViewModel> GetMyUserProfile()
                 Phone = identiy.Phone,
             });
         }
+
+        if (user != null)
+        {
+            var auth = await _userService.GetUserAuthorizations();
+            user.Permissions = auth?.Permissions ?? [];
+        }
+
         return UserViewModel.FromUser(user);
     }