Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change login flow to use Ory #924

Merged
merged 29 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ad6c73e
Update front end to use auth code login
mpgxvii Aug 5, 2024
8c9fec3
Add login endpoint to allow auth code grant login
mpgxvii Aug 5, 2024
c09291c
Add token validator updates to support hydra tokens
mpgxvii Aug 5, 2024
4820edc
Add auth server config to application properties
mpgxvii Aug 6, 2024
6beedc4
Fix access token converter
mpgxvii Aug 6, 2024
0590f33
Merge branch 'hydra-kratos-stack' of https://github.com/RADAR-base/Ma…
mpgxvii Aug 13, 2024
d0d61aa
Fix application properties
mpgxvii Aug 13, 2024
5234fd2
Remove unused KratosTokenVerifier and Oauth2LoginUiWebConfig
mpgxvii Aug 14, 2024
ea47775
Update setting of hydra token verifier loader
mpgxvii Aug 14, 2024
39b06b5
Merge remote-tracking branch 'origin/feature/ory-based-authorization'…
yatharthranjan Aug 14, 2024
1a9daca
add separate login url for hydra
yatharthranjan Aug 19, 2024
bc2b2f6
Update ManagementPortal propreties with new loginUrl property
mpgxvii Aug 19, 2024
57eecfd
intermediate removal of unneeded components
yatharthranjan Aug 20, 2024
03c87ed
Fix ory stack configs
mpgxvii Aug 20, 2024
83087eb
Merge branch 'feat/hydra-token' of https://github.com/RADAR-base/Mana…
mpgxvii Aug 20, 2024
1882851
Remove OAuth2ServerConfiguration and use single SecurityConfig for auth
mpgxvii Aug 22, 2024
7600ae8
Refactor JwtAuthenticationFilter to accept jwt and session data
mpgxvii Aug 22, 2024
54aa7ff
Remove unused services
mpgxvii Aug 22, 2024
5e6f20d
Restore ory stack changes
mpgxvii Aug 22, 2024
eaa7d33
Update JwtAuthenticationFilter issues: make sure existing auth is che…
mpgxvii Aug 23, 2024
aa6b6f0
Merge branch 'feature/ory-based-authorization' of https://github.com/…
mpgxvii Aug 23, 2024
960a3b5
Restore deleted annotations
mpgxvii Aug 23, 2024
c11734e
Move access token fetching to AuthService
mpgxvii Aug 23, 2024
2988114
Invalidate session on logout
mpgxvii Aug 23, 2024
51b5fdd
Merge branch 'feature/ory-based-authorization' of https://github.com/…
mpgxvii Aug 23, 2024
2c4683c
Fix error component login url and remove unnecessary logs
mpgxvii Aug 23, 2024
393bcf9
Merge branch 'feature/ory-based-authorization' of https://github.com/…
mpgxvii Aug 23, 2024
b4ec9b2
Merge branch 'feature/ory-based-authorization' of https://github.com/…
mpgxvii Aug 23, 2024
5741993
Remove unused TokenKeyEndpoint
mpgxvii Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions src/main/docker/managementportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- MANAGEMENTPORTAL_IDENTITYSERVER_LOGINURL=http://localhost:3000
- MANAGEMENTPORTAL_IDENTITYSERVER_SERVERADMINURL=http://kratos:4434
- MANAGEMENTPORTAL_AUTHSERVER_SERVERURL=http://hydra:4444
- MANAGEMENTPORTAL_AUTHSERVER_LOGINURL=http://localhost:4444
- MANAGEMENTPORTAL_AUTHSERVER_SERVERADMINURL=http://hydra:4445
- JHIPSTER_SLEEP=10 # gives time for the database to boot before the application
- JAVA_OPTS=-Xmx512m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 #enables remote debugging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public class ManagementPortalProperties {

private final IdentityServer identityServer = new IdentityServer();

private final AuthServer authServer = new AuthServer();

private final Mail mail = new Mail();

private final Frontend frontend = new Frontend();
Expand All @@ -34,6 +36,10 @@ public IdentityServer getIdentityServer() {
return identityServer;
}

public AuthServer getAuthServer() {
return authServer;
}

public ManagementPortalProperties.Mail getMail() {
return mail;
}
Expand Down Expand Up @@ -324,6 +330,37 @@ public void setLoginUrl(String loginUrl) {
}
}

public class AuthServer {
private String serverUrl = null;
private String serverAdminUrl = null;
private String loginUrl = null;

public String getServerUrl() {
return serverUrl;
}

public void setServerUrl(String serverUrl) {
this.serverUrl = serverUrl;
}

public String getServerAdminUrl() {
return serverAdminUrl;
}

public void setServerAdminUrl(String serverAdminUrl) {
this.serverAdminUrl = serverAdminUrl;
}

public String getLoginUrl() {
return loginUrl;
}

public void setLoginUrl(String loginUrl) {
this.loginUrl = loginUrl;
}
}


public static class CatalogueServer {

private boolean enableAutoImport = false;
Expand Down

This file was deleted.

Loading
Loading