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

Commit 7eb1d85

Browse files
brunobritodevbrunobritodev
committed
updated docs
docker ready
1 parent 5890ec3 commit 7eb1d85

67 files changed

Lines changed: 2507 additions & 597 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.

‎CHANGELOG.md‎

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,49 @@
1-
## v1.1.0
1+
# v1.1.0
2+
3+
## User Management
4+
5+
* docker environment config
6+
* Some bug fix for users that doesn't have picture
7+
* @angular/cli to 7.3.6
8+
* @angular/core to 7.2.11 (ng update @angular/core, then updated other dep's by itself)|
9+
* @angular/language-service @ "7.2.11" (was "6.0.0")...
10+
* @angular/compiler-cli @ "7.2.11" (was "6.0.0")...
11+
* @angular/animations @ "7.2.11" (was "6.0.0")...
12+
* @angular/compiler @ "7.2.11" (was "6.0.0")...
13+
* @angular/common @ "7.2.11" (was "6.0.0")...
14+
* @angular/core @ "7.2.11" (was "6.0.0")...
15+
* @angular/http @ "7.2.11" (was "6.0.0")...
16+
* @angular/forms @ "7.2.11" (was "6.0.0")...
17+
* @angular/platform-browser-dynamic @ "7.2.11" (was "6.0.0")...
18+
* @angular/platform-browser @ "7.2.11" (was "6.0.0")...
19+
* @angular/router @ "7.2.11" (was "6.0.0")...
20+
* zone.js @ "0.8.29" (was "0.8.26")...
21+
* rxjs @ "6.4.0" (was "6.0.0")...
22+
* typescript @ "3.2.4" (was "2.7.2")
23+
* ngx-image-cropper @ 1.3.8 (was 1.0.2)
24+
25+
## SSO
26+
27+
* Updated SSO with latest version of QuickStart UI
28+
* Device flow
29+
* IdentityServer4@2.4.0
30+
31+
## Docker support
232

333
* Now you can run through a docker! ❤️
434
* Unfortunately you need to change hosts for it. Because Authority URL. I can't do anything to face it. It's security feature from OAuth2 to keep same Authority name for each Token.
535

6-
* Pagination for Users and Persisted Grants
36+
## API
737

38+
* ASP.NET Core 2.2
39+
* Support for IdentityServer@2.4.0
840
* Update of main DbContext, JpProject
941
* Removed previous components from MySql.IdentityServer and Sql.IdentityServer. Unifying them at same project.
1042

43+
## Admin UI - Updates
44+
45+
* Pagination for Users and Persisted Grants
46+
1147
* Client Page:
1248
* Changed Claims button to be under Token - Following Docs from [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/reference/client.html#token)
1349
* Included Device Flow options
@@ -69,6 +105,14 @@ Updated components from UI:
69105
|ts-node| 5.0.1| → 8.0.3|
70106
|tslint| 5.9.1| → 5.14.0|
71107

72-
## v1.0.0
108+
## Other
109+
110+
* Minor bugs correction
111+
* .dockerignore
112+
* clone client
113+
* Added bat to change hosts file
114+
115+
116+
# v1.0.0
73117

74118
- First release

‎admin-ui.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ FROM nginx:1.13.3-alpine
3030
RUN rm -rf /usr/share/nginx/html/*
3131

3232
# copy artifact build from the 'build environment'
33-
COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/
33+
COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/default.conf
3434
COPY --from=builder /app/dist /usr/share/nginx/html
3535

3636

‎build/update-host.bat‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@echo off
2+
TITLE Modifying your HOSTS file
3+
COLOR 03
4+
ECHO.
5+
6+
SET NEWLINE=^& echo.
7+
ECHO Carrying out requested modifications to your HOSTS file
8+
FIND /C /I "jpproject" %WINDIR%\system32\drivers\etc\hosts
9+
IF %ERRORLEVEL% NEQ 0 ECHO %NEWLINE%>>%WINDIR%\system32\drivers\etc\hosts
10+
IF %ERRORLEVEL% NEQ 0 ECHO 127.0.0.1 jpproject>>%WINDIR%\system32\drivers\etc\hosts
11+
ECHO Finished
12+
GOTO END
13+
14+
:END
15+
ECHO.
16+
PAUSE

‎docker-compose.yml‎

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -24,66 +24,60 @@ services:
2424
context: .
2525
dockerfile: sso.dockerfile
2626
ports:
27-
- "5000:80"
28-
- "5001:443"
27+
- "5000:5000"
2928
links:
3029
- jpdatabase
3130
depends_on:
3231
- jpdatabase
3332
environment:
3433
DATABASE_TYPE: "MySql"
3534
CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
36-
ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
37-
ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
3835
ASPNETCORE_ENVIRONMENT: "Development"
39-
ASPNETCORE_URLS: http://+;https://+
36+
ASPNETCORE_URLS: http://+:5000
4037

4138
# #############################
4239
# # Management API
4340
# #############################
44-
# jpproject-api:
45-
# container_name: jpproject-api
46-
# build:
47-
# context: .
48-
# dockerfile: user-management.dockerfile
49-
# ports:
50-
# - "5003:443"
51-
# - "5002:80"
52-
# depends_on:
53-
# - jpdatabase
54-
# environment:
55-
# DATABASE_TYPE: "MySql"
56-
# CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
57-
# ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
58-
# ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
59-
# ASPNETCORE_ENVIRONMENT: "Development"
60-
# AUTHORITY: "http://jpproject:5000"
61-
# ASPNETCORE_URLS: https://+;http://+
41+
jpproject-api:
42+
container_name: jpproject-api
43+
build:
44+
context: .
45+
dockerfile: user-management.dockerfile
46+
ports:
47+
- "5003:80"
48+
depends_on:
49+
- jpdatabase
50+
environment:
51+
DATABASE_TYPE: "MySql"
52+
CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
53+
ASPNETCORE_ENVIRONMENT: "Development"
54+
AUTHORITY: "http://jpproject:5000"
55+
ASPNETCORE_URLS: http://+
6256

63-
# #############################
64-
# # User management UI
65-
# #############################
66-
# user-ui:
67-
# container_name: jpproject-user-management-ui
68-
# build:
69-
# context: .
70-
# dockerfile: ui-user-management.dockerfile
71-
# depends_on:
72-
# - jpproject-api
73-
# - jpproject
74-
# ports:
75-
# - 4200:80
57+
#############################
58+
# User management UI
59+
#############################
60+
user-ui:
61+
container_name: jpproject-user-management-ui
62+
build:
63+
context: .
64+
dockerfile: ui-user-management.dockerfile
65+
depends_on:
66+
- jpproject-api
67+
- jpproject
68+
ports:
69+
- 4200:80
7670

77-
# #############################
78-
# # Admin Ui
79-
# #############################
80-
# admin-ui:
81-
# container_name: jpproject-admin-ui
82-
# build:
83-
# context: .
84-
# dockerfile: ui-user-management.dockerfile
85-
# depends_on:
86-
# - jpproject-api
87-
# - jpproject
88-
# ports:
89-
# - 4300:80
71+
#############################
72+
# Admin Ui
73+
#############################
74+
admin-ui:
75+
container_name: jpproject-admin-ui
76+
build:
77+
context: .
78+
dockerfile: admin-ui.dockerfile
79+
depends_on:
80+
- jpproject-api
81+
- jpproject
82+
ports:
83+
- 4300:80

‎docs/index.rst‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Getting Started
66
.. image:: images/logo.png
77
:align: center
88

9-
Jp Project is a Open Source Quickstart for IdentityServer4.
9+
Jp Project is a Open Source Quickstart for IdentityServer4 v2 - release 2.4.0.
1010

11-
Built with ASP.NET Core and Angular 6.
11+
Built with ASP.NET Core 2.2 and Angular 7.
1212

1313
The main goal of project is to be a Management Ecosystem for IdentityServer4. Helping Startup's and Organization to Speed Up the Setup of User Management.
1414

@@ -29,6 +29,11 @@ Give a Star ⭐!
2929

3030
Do you love it? give us a :yellow:`Star!` ⭐
3131

32+
.. raw:: html
33+
34+
<iframe src="https://ghbtns.com/github-btn.html?user=brunohbrito&repo=JP-Project&type=star&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe>
35+
36+
3237
Contributing
3338
------------
3439
Wanna contribute? Feel free to do that!
@@ -62,9 +67,10 @@ There are several ways we can help you out.
6267
:caption: Get Start
6368

6469
quickstarts/build
70+
quickstarts/docker_support
71+
quickstarts/vs_vscode
6572
quickstarts/ambient_variables
6673
quickstarts/app_settings
67-
quickstarts/docker_support
6874

6975
.. toctree::
7076
:maxdepth: 2

‎docs/intro/architecture.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ ASP.NET CORE
4242
* Repository and Generic Repository
4343
* Serilog
4444

45-
Angular 6
45+
Angular 7
4646
^^^^^^^^^^
4747

4848
* OpenId Connect throug angular-oauth2-oidc plugin to manage login.
4949
* Bootstrap 4
50-
* angular-6-social-login-v2 to take profile from Google and Facebook before register new users

‎docs/intro/big_picture.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A SPA application responsible for create and manager users. Send reset links. E-
2121
Management API
2222
-------------------
2323

24-
This API serve UI.
24+
API to serve UI's.
2525

2626
Admin UI
2727
--------

0 commit comments

Comments
 (0)