diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d0de3f67..2aa04b23 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -155,6 +155,7 @@ jobs: uses: ardalanamini/auto-changelog@v3 with: default-commit-type: New Features + github-token: ${{ github.token }} if: github.event_name != 'workflow_dispatch' - name: Create release @@ -165,6 +166,7 @@ jobs: prerelease: true release_name: Release ${{ github.ref_name }} tag_name: ${{ github.ref_name }} + github-token: ${{ github.token }} body: | ${{ steps.changelog.outputs.changelog }} env: diff --git a/server/src/main/java/access/model/User.java b/server/src/main/java/access/model/User.java index 8e9a76d4..3213f5a7 100644 --- a/server/src/main/java/access/model/User.java +++ b/server/src/main/java/access/model/User.java @@ -74,10 +74,6 @@ public class User implements Serializable, Provisionable { @OneToMany(mappedBy = "user", orphanRemoval = true, fetch = FetchType.EAGER, cascade = CascadeType.ALL) private Set userRoles = new HashSet<>(); - @OneToMany(mappedBy = "user", orphanRemoval = true, fetch = FetchType.LAZY, cascade = CascadeType.ALL) - @JsonIgnore - private Set remoteProvisionedUsers = new HashSet<>(); - @Transient private List> applications = Collections.emptyList(); diff --git a/server/src/main/java/access/voot/VootController.java b/server/src/main/java/access/voot/VootController.java index ef75f185..e7536f3c 100644 --- a/server/src/main/java/access/voot/VootController.java +++ b/server/src/main/java/access/voot/VootController.java @@ -1,6 +1,5 @@ package access.voot; -import access.aggregation.AttributeAggregatorController; import access.model.Role; import access.model.User; import access.model.UserRole;