Merge pull request #143 from FusionAuth/degroff/ENG-3075/vend_restrictions

degroff/eng 3075/vend restrictions

Author: robotdan

src/main/java/io/fusionauth/domain/GroupMember.java

@@ -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.
@@ -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
@@ -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
@@ -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

src/main/java/io/fusionauth/domain/oauth2/GrantType.java

@@ -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.
@@ -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">

src/main/java/io/fusionauth/domain/oauth2/OAuthError.java

@@ -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,