Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Support for third party modules, improved error handling, standardardized enum naming, reorganized interface definitions, support for DB script upgrades, added Settings entity

Browse Source
This commit is contained in:
Shaun Walker
2019-08-14 09:34:35 -04:00
parent 916109015f
commit b71f007981
78 changed files with 809 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -1,11 +1,15 @@
using DbUp;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Oqtane.Models;
using Oqtane.Repository;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
@ -182,11 +186,71 @@ namespace Oqtane.Controllers
response.Success = !dbUpgrade.IsUpgradeRequired();
if (!response.Success)
{
response.Message = "Scripts Have Not Been Run";
response.Message = "Master Installation Scripts Have Not Been Executed";
}
else
{
Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies()
.Where(item => item.FullName.Contains(".Module.")).ToArray();
// get tenants
using (var db = new InstallationContext(connectionString))
{
foreach (Tenant tenant in db.Tenant.ToList())
{
// upgrade framework
dbUpgradeConfig = DeployChanges.To.SqlDatabase(tenant.DBConnectionString)
.WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly());
dbUpgrade = dbUpgradeConfig.Build();
if (dbUpgrade.IsUpgradeRequired())
{
var result = dbUpgrade.PerformUpgrade();
if (!result.Successful)
{
// TODO: log result.Error.Message;
}
}
// iterate through Oqtane module assemblies and execute any database scripts
foreach (Assembly assembly in assemblies)
{
InstallModule(assembly, tenant.DBConnectionString);
}
}
}
}
}
return response;
}
private void InstallModule(Assembly assembly, string connectionstring)
{
var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionstring)
.WithScriptsEmbeddedInAssembly(assembly); // scripts must be included as Embedded Resources
var dbUpgrade = dbUpgradeConfig.Build();
if (dbUpgrade.IsUpgradeRequired())
{
var result = dbUpgrade.PerformUpgrade();
if (!result.Successful)
{
// TODO: log result.Error.Message;
}
}
}
}
public class InstallationContext : DbContext
{
private readonly string _connectionString;
public InstallationContext(string connectionString)
{
_connectionString = connectionString;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
=> optionsBuilder.UseSqlServer(_connectionString);
public virtual DbSet<Tenant> Tenant { get; set; }
}
}

61
Oqtane.Server/Controllers/SettingController.cs Normal file
View File

@ -0,0 +1,61 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Repository;
using Oqtane.Models;
namespace Oqtane.Controllers
{
[Route("{site}/api/[controller]")]
public class SettingController : Controller
{
private readonly ISettingRepository Settings;
public SettingController(ISettingRepository Settings)
{
this.Settings = Settings;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Setting> Get(string entityname, int entityid)
{
return Settings.GetSettings(entityname, entityid);
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Setting Get(int id)
{
return Settings.GetSetting(id);
}
// POST api/<controller>
[HttpPost]
public Setting Post([FromBody] Setting Setting)
{
if (ModelState.IsValid)
{
Setting = Settings.AddSetting(Setting);
}
return Setting;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public Setting Put(int id, [FromBody] Setting Setting)
{
if (ModelState.IsValid)
{
Setting = Settings.UpdateSetting(Setting);
}
return Setting;
}
// DELETE api/<controller>/5
[HttpDelete("{id}")]
public void Delete(int id)
{
Settings.DeleteSetting(id);
}
}
}

47
Oqtane.Server/Controllers/UserController.cs
View File

@ -4,6 +4,7 @@ using Oqtane.Repository;
using Oqtane.Models;
using Microsoft.AspNetCore.Identity;
using System.Threading.Tasks;
using System.Linq;
namespace Oqtane.Controllers
{
@ -11,12 +12,14 @@ namespace Oqtane.Controllers
public class UserController : Controller
{
private readonly IUserRepository users;
private readonly ISiteUserRepository siteusers;
private readonly UserManager<IdentityUser> identityUserManager;
private readonly SignInManager<IdentityUser> identitySignInManager;
public UserController(IUserRepository Users, UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager)
public UserController(IUserRepository Users, ISiteUserRepository SiteUsers, UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager)
{
users = Users;
siteusers = SiteUsers;
identityUserManager = IdentityUserManager;
identitySignInManager = IdentitySignInManager;
}
@ -39,6 +42,8 @@ namespace Oqtane.Controllers
[HttpPost]
public async Task<User> Post([FromBody] User User)
{
User user = null;
if (ModelState.IsValid)
{
IdentityUser identityuser = await identityUserManager.FindByNameAsync(User.Username);
@ -50,11 +55,17 @@ namespace Oqtane.Controllers
var result = await identityUserManager.CreateAsync(identityuser, User.Password);
if (result.Succeeded)
{
User = users.AddUser(User);
user = users.AddUser(User);
SiteUser SiteUser = new SiteUser();
SiteUser.SiteId = User.SiteId;
SiteUser.UserId = user.UserId;
SiteUser.IsAuthorized = true;
siteusers.AddSiteUser(SiteUser);
}
}
}
return User;
return user;
}
// PUT api/<controller>/5
@ -84,36 +95,38 @@ namespace Oqtane.Controllers
// POST api/<controller>/login
[HttpPost("login")]
public async Task<User> Login([FromBody] User user)
public async Task<User> Login([FromBody] User User)
{
User user = new Models.User { Username = User.Username, IsAuthenticated = false };
if (ModelState.IsValid)
{
IdentityUser identityuser = await identityUserManager.FindByNameAsync(user.Username);
IdentityUser identityuser = await identityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
var result = await identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
var result = await identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
if (result.Succeeded)
{
await identitySignInManager.SignInAsync(identityuser, user.IsPersistent);
user = users.GetUser(identityuser.UserName);
user.IsAuthenticated = true;
if (user != null)
{
SiteUser siteuser = siteusers.GetSiteUsers(User.SiteId, user.UserId).FirstOrDefault();
if (siteuser.IsAuthorized)
{
await identitySignInManager.SignInAsync(identityuser, User.IsPersistent);
user.IsAuthenticated = true;
}
}
}
else
{
user = new Models.User { Username = user.Username, IsAuthenticated = false };
}
}
else
{
user = new Models.User { Username = user.Username, IsAuthenticated = false };
}
}
return user;
}
// POST api/<controller>/logout
[HttpPost("logout")]
public async Task Logout([FromBody] User user)
public async Task Logout([FromBody] User User)
{
await identitySignInManager.SignOutAsync();
}