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.

Sign up for GitHub

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

Jump to bottom

fix: Avoid duplicate headers #17

Merged
merged 6 commits into from
Jan 24, 2024
Merged

fix: Avoid duplicate headers #17

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a497a0
#9 HTTP 401 with preflight requests
geoffreyfourmis Jan 19, 2024
2a12c8f
feedback
geoffreyfourmis Jan 19, 2024
b417501
setup should run only once for a request
geoffreyfourmis Jan 20, 2024
79eebe8
Merge remote-tracking branch 'upstream/main'
geoffreyfourmis Jan 20, 2024
d6363c6
setup should run only once for a request
geoffreyfourmis Jan 20, 2024
1b5c4b4
missing copy
geoffreyfourmis Jan 22, 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
10 changes: 9 additions & 1 deletion src/main/java/dev/sultanov/keycloak/multitenancy/resource/AbstractAdminResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@ public abstract class AbstractAdminResource<T extends AdminAuth> {
public AbstractAdminResource(KeycloakSession session) {
this.session = session;
this.realm = session.getContext().getRealm();
setup();
this.setup();
}

protected AbstractAdminResource(AbstractAdminResource<T> parent) {
this.session = parent.session;
this.realm = parent.realm;
this.auth = parent.auth;
this.adminEvent = parent.adminEvent;
this.user = parent.user;
geoffreyfourmis marked this conversation as resolved.
Show resolved Hide resolved
}

private void setup() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/sultanov/keycloak/multitenancy/resource/TenantInvitationsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public class TenantInvitationsResource extends AbstractAdminResource<TenantAdmin

private final TenantModel tenant;

public TenantInvitationsResource(KeycloakSession session, TenantModel tenant) {
super(session);
public TenantInvitationsResource(AbstractAdminResource<TenantAdminAuth> parent, TenantModel tenant) {
super(parent);
this.tenant = tenant;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/sultanov/keycloak/multitenancy/resource/TenantMembershipsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public class TenantMembershipsResource extends AbstractAdminResource<TenantAdmin

private final TenantModel tenant;

public TenantMembershipsResource(KeycloakSession session, TenantModel tenant) {
super(session);
public TenantMembershipsResource(AbstractAdminResource<TenantAdminAuth> parent, TenantModel tenant) {
super(parent);
this.tenant = tenant;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/sultanov/keycloak/multitenancy/resource/TenantResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public class TenantResource extends AbstractAdminResource<TenantAdminAuth> {

private final TenantModel tenant;

public TenantResource(KeycloakSession session, TenantModel tenant) {
super(session);
public TenantResource(AbstractAdminResource<TenantAdminAuth> parent, TenantModel tenant) {
super(parent);
this.tenant = tenant;
}

Expand All @@ -39,11 +39,11 @@ public void deleteTenant() {

@Path("invitations")
public TenantInvitationsResource invitations() {
return new TenantInvitationsResource(session, tenant);
return new TenantInvitationsResource(this, tenant);
}

@Path("memberships")
public TenantMembershipsResource memberships() {
return new TenantMembershipsResource(session, tenant);
return new TenantMembershipsResource(this, tenant);
}
}
2 changes: 1 addition & 1 deletion src/main/java/dev/sultanov/keycloak/multitenancy/resource/TenantsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public TenantResource getTenantResource(@PathParam("tenantId") String tenantId)
if (!auth.isTenantAdmin(model)) {
throw new NotAuthorizedException(String.format("Insufficient permission to access %s", tenantId));
} else {
return new TenantResource(session, model);
return new TenantResource(this, model);
}
}
}
Loading