kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ability to supply connection string in Add Site

Browse Source
This commit is contained in:
Shaun Walker 2022-07-26 10:12:54 -04:00
parent 5762ce58a4
commit 985f003e6d
5 changed files with 94 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Installer/Controls/SqlServerConfig.razor
View File

@ -4,7 +4,7 @@
@inject IStringLocalizer<SharedResources> SharedLocalizer @inject IStringLocalizer<SharedResources> SharedLocalizer
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label> <Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) " ResourceKey="Server">Server:</Label>
<div class="col-sm-9"> <div class="col-sm-9">
<input id="server" type="text" class="form-control" @bind="@_server" /> <input id="server" type="text" class="form-control" @bind="@_server" />
</div> </div>
@ -51,7 +51,7 @@
@if (_encryption == "true") @if (_encryption == "true")
{ {
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption" ResourceKey="TrustServerCertificate">Certificate:</Label> <Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True." ResourceKey="TrustServerCertificate">Certificate:</Label>
<div class="col-sm-9"> <div class="col-sm-9">
<select id="encryption" class="form-select custom-select" @bind="@_trustservercertificate"> <select id="encryption" class="form-select custom-select" @bind="@_trustservercertificate">
<option value="true">@Localizer["Self Signed"]</option> <option value="true">@Localizer["Self Signed"]</option>

28
Oqtane.Client/Installer/Installer.razor
View File

@ -26,12 +26,22 @@
<div class="col-sm-9"> <div class="col-sm-9">
@if (_databases != null) @if (_databases != null)
{ {
<select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))"> <div class="input-group">
@foreach (var database in _databases) <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
{ @foreach (var database in _databases)
<option value="@database.Name">@Localizer[@database.Name]</option> {
} <option value="@database.Name">@Localizer[@database.Name]</option>
</select> }
</select>
@if (!_showConnectionString)
{
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
}
else
{
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
}
</div>
} }
</div> </div>
</div> </div>
@ -41,8 +51,6 @@
{ {
@DatabaseConfigComponent @DatabaseConfigComponent
} }
<br />
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
} }
else else
{ {
@ -52,8 +60,6 @@
<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea> <textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
</div> </div>
</div> </div>
<br />
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
} }
</div> </div>
</div> </div>
@ -151,7 +157,7 @@
try try
{ {
_databaseName = (string)eventArgs.Value; _databaseName = (string)eventArgs.Value;
_showConnectionString = false;
LoadDatabaseConfigComponent(); LoadDatabaseConfigComponent();
} }
catch catch

79
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -128,18 +128,43 @@ else
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label> <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required> @if (_databases != null)
@foreach (var database in _databases) {
{ <div class="input-group">
<option value="@database.Name">@Localizer[@database.Name]</option> <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
} @foreach (var database in _databases)
</select> {
</div> <option value="@database.Name">@Localizer[@database.Name]</option>
}
</select>
@if (!_showConnectionString)
{
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
}
else
{
<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
}
</div>
}
</div>
</div> </div>
if (_databaseConfigType != null) @if (!_showConnectionString)
{ {
@DatabaseConfigComponent; if (_databaseConfigType != null)
} {
@DatabaseConfigComponent
}
}
else
{
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
<div class="col-sm-9">
<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
</div>
</div>
}
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label> <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label>
<div class="col-sm-9"> <div class="col-sm-9">
@ -169,6 +194,8 @@ else
private Type _databaseConfigType; private Type _databaseConfigType;
private object _databaseConfig; private object _databaseConfig;
private RenderFragment DatabaseConfigComponent { get; set; } private RenderFragment DatabaseConfigComponent { get; set; }
private bool _showConnectionString = false;
private string _connectionString = string.Empty;
private List<Theme> _themeList; private List<Theme> _themeList;
private List<ThemeControl> _themes = new List<ThemeControl>(); private List<ThemeControl> _themes = new List<ThemeControl>();
@ -218,7 +245,7 @@ else
try try
{ {
_databaseName = (string)eventArgs.Value; _databaseName = (string)eventArgs.Value;
_showConnectionString = false;
LoadDatabaseConfigComponent(); LoadDatabaseConfigComponent();
} }
catch catch
@ -312,12 +339,19 @@ else
user = await UserService.LoginUserAsync(user); user = await UserService.LoginUserAsync(user);
if (user.IsAuthenticated) if (user.IsAuthenticated)
{ {
var connectionString = String.Empty; var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) var connectionString = String.Empty;
{ if (_showConnectionString)
connectionString = databaseConfigControl.GetConnectionString(); {
} connectionString = _connectionString;
var database = _databases.SingleOrDefault(d => d.Name == _databaseName); }
else
{
if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
{
connectionString = databaseConfigControl.GetConnectionString();
}
}
if (connectionString != "") if (connectionString != "")
{ {
@ -398,4 +432,13 @@ else
AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
} }
} }
private void ToggleConnectionString()
{
if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
{
_connectionString = databaseConfigControl.GetConnectionString();
}
_showConnectionString = !_showConnectionString;
}
} }

12
Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
View File

@ -270,4 +270,16 @@
<data name="Runtime.Text" xml:space="preserve"> <data name="Runtime.Text" xml:space="preserve">
<value>Runtime: </value> <value>Runtime: </value>
</data> </data>
<data name="ConnectionString.HelpText" xml:space="preserve">
<value>Enter a complete connection string including all parameters and delimiters</value>
</data>
<data name="ConnectionString.Text" xml:space="preserve">
<value>String:</value>
</data>
<data name="EnterConnectionParameters" xml:space="preserve">
<value>Enter Connection Parameters</value>
</data>
<data name="EnterConnectionString" xml:space="preserve">
<value>Enter Connection String</value>
</data>
</root> </root>

4
Oqtane.Server/Repository/PermissionRepository.cs
View File

@ -143,8 +143,8 @@ namespace Oqtane.Repository
private void ClearCache(string entityName) private void ClearCache(string entityName)
{ {
var alias = _accessor.HttpContext.GetAlias(); var alias = _siteState?.Alias;
if (alias != null) if (alias != null && alias.SiteId != -1)
{ {
_cache.Remove($"permissions:{alias.SiteKey}:{entityName}"); _cache.Remove($"permissions:{alias.SiteKey}:{entityName}");
} }