See #11. Almost completed Authentication implementation.

Wrote Unit tests (See #13).
Streamlyne · Jul 16, 2014 · 723b048 · 723b048
1 parent 7ae4067
commit 723b048
Show file tree

Hide file tree

Showing 9 changed files with 325 additions and 909 deletions.
diff --git a/Common/Nodes/SLAsset.m b/Common/Nodes/SLAsset.m
@@ -19,4 +19,9 @@ @implementation SLAsset
 @dynamic serial;
 @dynamic attributes;
 
++ (NSString *) type
+{
+    return @"asset";
+}
+
 @end
diff --git a/Common/Nodes/SLUser.h b/Common/Nodes/SLUser.h
@@ -26,16 +26,16 @@
 /**
  
  */
-+ (void) registerUser:(SLUser *)theUser
-     withOrganization:(SLOrganization *)theOrg
-         withCallback:(SLSuccessCallback)theCallback;
-
-+ (void) registerUserWithEmail:(NSString *)email
-                  withPassword:(NSString *)password
-                  withJobTitle:(NSString *)jobTitle
-                 withFirstName:(NSString *)firstName
-                  withLastName:(NSString *)lastName
-              withOrganization:(SLOrganization *)theOrg
-                  withCallback:(SLSuccessCallback)theCallback;
+//+ (void) registerUser:(SLUser *)theUser
+//     withOrganization:(SLOrganization *)theOrg
+//         withCallback:(SLSuccessCallback)theCallback;
+//
+//+ (void) registerUserWithEmail:(NSString *)email
+//                  withPassword:(NSString *)password
+//                  withJobTitle:(NSString *)jobTitle
+//                 withFirstName:(NSString *)firstName
+//                  withLastName:(NSString *)lastName
+//              withOrganization:(SLOrganization *)theOrg
+//                  withCallback:(SLSuccessCallback)theCallback;
 
 @end
diff --git a/Common/Nodes/SLUser.m b/Common/Nodes/SLUser.m
@@ -37,39 +37,39 @@ + (NSDictionary *) attributeMappings
     [attrMap setValue:@"dateDue" forKey:@"date_due"];
     return [NSDictionary dictionaryWithDictionary: attrMap];
 }
-
-+ (void) registerUser:(SLUser *)theUser withOrganization:(SLOrganization *)theOrg withCallback:(SLSuccessCallback)theCallback
-{
-    /*
-    SLRequestCallback completionBlock = ^(NSError *error, id operation, id responseObject) {
-        //NSLog(@"SLRequestCallback completionBlock!");
-        //NSLog(@"<%@>: %@", [responseObject class], responseObject);
-        theCallback ? theCallback(true) : nil;
-    };
-     */
-    SLRelationship *rel = [[SLRelationship alloc] initWithName:@"member" withStartNode:theUser withEndNode:theOrg];
-    [theUser pushWithAPIManager:[SLAPIManager sharedManager] withCallback:theCallback];
-}
-
-
-+ (void) registerUserWithEmail:(NSString *)email
-                  withPassword:(NSString *)password
-                  withJobTitle:(NSString *)jobTitle
-                 withFirstName:(NSString *)firstName
-                  withLastName:(NSString *)lastName
-              withOrganization:(SLOrganization *)theOrg
-                  withCallback:(SLSuccessCallback)theCallback
-{
-    NSDictionary *data = @{
-                           @"email": email,
-                           @"password": password,
-                           @"job_title": jobTitle,
-                           @"name_first": firstName,
-                           @"name_last": lastName
-                       };
-    SLUser *newUser = [SLUser createWithData:data
-                                    withRels:(NSArray *)@[]];
-    [[self class] registerUser:newUser withOrganization:theOrg withCallback:theCallback];
-}
+//
+//+ (void) registerUser:(SLUser *)theUser withOrganization:(SLOrganization *)theOrg withCallback:(SLSuccessCallback)theCallback
+//{
+//    /*
+//    SLRequestCallback completionBlock = ^(NSError *error, id operation, id responseObject) {
+//        //NSLog(@"SLRequestCallback completionBlock!");
+//        //NSLog(@"<%@>: %@", [responseObject class], responseObject);
+//        theCallback ? theCallback(true) : nil;
+//    };
+//     */
+//    SLRelationship *rel = [[SLRelationship alloc] initWithName:@"member" withStartNode:theUser withEndNode:theOrg];
+//    [theUser pushWithAPIManager:[SLAPIManager sharedManager] withCallback:theCallback];
+//}
+//
+//
+//+ (void) registerUserWithEmail:(NSString *)email
+//                  withPassword:(NSString *)password
+//                  withJobTitle:(NSString *)jobTitle
+//                 withFirstName:(NSString *)firstName
+//                  withLastName:(NSString *)lastName
+//              withOrganization:(SLOrganization *)theOrg
+//                  withCallback:(SLSuccessCallback)theCallback
+//{
+//    NSDictionary *data = @{
+//                           @"email": email,
+//                           @"password": password,
+//                           @"job_title": jobTitle,
+//                           @"name_first": firstName,
+//                           @"name_last": lastName
+//                       };
+//    SLUser *newUser = [SLUser createWithData:data
+//                                    withRels:(NSArray *)@[]];
+//    [[self class] registerUser:newUser withOrganization:theOrg withCallback:theCallback];
+//}
 
 @end
diff --git a/Common/SLAPIManager.h b/Common/SLAPIManager.h
@@ -35,6 +35,18 @@ typedef NS_ENUM(NSUInteger, SLHTTPMethodType)
 @property (strong, nonatomic, setter=setPassword:) NSString *userPassword;
 @property (strong, nonatomic, setter=setOrganization:) NSString *userOrganization;
 
+
+/**
+ 
+ */
++(NSString *) sha1:(NSString *)plainText;
+
+/**
+ 
+ */
++(NSString *)hmac:(NSString *)plainText withSecret:(NSString *)key;
+
+
 /**
  Host for creating URL.
  See https://developer.apple.com/library/Mac/documentation/Cocoa/Reference/Foundation/Classes/NSURL_Class/Reference/Reference.html#jumpTo_31 for more details.
@@ -46,11 +58,6 @@ typedef NS_ENUM(NSUInteger, SLHTTPMethodType)
  */
 + (instancetype) sharedManager;
 
-/**
- 
- */
-- (void) setBaseURL:(NSURL *)theBaseURL;
-
 /**
  Set the Email.
  */
@@ -86,13 +93,4 @@ typedef NS_ENUM(NSUInteger, SLHTTPMethodType)
                   withOrganization:(NSString *)theOrganization;
 
 
-///**
-// Authenticate with user credentials.
-// @param theEmail    The user's email.
-// @param thePassword The passsword.
-// */
-//- (void) authenticateWithUser:(SLUser *)theUser
-//                 withCallback:(SLSuccessCallback)theCallback DEPRECATED_ATTRIBUTE;
-
-
 @end