Repository: incubator-milagro-mfa-sdk-ios Updated Branches: refs/heads/master e8ae71d4a -> f94d9603f
Implement Destroy method Project: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/commit/d93b7a69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/tree/d93b7a69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/diff/d93b7a69 Branch: refs/heads/master Commit: d93b7a693bd79d793b66ef26cb8b15bbf231f049 Parents: e8ae71d Author: georgi.georgiev <[email protected]> Authored: Wed Nov 2 14:33:27 2016 +0200 Committer: georgi.georgiev <[email protected]> Committed: Wed Nov 2 14:33:27 2016 +0200 ---------------------------------------------------------------------- MPinSDK/MPinSDK.xcodeproj/project.pbxproj | 2 +- src/MPin.h | 5 ++-- src/MPin.mm | 35 +++++++++++++++----------- 3 files changed, 24 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/blob/d93b7a69/MPinSDK/MPinSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/MPinSDK/MPinSDK.xcodeproj/project.pbxproj b/MPinSDK/MPinSDK.xcodeproj/project.pbxproj index 5fb75e9..1a62f5f 100644 --- a/MPinSDK/MPinSDK.xcodeproj/project.pbxproj +++ b/MPinSDK/MPinSDK.xcodeproj/project.pbxproj @@ -173,7 +173,6 @@ children = ( FED0EDD71C68C965001AB531 /* core */, FE991EF51C5F66540014F23E /* Context.h */, - FE991EF61C5F66540014F23E /* Context.mm */, FE991EF71C5F66540014F23E /* def.h */, FE991EF81C5F66540014F23E /* Exceptions.h */, FE991EF91C5F66540014F23E /* HTTPConnector.h */, @@ -222,6 +221,7 @@ FED0EE021C68C984001AB531 /* utils.cpp */, FED0EE031C68C984001AB531 /* utils.h */, FED0EE041C68C984001AB531 /* version.h */, + FE991EF61C5F66540014F23E /* Context.mm */, ); name = core; sourceTree = "<group>"; http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/blob/d93b7a69/src/MPin.h ---------------------------------------------------------------------- diff --git a/src/MPin.h b/src/MPin.h index c1562ec..b9425b6 100644 --- a/src/MPin.h +++ b/src/MPin.h @@ -27,6 +27,7 @@ + (void) initSDK; + (void) initSDKWithHeaders:(NSDictionary *)dictHeaders; ++ (void) Destroy; + (MpinStatus*) TestBackend:(const NSString*)url; + (MpinStatus*) SetBackend:(const NSString*)url; + (MpinStatus*) TestBackend:(const NSString*)url rpsPrefix:(NSString*)rpsPrefix; @@ -60,9 +61,9 @@ + (NSMutableArray*) listUsers; + (NSMutableArray*) listUsers:( NSString *) backendURL; + (NSMutableArray*) listBackends; -+ (SessionDetails *) GetSessionDetails:(NSString *) accessCode; ++ (SessionDetails*) GetSessionDetails:(NSString *) accessCode; -+ ( id<IUser> ) getIUserById:(NSString *) userId; ++ (id<IUser>) getIUserById:(NSString *) userId; + (void) DeleteUser:(const id<IUser>)user; + (NSString *) GetClientParam:(const NSString *) key; http://git-wip-us.apache.org/repos/asf/incubator-milagro-mfa-sdk-ios/blob/d93b7a69/src/MPin.mm ---------------------------------------------------------------------- diff --git a/src/MPin.mm b/src/MPin.mm index 18cec88..f0e15d7 100644 --- a/src/MPin.mm +++ b/src/MPin.mm @@ -38,11 +38,11 @@ typedef sdk_non_tee::Context Context; @implementation MPin /// TEMPORARY FIX -+(NSString * ) getRPSUrl { ++ (NSString*) getRPSUrl { return rpsURL; } -+(void) initSDK { ++ (void) initSDK { if (isInitialized) return; @@ -71,21 +71,26 @@ typedef sdk_non_tee::Context Context; isInitialized = true; } -+(MpinStatus *) TestBackend:(const NSString * ) url { ++ (void) Destroy { + mpin.Destroy(); + isInitialized = false; +} + ++ (MpinStatus*) TestBackend:(const NSString * ) url { [lock lock]; Status s = mpin.TestBackend((url == nil)?(""):([url UTF8String])); [lock unlock]; return [[MpinStatus alloc] initWith:(MPinStatus)s.GetStatusCode() errorMessage:[NSString stringWithUTF8String:s.GetErrorMessage().c_str()]]; } -+(MpinStatus *) SetBackend:(const NSString * ) url { ++ (MpinStatus*) SetBackend:(const NSString * ) url { [lock lock]; Status s = mpin.SetBackend((url == nil)?(""):([url UTF8String])); [lock unlock]; return [[MpinStatus alloc] initWith:(MPinStatus)s.GetStatusCode() errorMessage:[NSString stringWithUTF8String:s.GetErrorMessage().c_str()]]; } -+(MpinStatus *) TestBackend:(const NSString * ) url rpsPrefix:(NSString *) rpsPrefix { ++ (MpinStatus*) TestBackend:(const NSString * ) url rpsPrefix:(NSString *) rpsPrefix { if (rpsPrefix == nil || rpsPrefix.length == 0) { return [MPin TestBackend:url]; } @@ -94,7 +99,7 @@ typedef sdk_non_tee::Context Context; [lock unlock]; return [[MpinStatus alloc] initWith:(MPinStatus)s.GetStatusCode() errorMessage:[NSString stringWithUTF8String:s.GetErrorMessage().c_str()]]; } -+(MpinStatus *) SetBackend:(const NSString * ) url rpsPrefix:(NSString *) rpsPrefix { ++ (MpinStatus*) SetBackend:(const NSString * ) url rpsPrefix:(NSString *) rpsPrefix { if (rpsPrefix == nil || rpsPrefix.length == 0) { return [MPin SetBackend:url]; } @@ -126,22 +131,22 @@ typedef sdk_non_tee::Context Context; return [MPin RestartRegistration:user userData:@""]; } -+ (MpinStatus*)StartRegistration:(const id<IUser>)user activateCode:(NSString *) activateCode { ++ (MpinStatus*) StartRegistration:(const id<IUser>)user activateCode:(NSString *) activateCode { return [MPin StartRegistration:user activateCode:activateCode userData:@""]; } -+ (MpinStatus*)StartRegistration:(const id<IUser>)user userData:(NSString *) userData { ++ (MpinStatus*) StartRegistration:(const id<IUser>)user userData:(NSString *) userData { return [MPin StartRegistration:user activateCode:@"" userData:userData]; } -+ (MpinStatus*)StartRegistration:(const id<IUser>)user activateCode:(NSString *) activateCode userData:(NSString *) userData { ++ (MpinStatus*) StartRegistration:(const id<IUser>)user activateCode:(NSString *) activateCode userData:(NSString *) userData { [lock lock]; Status s = mpin.StartRegistration([((User *) user) getUserPtr], [activateCode UTF8String], [userData UTF8String]); [lock unlock]; return [[MpinStatus alloc] initWith:(MPinStatus)s.GetStatusCode() errorMessage:[NSString stringWithUTF8String:s.GetErrorMessage().c_str()]]; } -+ (MpinStatus*)RestartRegistration:(const id<IUser>)user userData:(NSString *) userData { ++ (MpinStatus*) RestartRegistration:(const id<IUser>)user userData:(NSString *) userData { [lock lock]; Status s = mpin.RestartRegistration([((User *) user) getUserPtr], [userData UTF8String]); [lock unlock]; @@ -161,7 +166,7 @@ typedef sdk_non_tee::Context Context; return [[MpinStatus alloc] initWith:(MPinStatus)s.GetStatusCode() errorMessage:[NSString stringWithUTF8String:s.GetErrorMessage().c_str()]]; } -+ (MpinStatus*)FinishRegistration:(const id<IUser>)user pin:(NSString *) pin { ++ (MpinStatus*) FinishRegistration:(const id<IUser>)user pin:(NSString *) pin { [lock lock]; Status s = mpin.FinishRegistration([((User *) user) getUserPtr], [pin UTF8String]); [lock unlock]; @@ -239,14 +244,14 @@ typedef sdk_non_tee::Context Context; return b; } -+(NSString *) GetClientParam:(const NSString *) key { ++(NSString*) GetClientParam:(const NSString *) key { [lock lock]; String value = mpin.GetClientParam([key UTF8String]); [lock unlock]; return [NSString stringWithUTF8String:value.c_str()]; } -+(NSMutableArray *) listUsers { ++(NSMutableArray*) listUsers { NSMutableArray * users = [NSMutableArray array]; std::vector<UserPtr> vUsers; mpin.ListUsers(vUsers); @@ -256,7 +261,7 @@ typedef sdk_non_tee::Context Context; return users; } -+ (SessionDetails *) GetSessionDetails:(NSString *) accessCode { ++ (SessionDetails*) GetSessionDetails:(NSString *) accessCode { [lock lock]; MPinSDK::SessionDetails sd; Status s = mpin.GetSessionDetails([accessCode UTF8String] , sd); @@ -270,7 +275,7 @@ typedef sdk_non_tee::Context Context; appIconUrl:[NSString stringWithUTF8String:sd.appIconUrl.c_str()]]; } -+ ( id<IUser> ) getIUserById:(NSString *) userId { ++ (id<IUser>) getIUserById:(NSString *) userId { if( userId == nil ) return nil; if ([@"" isEqualToString:userId]) return nil;
