Feat: remove only username and password for iOS

kunder-lab · Sep 1, 2021 · 2f146c2 · 2f146c2
1 parent 500138f
commit 2f146c2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/src/android/cl/kunder/accountmanager/AccountManagerPlugin.java b/src/android/cl/kunder/accountmanager/AccountManagerPlugin.java
@@ -123,7 +123,7 @@ else if (action.equals("addAccount")) {
 
 
         }
-        else if(action.equals("removeAccount")){
+        else if(action.equals("removeAccount") || action.equals("removeUserPassword")){
 
             String accountType = args.getString(0);
             Account [] accounts = accountManager.getAccountsByType(accountType);

diff --git a/src/ios/AccountManagerPlugin.h b/src/ios/AccountManagerPlugin.h
@@ -32,6 +32,7 @@
 - (void) initWithKey:(CDVInvokedUrlCommand*)command;
 - (void) addAccount:(CDVInvokedUrlCommand*)command;
 - (void) removeAccount:(CDVInvokedUrlCommand*)command;
+- (void) removeUserPassword:(CDVInvokedUrlCommand*)command;
 - (void) getUserAccount:(CDVInvokedUrlCommand*)command;
 - (void) getPassword:(CDVInvokedUrlCommand*)command;
 - (void) getDataFromKey:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/AccountManagerPlugin.m b/src/ios/AccountManagerPlugin.m
@@ -75,7 +75,7 @@ - (void) addAccount:(CDVInvokedUrlCommand*)command{
 }
 
 - (void) removeAccount:(CDVInvokedUrlCommand*)command{
-    //Implica eliminar todo el keychain
+    // Implica eliminar todo el keychain
 
     self.MyKeychainWrapper = [[KeychainWrapper alloc]init];
     if([self.MyKeychainWrapper removeAllData]){
@@ -88,6 +88,30 @@ - (void) removeAccount:(CDVInvokedUrlCommand*)command{
     }
 }
 
+- (void) removeUserPassword:(CDVInvokedUrlCommand*)command{
+    NSString *service = (NSString*)[command.arguments objectAtIndex:0];
+    NSString *group = (NSString*)[command.arguments objectAtIndex:1];
+
+    self.MyKeychainWrapper = [[KeychainWrapper alloc]initWithService:service withGroup:group withKey:@"userAccount"];
+    if (![self.MyKeychainWrapper removeData]) {
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString: @"Error al intentar eliminar userAccount del keychain"];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        return;
+    }
+
+    self.MyKeychainWrapper = [[KeychainWrapper alloc]initWithService:service withGroup:group withKey:@"password"];
+    if (![self.MyKeychainWrapper removeData]) {
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString: @"Error al intentar eliminar password del keychain"];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        return;
+    }
+
+    // TODO: Remove unknow userData
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (void) getUserAccount:(CDVInvokedUrlCommand*)command{
     NSString *service = (NSString*)[command.arguments objectAtIndex:0];
     NSString *group = (NSString*)[command.arguments objectAtIndex:1];

diff --git a/www/AccountManager.js b/www/AccountManager.js
@@ -10,10 +10,16 @@ module.exports = (function() {
     cordova.exec(successCallback, errorCallback, 'AccountManagerPlugin', 'addAccount', [userName, password, accountType, group, userData]);
   };
 
+  // For iOS remove all data from keychain. For Android remove all account
   var _removeAccount = function(accountType, successCallback, errorCallback) {
     cordova.exec(successCallback, errorCallback, 'AccountManagerPlugin', 'removeAccount', [accountType]);
   };
 
+  // For iOS only remove user account and password. For Android remove all account
+  var _removeUserPassword = function(accountType, group, successCallback, errorCallback) {
+    cordova.exec(successCallback, errorCallback, 'AccountManagerPlugin', 'removeUserPassword', [accountType, group]);
+  };
+
   var _getUserAccount = function(accountType, group, returnKey, successCallback, errorCallback){
     cordova.exec(successCallback, errorCallback, 'AccountManagerPlugin', 'getUserAccount', [accountType, group, returnKey]);
   };
@@ -44,6 +50,7 @@ module.exports = (function() {
     initWithKey: _initWithKey,
     registerAccount: _addAccount,
     removeAccount: _removeAccount,
+    removeUserPassword: _removeUserPassword,
     getUserAccount: _getUserAccount,
     getPassword: _getPassword,
     getDataFromKey: _getDataFromKey,