@falconeta/capacitor-aws-amplify 0.0.15 → 0.0.16

package/android/src/main/java/com/capacitor/aws/amplify/AwsAmplify.java

@@ -37,10 +37,17 @@ import java.util.Objects;
 import java.util.function.Consumer;
 
 public class AwsAmplify {
-
+  boolean isLoaded;
   @RequiresApi(api = Build.VERSION_CODES.N)
   public void load(JSObject cognitoConfig, Context context, @NonNull Consumer onSuccess, @NonNull Consumer<Exception> onError) {
 
+
+    if (isLoaded) {
+      onSuccess.accept(null);
+      return;
+    }
+    isLoaded = true;
+
     JSObject oauth = (JSObject) cognitoConfig.getJSObject("oauth");
 
     try {
@@ -187,6 +194,31 @@ public class AwsAmplify {
       });
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.N)
+  public void getUserAttributes(@Nullable Consumer<JSObject> onSuccess,
+                               @Nullable Consumer<Exception> onError) {
+    fetchUserAttributesInternal(
+      userAttributes -> {
+          JSObject ret = new JSObject();
+          ret.put("status", 0);
+          ret.put("userAttributes", userAttributes);
+          onSuccess.accept(ret);
+      },
+      error -> {
+        if (onError != null) {
+          String message = error.getMessage();
+          String suggestion = error.getRecoverySuggestion();
+          Throwable cause = error.getCause();
+          JSObject ret = new JSObject();
+          ret.put("status", -1);
+          if (AuthException.SignedOutException.class.isInstance(error)) {
+            ret.put("status", -3);
+          }
+          onSuccess.accept(ret);
+        }
+      });
+  }
+
   @RequiresApi(api = Build.VERSION_CODES.N)
   private void fetchSessionInternal(@Nullable Consumer<AwsAuthSession> onSuccess,
                                     @Nullable Consumer<AuthException> onError) {
@@ -237,6 +269,27 @@ public class AwsAmplify {
       });
   }
 
+  @RequiresApi(api = Build.VERSION_CODES.N)
+  private void fetchUserAttributesInternal(@Nullable Consumer<JSObject> onSuccess,
+                                    @Nullable Consumer<AuthException> onError) {
+    Amplify.Auth.fetchUserAttributes(
+      attributes -> {
+        var userAttributes = new JSObject();
+        attributes.forEach(attribute -> {
+          userAttributes.put(attribute.getKey().getKeyString(), attribute.getValue());
+        });
+
+        onSuccess.accept(userAttributes);
+      },
+      error -> {
+//        Log.e(TAG, "Session error: ", error);
+
+        if (onError != null) {
+          onError.accept(error);
+        }
+      });
+  }
+
   private AwsAuthSession getSessionInternal() {
     try {
       AWSMobileClient mClient = AWSMobileClient.getInstance();

package/android/src/main/java/com/capacitor/aws/amplify/AwsAmplifyPlugin.java

@@ -64,4 +64,15 @@ public class AwsAmplifyPlugin extends Plugin {
         call.reject(error.toString());
       });
   }
+
+  @RequiresApi(api = Build.VERSION_CODES.N)
+  @PluginMethod
+  public void getUserAttributes(PluginCall call) {
+
+    implementation.getUserAttributes(
+      result -> call.resolve(result),
+      error -> {
+        call.reject(error.toString());
+      });
+  }
 }

package/ios/Plugin/AwsAmplify.swift

@@ -184,6 +184,43 @@ import AWSMobileClient
         }
     }
     
+    public func getUserAttributes(
+        onSuccess: @escaping (JSObject) -> (),
+        onError: @escaping (any Error) -> ()
+    ) {
+        var ret: JSObject = [:]
+        Amplify.Auth.fetchUserAttributes { result in
+            do {
+                let attributes = try result.get()
+                
+                var userAttributes: JSObject = [:]
+                
+                attributes.forEach { attribute in
+                    userAttributes[attribute.key.rawValue] = attribute.value
+                }
+                ret["userAttributes"] = userAttributes
+                ret["status"] = 0
+                
+                print("\(self.TAG) - Fetch user attributes successfully")
+                onSuccess(ret)
+            } catch {
+                ret["status"] = -1
+                if let authError = error as? AuthError
+                    {
+                    let cognitoAuthError = authError
+                    switch cognitoAuthError {
+                    case .signedOut:
+                        ret["status"] = -3
+                    default:
+                        ret["status"] = -1
+                    }
+                }
+                onSuccess(ret)
+                print("\(self.TAG) Fetch user attributes failed with error - \(error)")
+            }
+        }
+    }
+    
     public func getCurrentUser() -> AuthUser {
         return Amplify.Auth.getCurrentUser()!
     }

package/ios/Plugin/AwsAmplifyPlugin.swift

@@ -94,6 +94,17 @@ public class AwsAmplifyPlugin: CAPPlugin {
                         call.reject(error.localizedDescription)
                     })
     }
+    
+    @objc func getUserAttributes(_ call: CAPPluginCall) {
+
+       self.implementation.getUserAttributes(
+                    onSuccess: {session in
+                        call.resolve(session)
+                    },
+                    onError: {error in
+                        call.reject(error.localizedDescription)
+                    })
+    }
 
     // var permissionCallID: String?
     // var locationManager: CLLocationManager?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@falconeta/capacitor-aws-amplify",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "plugin that handle amplify features",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",