Cleanup - admin controller removed

Author: rxtur

src/App/Controllers/AdminController.cs

@@ -2,6 +2,7 @@
 using Core.Helpers;
 using Core.Services;
 using Markdig;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
@@ -189,7 +190,14 @@ public async Task<IActionResult> Error(int code)
             }
         }
 
-        [HttpPost, Route("account/logout")]
+        [HttpGet("admin")]
+        [Authorize]
+        public IActionResult Admin()
+        {
+            return Redirect("~/admin/posts");
+        }
+
+        [HttpPost("account/logout")]
         public async Task<IActionResult> Logout()
         {
             await _sm.SignOutAsync();

src/App/Controllers/BlogController.cs

@@ -38,7 +38,7 @@
         var importSubmit = function () {
             $('.loading').fadeIn('fast');
             var data = new FormData($('#frmImport')[0]);
-            DataService.upload('admin/importfeed', data, importCallback, fail);
+            DataService.upload('api/settings/importfeed', data, importCallback, fail);
         }
         var importCallback = function (data) {
 

src/App/Pages/Admin/Settings/Import.cshtml

@@ -4,7 +4,7 @@
         return false;
     }
     function remove(id) {
-        dataService.remove("admin/notifications/remove/" + id, removeCallback, fail);
+        dataService.remove("api/settings/removenotification/" + id, removeCallback, fail);
     }
     function removeCallback() {
         toastr.success('Removed');

src/App/wwwroot/admin/js/app/notificationsController.js

@@ -19,11 +19,13 @@ namespace Core.Api
     public class SettingsController : ControllerBase
     {
         IDataService _data;
+        IImportService _feed;
         IOptions<RequestLocalizationOptions> _options;
 
-        public SettingsController(IDataService data, IOptions<RequestLocalizationOptions> options)
+        public SettingsController(IDataService data, IImportService feed, IOptions<RequestLocalizationOptions> options)
         {
             _data = data;
+            _feed = feed;
             _options = options;
         }
 
@@ -97,5 +99,29 @@ public async Task<ActionResult<BlogItem>> Post(BlogItem model)
                 return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
             }
         }
+
+        [HttpPost("importfeed")]
+        [Administrator]
+        public async Task<IEnumerable<ImportMessage>> ImportFeed(IFormFile file)
+        {
+            var author = _data.Authors.Single(a => a.AppUserName == User.Identity.Name);
+
+            if (!author.IsAdmin)
+                Redirect("~/pages/shared/_error/403");
+
+            var webRoot = Url.Content("~/");
+
+            return await _feed.Import(file, User.Identity.Name, webRoot);
+        }
+
+        [HttpDelete("removenotification/{id}")]
+        [Administrator]
+        public async Task RemoveNotification(int id)
+        {
+            var note = _data.Notifications.Single(n => n.Id == id);
+            _data.Notifications.Remove(note);
+            _data.Complete();
+            await Task.CompletedTask;
+        }
     }
 }

src/Core/Api/SettingsController.cs

@@ -226,8 +226,7 @@ public static string SanitizeFileName(this string str)
         {
             str = str.SanitizePath();
 
-            if (str.Count(x => x == '.') > 1)
-                throw new ApplicationException("Invalid file name");
+            //TODO: add filename specific validation here
 
             return str;
         }