admin ui

Author: brunobritodev

README.md

@@ -1,58 +1,180 @@
-![image](https://github.com/brunohbrito/JP-Project/blob/master/docs/images/logo.png?raw=true)
+![image](https://github.com/brunohbrito/JPProject.Core/blob/master/build/logo.png?raw=true)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
 [![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/JPProject%20CD%20Build?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
-[![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/brunohbrito/JPProject.IdentityServer4.AdminUI.svg)](https://greenkeeper.io/)
-![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)
+[![License](https://img.shields.io/github/license/brunohbrito/JPProject.IdentityServer4.SSO)](LICENSE)
 
-Jp Project is a Open Source UI Administration Tools for IdentityServer4 v2 - release 2.4.0. 
+This is an Administrator Panel for JP Project. It's available in 2 versions: Light and Full. See below the differences.
 
+# Installation
+
+If you know the differences between Light and Full. Check the installation instructions below. If wanna understand check [Presentation](#presentation) version.
+
+## Full Installation
+
+Windows users:
+* download [jpproject-docker-windows.zip](https://github.com/brunohbrito/JP-Project/raw/master/build/jpproject-docker-windows.zip)
+* Unzip and execute `docker-run.bat` (As administrator)
+
+Linux users:
+* Download [docker-compose.yml](https://github.com/brunohbrito/JP-Project/raw/master/build/docker-compose.yml)
+* Add `127.0.0.1 jpproject-sso` entry to hosts file (`/etc/hosts`)
+* `docker-compose up`
+
+## Light version
+
+You will need to create a Client and API resources in you IdentityServer4. At the end of this section have some shortcuts.
+
+1. [Download](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/archive/master.zip)/Clone or [Fork](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/fork) this repository.
+2. Open `environment.ts` and change settings for you SSO.
+    ```
+    export const environment = {
+        production: false,
+        IssuerUri:  "http://localhost:5000",
+        ResourceServer: "http://localhost:5002/",
+        RequireHttps: false,
+        Uri: "http://localhost:4300",
+        defaultTheme: "E",
+        version: "3.0.0"
+    };
+    ```
+    For more details check [angular-oauth2-oidc](https://github.com/manfredsteyer/angular-oauth2-oidc)
+3. Open `docker-compose.yml` and change Api Settings:
+    ```
+    # #############################
+    # # Management API - Light
+    # #############################
+    jpproject-light-api:
+        image: jpproject-light-api
+        build: 
+          context: .
+          dockerfile: api-light.dockerfile
+        environment: 
+            ASPNETCORE_ENVIRONMENT: "Development"
+            CUSTOMCONNSTR_SSOConnection: "<you database connstring>"
+            ApplicationSettings:Authority: "<you sso uri>"
+            ApplicationSettings:DatabaseType: SqlServer # Choose one: SqlServer | MySql | Postgre | Sqlite
+            ApplicationSettings:RequireHttpsMetadata: 'false'
+            ApplicationSettings:ApiName: "<api name>"
+            ApplicationSettings:ApiSecret: "<your api secret>"
+    ```
+4. Build compose by: `docker-compose up`
+
+Shortcuts:
+
+You must have these 2 configurations at you IdentityServer4
+
+Client configuration
+```
+    /*
+    * JP Project ID4 Admin Client
+    */
+    new Client
+    {
+
+        ClientId = "IS4-Admin",
+        ClientName = "IS4-Admin",
+        ClientUri = "http://localhost:4300",
+        AllowedGrantTypes = GrantTypes.Implicit,
+        AllowAccessTokensViaBrowser = true,
+        RedirectUris = new[] {
+            "http://localhost:4300/login-callback",
+            "http://localhost:4300/silent-refresh.html"
+        },
+        AllowedCorsOrigins = { "http://localhost:4300" },
+        IdentityTokenLifetime = 3600,
+        LogoUri = "https://jpproject.azurewebsites.net/sso/images/brand/logo.png",
+        AuthorizationCodeLifetime = 3600,
+        AllowedScopes =
+        {
+            IdentityServerConstants.StandardScopes.OpenId,
+            IdentityServerConstants.StandardScopes.Profile,
+            IdentityServerConstants.StandardScopes.Email,
+            "jp_api.is4"
+        }
+    },
+
+```
+
+Api resource configuration
+```
+    new ApiResource
+    {
+        Name = "jp_api",
+        DisplayName = "JP API",
+        Description = "OAuth2 Server Management Api",
+        ApiSecrets = { new Secret(":}sFUz}Pjc]K4yiW>vDjM,+:tq=U989dxw=Vy*ViKrP+bjNbWC3B3&kE23Z=%#Jr".Sha256()) },
+
+        UserClaims =
+        {
+            IdentityServerConstants.StandardScopes.OpenId,
+            IdentityServerConstants.StandardScopes.Profile,
+            IdentityServerConstants.StandardScopes.Email,
+            "is4-rights",
+            "username",
+            "roles"
+        },
+
+        Scopes =
+        {
+            new Scope()
+            {
+                Name = "jp_api.is4",
+                DisplayName = "OAuth2 Server",
+                Description = "Manage mode to IS4",
+                Required = true
+            }
+        }
+    }
+```
 
 ## Table of Contents ##
 
+- [Installation](#installation)
+  - [Full Installation](#full-installation)
+  - [Light version](#light-version)
+  - [Table of Contents](#table-of-contents)
 - [Presentation](#presentation)
+  - [Full](#full)
+  - [Light version](#light-version-1)
   - [Admin UI](#admin-ui)
-  - [Login page](#login-page)
-  - [Consent page](#consent-page)
-  - [Profile](#profile)
 - [Demo](#demo)
   - [We are online at Azure.](#we-are-online-at-azure)
-- [Docker](#docker)
 - [Technologies](#technologies)
   - [Architecture](#architecture)
   - [Give a Star! ⭐](#give-a-star-%e2%ad%90)
   - [How to build](#how-to-build)
 - [Docs](#docs)
   - [Contributing](#contributing)
   - [Free](#free)
+  - [3.0.1](#301)
   - [v1.4.5](#v145)
-  - [v1.4.0](#v140)
-  - [v1.3](#v13)
-  - [v1.2](#v12)
 - [What comes next?](#what-comes-next)
 - [License](#license)
 
 ------------------
 
 # Presentation
 
-Here some screenshots
+JP Project Admin Panel is an administrative panel for IdentityServer4. You can manage Clients, Api Resources, Identity Resources and so on. There are 2 versions.
 
-## Admin UI ##
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-adminui.gif"  width="480" />
+## Full
+
+The full version is for those who don't have an IdentityServer up and running. So you can download the JP Project SSO and with this admin panel you will be able to manage **Users** and **IdentityServer4**.
 
-## Login page ##
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
+## Light version
 
-## Consent page ##
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
+For those who already have an IdentityServer4. This panel has features to manage an existing **IdentityServer4** database.
 
-## Profile ##
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-usermanagement.gif" width="480" />
+
+Here some screenshots
+
+## Admin UI ##
+<img src="https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/blob/master/docs/images/jp-adminui.gif"  width="480" />
 
 # Demo #
 
-Check our demo online.
+Check our full demo online.
 
 ## We are online at Azure. 
 
@@ -64,22 +186,6 @@ You can check also [SSO](https://jpproject.azurewebsites.net/sso/) and [User Man
 
 _New users are readonly_
 
-# Docker #
-
-Run through docker compose ❤️
-
-Wanna try? As easy as:
-
-Windows users:
-* download [jpproject-docker-windows.zip](https://github.com/brunohbrito/JP-Project/raw/master/build/jpproject-docker-windows.zip)
-* Unzip and execute `docker-run.bat` (As administrator)
-
-Linux users:
-* Download [docker-compose.yml](https://github.com/brunohbrito/JP-Project/raw/master/build/docker-compose.yml)
-* Add `127.0.0.1 jpproject` entry to hosts file (`/etc/hosts`)
-* `docker-compose up`
-
-
 # Technologies #
 
 Check below how it was developed.
@@ -89,16 +195,13 @@ The main goal of project is to be a Management Ecosystem for IdentityServer4. He
 
 - Angular 8
 - Rich UI interface
-- ASP.NET Core 2.2
-- ASP.NET MVC Core 
+- ASP.NET Core 3.0
 - ASP.NET WebApi Core
-- ASP.NET Identity Core
-- Argon2 Password Hashing
 - MySql Ready
 - Sql Ready
 - Postgree Ready
 - SQLite Ready
-- Entity Framework Core 2.2
+- Entity Framework Core
 - .NET Core Native DI
 - AutoMapper
 - FluentValidator
@@ -124,18 +227,16 @@ The main goal of project is to be a Management Ecosystem for IdentityServer4. He
 Do you love it? give us a Star!
 
 ## How to build
-Jp Project is built against ASP.NET Core 2.2.
+Jp Project is built against ASP.NET Core 3.0.
 
 * [Install](https://www.microsoft.com/net/download/core#/current) the latest .NET Core 2.2 SDK
 
-
-`src/JpProject.sln` Contains SSO and API
+`src/JpProject.AdminUi.sln` Contains the API
 
 For UI's use VSCode.
 - AdminUI -> Inside VSCode open folder `rootFolder/src/Frontend/Jp.AdminUI`, then terminal and `npm install && npm start`
-- User Management -> Inside VSCode open folder `rootFolder/src/Frontend/Jp.UserManagement`, then terminal and `npm install && npm start`
 
-Wait for ng to complete his proccess then go to http://localhost:5000!
+Wait for ng to complete his proccess then go to http://localhost:4300!
 
 Any doubts? Go to docs
 
@@ -152,6 +253,11 @@ We'll love it! Please [Read the docs](https://jp-project.readthedocs.io/en/lates
 If you need help building or running your Jp Project platform
 There are several ways we can help you out.
 
+## 3.0.1
+
+1. ASP.NET Core 3.0 support
+2. Separated repositories, for better management. Improving tests, integration tests. And to support more scenarios.
+
 ## v1.4.5
 
 Breaking change: **Argon2 password hashing**. Be careful before update. If you are using the old version all users must need to update their passwords.
@@ -161,47 +267,15 @@ Breaking change: **Argon2 password hashing**. Be careful before update. If you a
 2. Argon2 Password Hasher
 3. Show version at footer
 
-## v1.4.0
-
-1. Added :boom: **New Translations** (auto-generate) :green_heart: :blue_heart:
-   * Spanish
-   * French
-   * Dutch
-   * Russian
-   * Chinese Simplified
-   * Chinese Traditional
-
-    <small>If you find some mistakes feel free to PR</small>
-
-2. Added integration with Azure DevOps for full CI/CD. ASAP SonarQube
-
-3. Bug fixes
-
-## v1.3
-
-- Bug fixes
-  - angular-oauth2-oidc Session Improvements for Angular Apps. Incluind Admin UI
-  - Some Action attributes was HttpPost instead HttpPut (fixed)
-- New unity tests
-
-## v1.2
-
-- Docker support
-- Available at Docker Hub
-- IdentityServer4 v2 (release 2.4.0)
-  - Device flow
-- ASP.NET Core 2.2 support
-- Plugins update
-- Angular 7.2
-
 Check [Changelog.md](https://github.com/brunohbrito/JP-Project/blob/master/CHANGELOG.md) for a complete list of changes.
 
 # What comes next?
 
 * Code coverage
 * UI for Device codes 
 * CI with SonarCloud
-
+* E-mail template management
+* Blob service management
 
 # License
 

admin-ui.dockerfile

@@ -10,21 +10,20 @@ COPY ["src/Frontend/Jp.AdminUI/package-lock.json", "./"]
 RUN npm ci && mkdir /app && mv ./node_modules ./app/
 
 WORKDIR /app
-
 # add app
 COPY ["src/Frontend/Jp.AdminUI/", "/app"]
-
+COPY ["environment.ts", "src/environments/environment.prod.ts"]
 # rebuild node
 RUN npm rebuild node-sass
 # generate build
-RUN npm run ng build -- --configuration=docker
+RUN npm run ng build -- --configuration=production
 
 ##################
 ### production ###
 ##################
 
 # base image
-FROM nginx:1.17.2-alpine
+FROM nginx:alpine
 
 ## Remove default nginx website
 RUN rm -rf /usr/share/nginx/html/*
@@ -33,7 +32,6 @@ RUN rm -rf /usr/share/nginx/html/*
 COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/dist /usr/share/nginx/html
 
-
 # expose port 80
 EXPOSE 80/tcp
 

api-light.dockerfile

@@ -0,0 +1,20 @@
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
+WORKDIR /src
+COPY ["src/Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj", "Backend/JPProject.Admin.Api/"]
+RUN dotnet restore "Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj"
+COPY src/ .
+WORKDIR "/src/Backend/JPProject.Admin.Api"
+RUN dotnet build "JPProject.Admin.Api.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "JPProject.Admin.Api.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "JPProject.Admin.Api.dll"]