Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit a79486b

Browse files
committed
beta testing in prod
1 parent 3fdaa90 commit a79486b

85 files changed

Lines changed: 5983 additions & 412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
![image](https://github.com/brunohbrito/JP-Project/blob/master/docs/images/logo.png?raw=true)
22

33
[![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
4+
[![Build Status](https://dev.azure.com/brunohbrito/Jp-Project/_apis/build/status/brunohbrito.JP-Project)](https://dev.azure.com/brunohbrito/Jp-Project/_build/latest?definitionId=1)
45
[![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE)
56

67
Jp Project is a Open Source Quickstart for IdentityServer4.

build/build.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
echo Restore nuget dep's
3-
dotnet restore "../src/Backend/Jp.UserManagement"
4-
dotnet restore "../src/Frontend/Jp.UI.SSO"
3+
dotnet build "../src/Backend/Jp.UserManagement"
4+
dotnet build "../src/Frontend/Jp.UI.SSO"
55

66
CLS
77
echo RUN API
@@ -11,8 +11,8 @@ echo RUN SSO
1111
start /d "../src/Frontend/Jp.UI.SSO" dotnet run args
1212

1313
echo RUN UserManagement
14-
(cd "../src/Frontend/Jp.UserManagement" && npm install && start ng serve)
14+
(cd "../src/Frontend/Jp.UserManagement" && npm install && start npm start)
1515

1616
echo RUN AdminUi
17-
(cd "../src/Frontend/Jp.AdminUI" && npm install && start ng serve)
17+
(cd "../src/Frontend/Jp.AdminUI" && npm install && start npm start)
1818

build/build.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ $paramsUI= "/c cd " + $ui + " && npm start";
1111
$paramsAdminUI= "/c cd " + $adminui + " && npm start";
1212

1313
Write-Information Restore deps
14-
dotnet restore $sso
15-
dotnet restore $api
14+
dotnet build $sso
15+
dotnet build $api
1616
# The best way to npm install is from src folder
1717
cd $ui; npm install
1818
cd $currentPath
19+
cd $adminui; npm install
20+
cd $currentPath
21+
1922

2023
# Start-Process -Verb runas "cmd.exe" $paramsSSO;
2124
Start-Process "cmd.exe" $paramsAPI;

src/Backend/Jp.Infra.CrossCutting.Tools/DefaultConfig/JpProjectConfiguration.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
using System;
1+
using Microsoft.Extensions.Configuration;
2+
using System;
23
using System.IO;
3-
using Microsoft.Extensions.Configuration;
44

55
namespace Jp.Infra.CrossCutting.Tools.DefaultConfig
66
{
7-
/// <summary>
8-
/// The main purpouse is to provide Environments or AppSettings config.
9-
/// </summary>
107
/// <summary>
118
/// The main purpouse is to provide Environments or AppSettings config.
129
/// </summary>
@@ -23,5 +20,11 @@ public static class JpProjectConfiguration
2320
public static string UserManagementUrl => $"{Environment.GetEnvironmentVariable("USER_MANAGEMENT_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("UserManagementURL").Value}";
2421
public static string IdentityServerAdminUrl => $"{Environment.GetEnvironmentVariable("IS4_MANAGEMENT_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("Is4ManagementURL").Value}";
2522
public static string ResourceServer => $"{Environment.GetEnvironmentVariable("RESOURCE_SERVER_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("ResourceServerURL").Value}";
23+
24+
public static bool DatabaseType(string type)
25+
{
26+
var db = $"{Environment.GetEnvironmentVariable("DATABASE_TYPE") ?? Configuration.GetSection("ApplicationSettings").GetSection("DatabaseType").Value}";
27+
return db.ToUpper().Equals(type.ToUpper());
28+
}
2629
}
2730
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using Jp.Infra.CrossCutting.Tools.DefaultConfig;
2+
using Jp.Infra.Migrations.MySql.Identity.Configuration;
3+
using Jp.Infra.Migrations.Sql.Identity.Configuration;
4+
using Microsoft.Extensions.Configuration;
5+
using Microsoft.Extensions.DependencyInjection;
6+
7+
namespace Jp.Management.Configuration
8+
{
9+
public static class DbSettingsConfig
10+
{
11+
public static void ConfigureIdentityDatabase(this IServiceCollection services, IConfiguration configuration)
12+
{
13+
if (JpProjectConfiguration.DatabaseType("MySql"))
14+
services.AddIdentityMySql(configuration);
15+
else
16+
services.AddIdentitySqlServer(configuration);
17+
}
18+
}
19+
}

src/Backend/Jp.UserManagement/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Jp.Infra.CrossCutting.IoC;
2-
using Jp.Infra.Migrations.MySql.Identity.Configuration;
32
using Jp.Management.Configuration;
43
using MediatR;
54
using Microsoft.AspNetCore.Builder;
@@ -39,7 +38,8 @@ public void ConfigureServices(IServiceCollection services)
3938
{
4039
services.AddMvc();
4140

42-
services.AddIdentityMySql(Configuration);
41+
// Identity Database
42+
services.ConfigureIdentityDatabase(Configuration);
4343

4444
services.ConfigureCors();
4545

src/Backend/Jp.UserManagement/appSettings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@
2828
"FromName": "Jp Project Team",
2929
"FromAddress": "donotreply@jpproject.com",
3030
"SendEmail": "false"
31+
},
32+
"ApplicationSettings": {
33+
"DatabaseType": "MySql"
3134
}
3235
}

0 commit comments

Comments
 (0)