Skip to content

Commit 3ceb633

Browse files
committed
Fixes #531
1 parent 70896b3 commit 3ceb633

5 files changed

Lines changed: 28 additions & 6 deletions

File tree

client/src/pages/ApplicationDetail.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ const ApplicationDetail = ({anonymous, refreshUser}) => {
373373
serviceProvider.id,
374374
serviceProvider.type,
375375
manageIdentifierOrg,
376-
null)
376+
message)
377377
.then(() => {
378378
setFlash(I18n.t("applicationConnect.flash.requestConnectionByMember"));
379379
//Because user is an useEffect dependency, everything will reload. Including change requests

client/src/pages/ApplicationOverview.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const ApplicationOverview = ({accessible}) => {
182182
{
183183
key: "vendor",
184184
header: I18n.t("accessibleApps.vendor"),
185-
mapper: entity => entity.name
185+
mapper: entity => entity.vendor
186186
},
187187
{
188188
key: "created",

client/src/pages/Policies.jsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {groupByValues, policyTemplateRegular, policyTemplateStepUp, policyTypes}
1313
import {PolicyForm} from "../policies/PolicyForm.jsx";
1414
import {PolicyOverview} from "../policies/PolicyOverview.jsx";
1515
import PolicyChoiceDialog from "../policies/PolicyChoiceDialog.jsx";
16+
import {mainMenuItems} from "../utils/MenuItems.js";
1617

1718

1819
const Policies = () => {
@@ -71,6 +72,12 @@ const Policies = () => {
7172
if (page === "details" && !isEmpty(policyId)) {
7273
toPolicyDetail(policyId, res);
7374
}
75+
useAppStore.setState({
76+
breadcrumbPaths: [
77+
{path: "/home", value: I18n.t("breadCrumb.access"), menuItemName: mainMenuItems.home},
78+
{value: I18n.t("navigation.policies")}
79+
]
80+
});
7481
setLoading(false);
7582
}).catch(() => {
7683
navigate("/home")

server/src/main/java/access/api/IdentityProviderController.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import access.manage.RequestType;
1313
import access.model.Authority;
1414
import access.model.ConnectionRequest;
15+
import access.model.DisconnectionRequest;
1516
import access.model.EntityType;
1617
import access.model.Environment;
1718
import access.model.Organization;
@@ -180,17 +181,17 @@ public ResponseEntity<Map<String, Object>> connect(User user, @RequestBody @Vali
180181
}
181182

182183
@PutMapping({"/disconnect"})
183-
public ResponseEntity<Map<String, Object>> disconnect(User user, @RequestBody @Validated ConnectionRequest connectionRequest) {
184+
public ResponseEntity<Map<String, Object>> disconnect(User user, @RequestBody @Validated DisconnectionRequest disconnectionRequest) {
184185
LOG.debug("/disconnect SP to IdP request by " + user.getEmail());
185186

186187
user = reinitializeUser(user, userRepository);
187188

188-
String idpManageIdentifier = connectionRequest.getIdpManageIdentifier();
189+
String idpManageIdentifier = disconnectionRequest.getIdpManageIdentifier();
189190
Organization organization = organizationRepository.findByManageIdentifier(idpManageIdentifier)
190191
.orElseThrow(() -> new NotFoundException("Organization with manageIdentifier not found: " + idpManageIdentifier));
191192

192-
Map<String, Object> serviceProvider = manage.providerById(connectionRequest.getEntityType(),
193-
connectionRequest.getApplicationManageIdentifier(), Environment.PROD);
193+
Map<String, Object> serviceProvider = manage.providerById(disconnectionRequest.getEntityType(),
194+
disconnectionRequest.getApplicationManageIdentifier(), Environment.PROD);
194195

195196
confirmOrganizationMembership(user, organization, Authority.ADMIN);
196197
Map<String, Object> identityProvider = manage.providerById(EntityType.saml20_idp, idpManageIdentifier, Environment.PROD);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package access.model;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
import lombok.Setter;
7+
8+
import java.io.Serializable;
9+
10+
@AllArgsConstructor
11+
@NoArgsConstructor
12+
public class DisconnectionRequest extends ConnectionRequest {
13+
14+
}

0 commit comments

Comments
 (0)