Merge pull request #26 from FusionAuth/rob/issue-1206

issue-1206

Author: robfusion

src/main/java/io/fusionauth/domain/provider/NintendoApplicationConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-2022, 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.
@@ -34,9 +34,18 @@ public class NintendoApplicationConfiguration extends BaseIdentityProviderApplic
   @InternalJSONColumn
   public String client_secret;
 
+  @InternalJSONColumn
+  public String emailClaim = "email";
+
   @InternalJSONColumn
   public String scope;
 
+  @InternalJSONColumn
+  public String uniqueIdClaim = "id";
+
+  @InternalJSONColumn
+  public String usernameClaim = "preferred_username";
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -52,12 +61,15 @@ public boolean equals(Object o) {
     return Objects.equals(buttonText, that.buttonText) &&
            Objects.equals(client_id, that.client_id) &&
            Objects.equals(client_secret, that.client_secret) &&
-           Objects.equals(scope, that.scope);
+           Objects.equals(scope, that.scope) &&
+           Objects.equals(uniqueIdClaim, that.uniqueIdClaim) &&
+           Objects.equals(emailClaim, that.emailClaim) &&
+           Objects.equals(usernameClaim, that.usernameClaim);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), buttonText, client_id, client_secret, scope);
+    return Objects.hash(super.hashCode(), buttonText, client_id, client_secret, scope, uniqueIdClaim, emailClaim, usernameClaim);
   }
 
   @Override

src/main/java/io/fusionauth/domain/provider/NintendoIdentityProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, FusionAuth, All Rights Reserved
+ * Copyright (c) 2021-2022, 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.
@@ -37,9 +37,18 @@ public class NintendoIdentityProvider extends BaseIdentityProvider<NintendoAppli
   @InternalJSONColumn
   public String client_secret;
 
+  @InternalJSONColumn
+  public String emailClaim = "email";
+
   @InternalJSONColumn
   public String scope;
 
+  @InternalJSONColumn
+  public String uniqueIdClaim = "id";
+
+  @InternalJSONColumn
+  public String usernameClaim = "preferred_username";
+
   public NintendoIdentityProvider() {
     linkingStrategy = IdentityProviderLinkingStrategy.CreatePendingLink;
   }
@@ -49,7 +58,7 @@ public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    if (!(o instanceof NintendoIdentityProvider)) {
+    if (o == null || getClass() != o.getClass()) {
       return false;
     }
     if (!super.equals(o)) {
@@ -59,7 +68,10 @@ public boolean equals(Object o) {
     return Objects.equals(buttonText, that.buttonText) &&
            Objects.equals(client_id, that.client_id) &&
            Objects.equals(client_secret, that.client_secret) &&
-           Objects.equals(scope, that.scope);
+           Objects.equals(emailClaim, that.emailClaim) &&
+           Objects.equals(scope, that.scope) &&
+           Objects.equals(uniqueIdClaim, that.uniqueIdClaim) &&
+           Objects.equals(usernameClaim, that.usernameClaim);
   }
 
   @Override
@@ -69,7 +81,7 @@ public IdentityProviderType getType() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), buttonText, client_id, client_secret, scope);
+    return Objects.hash(super.hashCode(), buttonText, client_id, client_secret, emailClaim, scope, uniqueIdClaim, usernameClaim);
   }
 
   public String lookupButtonText(String clientId) {
@@ -88,10 +100,22 @@ public String lookupClientSecret(UUID applicationId) {
     return lookup(() -> client_secret, () -> app(applicationId, app -> app.client_secret));
   }
 
+  public String lookupEmailClaim(UUID applicationId) {
+    return lookup(() -> emailClaim, () -> app(emailClaim, app -> app.emailClaim));
+  }
+
   public String lookupScope(String clientId) {
     return lookup(() -> scope, () -> app(clientId, app -> app.scope));
   }
 
+  public String lookupUniqueIdClaim(UUID applicationId) {
+    return lookup(() -> uniqueIdClaim, () -> app(uniqueIdClaim, app -> app.uniqueIdClaim));
+  }
+
+  public String lookupUsernameClaim(UUID applicationId) {
+    return lookup(() -> usernameClaim, () -> app(usernameClaim, app -> app.usernameClaim));
+  }
+
   @Override
   public boolean postRequestEnabled() {
     return false;