Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 3 additions & 11 deletions src/main/java/io/fusionauth/domain/GroupMember.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
* Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,12 +38,6 @@ public class GroupMember implements Buildable<GroupMember> {

public ZonedDateTime insertInstant;

/**
* Deprecated since 1.52.0 (Aug 2024). Planned removal by end of 2024
*/
@Deprecated
public User user;

public UUID userId;

@JacksonConstructor
Expand All @@ -56,7 +50,6 @@ public GroupMember(GroupMember member) {
this.id = member.id;
this.insertInstant = member.insertInstant;
this.userId = member.userId;
this.user = member.user == null ? null : new User(member.user);
}

@Override
Expand All @@ -72,13 +65,12 @@ public boolean equals(Object o) {
Objects.equals(groupId, that.groupId) &&
Objects.equals(id, that.id) &&
Objects.equals(insertInstant, that.insertInstant) &&
Objects.equals(userId, that.userId) &&
Objects.equals(user, that.user);
Objects.equals(userId, that.userId);
}

@Override
public int hashCode() {
return Objects.hash(data, groupId, id, insertInstant, userId, user);
return Objects.hash(data, groupId, id, insertInstant, userId);
}

@Override
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/io/fusionauth/domain/event/EventType.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.fusionauth.domain.event;

import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -223,7 +224,9 @@ public String eventName() {

public boolean isInstanceEvent() {
try {
return Class.forName(getClass().getPackage().getName() + "." + name() + "Event").getConstructor().newInstance() instanceof InstanceEvent;
Constructor<?> ctor = Class.forName(getClass().getPackage().getName() + "." + name() + "Event").getDeclaredConstructor();
ctor.setAccessible(true);
return ctor.newInstance() instanceof InstanceEvent;
} catch (Exception ignore) {
}

Expand All @@ -232,7 +235,9 @@ public boolean isInstanceEvent() {

public boolean isTransactionalEvent() {
try {
return !(Class.forName(getClass().getPackage().getName() + "." + name() + "Event").getConstructor().newInstance() instanceof NonTransactionalEvent);
Constructor<?> ctor = Class.forName(getClass().getPackage().getName() + "." + name() + "Event").getDeclaredConstructor();
ctor.setAccessible(true);
return !(ctor.newInstance() instanceof NonTransactionalEvent);
} catch (Exception ignore) {
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/fusionauth/domain/oauth2/GrantType.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
* Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,7 +22,7 @@
import com.fasterxml.jackson.annotation.JsonValue;

/**
* Authorization Grant types as defined by the <a href="https://tools.ietf.org/html/rfc6749">The OAuth 2.0 Authorization
* Authorization Grant types as defined by the <a href="https://tools.ietf.org/html/rfc6749">OAuth 2.0 Authorization
* Framework - RFC 6749</a>.
* <p>
* Specific names as defined by <a href="https://tools.ietf.org/html/rfc7591#section-4.1">
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/io/fusionauth/domain/oauth2/OAuthError.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ public enum OAuthErrorReason {
access_token_required,

refresh_token_not_found,
refresh_token_type_not_supported,
refresh_token_type_not_supported, // Deprecated
id_token_invalid,
unsupported_token_type,
token_type_hint_mismatch,

// Invalid request parameters
invalid_client_id,
Expand Down