Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

on .NET MAUI provide message to user if Security Token has not been configured #4631

Merged
merged 1 commit into from
Sep 18, 2024
Merged

on .NET MAUI provide message to user if Security Token has not been configured #4631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions Oqtane.Client/Modules/Controls/FileManager.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,6 @@
}
if (restricted == "")
{
if (!ShowProgress)
{
_uploading = true;
StateHasChanged();
}

try
{
// upload the files
Expand All @@ -374,7 +368,21 @@
if (PageState.Runtime == Shared.Runtime.Hybrid)
{
jwt = await UserService.GetTokenAsync();
if (string.IsNullOrEmpty(jwt))
{
await logger.LogInformation("File Upload Failed From .NET MAUI Due To Missing Security Token. Token Options Must Be Set In User Settings.");
_message = "Security Token Not Specified";
_messagetype = MessageType.Error;
return;
}
}

if (!ShowProgress)
{
_uploading = true;
StateHasChanged();
}

await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken, jwt);

// uploading is asynchronous so we need to poll to determine if uploads are completed
Expand Down
2 changes: 1 addition & 1 deletion Oqtane.Server/Controllers/UserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Linq;
using System.Security.Claims;
using Oqtane.Shared;
using System;
using System.Net;
using Oqtane.Enums;
using Oqtane.Infrastructure;
Expand Down Expand Up @@ -386,6 +385,7 @@ public User Authenticate()
}
if (roles != "") roles = ";" + roles;
user.Roles = roles;
user.SecurityStamp = User.SecurityStamp();
}
return user;
}
Expand Down