Merge pull request #70 from olgadanylova/BKNDLSS-14170

the restore password method which takes IResponder argument removed
Backendless · Mar 31, 2017 · ac81329 · ac81329
2 parents a03bfbd + 299bdef
commit ac81329
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 14 deletions.
diff --git a/SDK/backendlessAPI/Classes/UserService/UserService.h b/SDK/backendlessAPI/Classes/UserService/UserService.h
@@ -57,7 +57,6 @@
 
 // async methods with responder
 -(void)findById:(NSString *)objectId responder:(id <IResponder>)responder;
--(void)restorePassword:(NSString *)login responder:(id <IResponder>)responder;
 -(void)describeUserClass:(id <IResponder>)responder;
 -(void)user:(NSString *)user assignRole:(NSString *)role responder:(id <IResponder>)responder;
 -(void)user:(NSString *)user unassignRole:(NSString *)role responder:(id <IResponder>)responder;

diff --git a/SDK/backendlessAPI/Classes/UserService/UserService.m b/SDK/backendlessAPI/Classes/UserService/UserService.m
@@ -388,15 +388,6 @@ -(void)findById:(NSString *)objectId responder:(id <IResponder>)responder {
     [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_FIND_BY_ID args:args responder:responder];
 }
 
--(void)restorePassword:(NSString *)login responder:(id <IResponder>)responder {
-
-    if (!login||!login.length)
-        return [responder errorHandler:FAULT_NO_USER_CREDENTIALS];
-
-    NSArray *args = [NSArray arrayWithObjects:login, nil];
-    [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_RESTORE_PASSWORD args:args responder:responder];
-}
-
 -(void)describeUserClass:(id <IResponder>)responder {
     [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_DESCRIBE_USER_CLASS args:@[] responder:responder];
 }
@@ -549,7 +540,11 @@ -(void)isValidUserToken:(void(^)(NSNumber *))responseBlock error:(void(^)(Fault
 }
 
 -(void)restorePassword:(NSString *)login response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
-    [self restorePassword:login responder:[ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock]];
+    id<IResponder>responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
+    if (!login||!login.length)
+        return [responder errorHandler:FAULT_NO_USER_CREDENTIALS];    
+    NSArray *args = [NSArray arrayWithObjects:login, nil];
+    [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_RESTORE_PASSWORD args:args responder:responder];
 }
 
 -(void)describeUserClass:(void(^)(NSArray<UserProperty*> *))responseBlock error:(void(^)(Fault *))errorBlock {

diff --git a/SDK/ios/backendless/backendless.a b/SDK/ios/backendless/backendless.a
diff --git a/SDK/ios/backendless/include/UserService.h b/SDK/ios/backendless/include/UserService.h
@@ -57,7 +57,6 @@
 
 // async methods with responder
 -(void)findById:(NSString *)objectId responder:(id <IResponder>)responder;
--(void)restorePassword:(NSString *)login responder:(id <IResponder>)responder;
 -(void)describeUserClass:(id <IResponder>)responder;
 -(void)user:(NSString *)user assignRole:(NSString *)role responder:(id <IResponder>)responder;
 -(void)user:(NSString *)user unassignRole:(NSString *)role responder:(id <IResponder>)responder;

diff --git a/SDK/lib/backendless/backendless.a b/SDK/lib/backendless/backendless.a
diff --git a/SDK/lib/backendless/include/UserService.h b/SDK/lib/backendless/include/UserService.h
@@ -57,7 +57,6 @@
 
 // async methods with responder
 -(void)findById:(NSString *)objectId responder:(id <IResponder>)responder;
--(void)restorePassword:(NSString *)login responder:(id <IResponder>)responder;
 -(void)describeUserClass:(id <IResponder>)responder;
 -(void)user:(NSString *)user assignRole:(NSString *)role responder:(id <IResponder>)responder;
 -(void)user:(NSString *)user unassignRole:(NSString *)role responder:(id <IResponder>)responder;

diff --git a/SDK/osx/backendless/include/UserService.h b/SDK/osx/backendless/include/UserService.h
@@ -57,7 +57,6 @@
 
 // async methods with responder
 -(void)findById:(NSString *)objectId responder:(id <IResponder>)responder;
--(void)restorePassword:(NSString *)login responder:(id <IResponder>)responder;
 -(void)describeUserClass:(id <IResponder>)responder;
 -(void)user:(NSString *)user assignRole:(NSString *)role responder:(id <IResponder>)responder;
 -(void)user:(NSString *)user unassignRole:(NSString *)role responder:(id <IResponder>)responder;

diff --git a/SDK/osx/backendless/libbackendless-mac.a b/SDK/osx/backendless/libbackendless-mac.a