test(DataStore): Update schemas for use 'sub' as default identity claim feature

aws-api-appsync/src/test/java/com/amplifyframework/api/aws/SelectionSetTest.java

@@ -120,7 +120,8 @@ public void ownerFieldAddedForImplicitOwnerAuthWhenUsingSchema() throws AmplifyE
             .fields(fields)
             .authRules(Collections.singletonList(AuthRule.builder()
                 .authStrategy(AuthStrategy.OWNER)
-                .identityClaim("cognito:username")
+                .identityClaim("sub")
+                .authProvider(AuthStrategy.Provider.USER_POOLS)
                 .ownerField("owner")
                 .operations(Arrays.asList(
                     ModelOperation.CREATE,

aws-api-appsync/src/test/java/com/amplifyframework/api/aws/auth/MultiAuthorizationTypeIteratorTest.java

@@ -32,7 +32,7 @@
 import static org.junit.Assert.assertEquals;
 
 public class MultiAuthorizationTypeIteratorTest {
-    private static final String DEFAULT_ID_CLAIM = "cognito:username";
+    private static final String DEFAULT_ID_CLAIM = "sub";
     private static final String DEFAULT_OWNER_FIELD = "owner";
     private static final String DEFAULT_GROUP_CLAIM = "cognito:groups";
     private static final String DEFAULT_GROUP_FIELD = "groups";

core/src/main/java/com/amplifyframework/core/model/AuthRule.java

@@ -126,18 +126,18 @@ public String getOwnerFieldOrDefault() {
      * Used to specify a custom claim.
      * Defaults to "username" when using AuthStrategy.OWNER.
      *
-     * Note: An older version of the CLI incorrectly generated a value of "cognito:username"
+     * Note: An older version of the CLI incorrectly generated a value of "sub"
      * so we also check for this value and convert it to the proper default of "username" for 
      * backwards compatibility.
      *
      * @return identity claim
      */
     @NonNull
     public String getIdentityClaimOrDefault() {
-        final String cliGeneratedIdentityClaim = "cognito:username";
-        return Empty.check(identityClaim) || cliGeneratedIdentityClaim.equals(identityClaim)
-            ? DEFAULT_IDENTITY_CLAIM
-            : identityClaim;
+        final String cliGeneratedIdentityClaim = "sub";
+        return cliGeneratedIdentityClaim.equals(identityClaim)
+            ? identityClaim
+            : DEFAULT_IDENTITY_CLAIM;
     }
 
     /**

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/OwnerPrivatePublicUPIAMAPIPost.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerPrivatePublicUPIAMAPIPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerPrivatePublicUPIAMAPIPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
   @AuthRule(allow = AuthStrategy.PRIVATE, provider = "iam", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
   @AuthRule(allow = AuthStrategy.PUBLIC, provider = "apiKey", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/OwnerPrivateUPIAMPost.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerPrivateUPIAMPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerPrivateUPIAMPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
   @AuthRule(allow = AuthStrategy.PRIVATE, provider = "iam", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class OwnerPrivateUPIAMPost implements Model {

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/OwnerPublicUPAPIPost.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerPublicUPAPIPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerPublicUPAPIPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
   @AuthRule(allow = AuthStrategy.PUBLIC, provider = "apiKey", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class OwnerPublicUPAPIPost implements Model {

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/OwnerPublicUPIAMPost.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerPublicUPIAMPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerPublicUPIAMPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }),
   @AuthRule(allow = AuthStrategy.PUBLIC, provider = "iam", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class OwnerPublicUPIAMPost implements Model {

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/OwnerUPPost.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerUPPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerUPPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class OwnerUPPost implements Model {
   public static final QueryField ID = field("OwnerUPPost", "id");

testmodels/src/main/java/com/amplifyframework/testmodels/multiauth/PrivatePublicComboUPPost.java

@@ -37,7 +37,7 @@
 /** This is an auto generated class representing the PrivatePublicComboUPPost type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "PrivatePublicComboUPPosts", authRules = {
-  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
+  @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class PrivatePublicComboUPPost implements Model {
   public static final QueryField ID = field("PrivatePublicComboUPPost", "id");

testmodels/src/main/java/com/amplifyframework/testmodels/ownerauth/OwnerAuth.java

@@ -38,7 +38,7 @@
         @AuthRule(
             allow = AuthStrategy.OWNER,
             ownerField = "owner",
-            identityClaim = "cognito:username",
+            identityClaim = "sub",
             operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }
         )
 })

testmodels/src/main/java/com/amplifyframework/testmodels/ownerauth/OwnerAuthExplicit.java

@@ -35,7 +35,7 @@
 /** This is an auto generated class representing the OwnerAuthExplicit type in your schema. */
 @SuppressWarnings("all")
 @ModelConfig(pluralName = "OwnerAuthExplicits", authRules = {
-        @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "cognito:username", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
+        @AuthRule(allow = AuthStrategy.OWNER, ownerField = "owner", identityClaim = "sub", provider = "userPools", operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ })
 })
 public final class OwnerAuthExplicit implements Model {
     public static final QueryField ID = field("id");

testmodels/src/main/java/com/amplifyframework/testmodels/ownerauth/OwnerAuthNonDefaultProvider.java

@@ -39,7 +39,7 @@
             allow = AuthStrategy.OWNER,
             provider = "oidc",
             ownerField = "owner",
-            identityClaim = "cognito:username",
+            identityClaim = "sub",
             operations = { ModelOperation.CREATE, ModelOperation.UPDATE, ModelOperation.DELETE, ModelOperation.READ }
         )
 })