Login working

- SKSession fills out correctly
- [SKThing unknownJSONKeys] works flawlessly :)

Example/SnapchatKit-OSX/SnapchatKit-OSX/main.m

@@ -217,10 +217,13 @@ int main(int argc, const char * argv[]) {
         // Cannot seem to "solve" a captcha.
         //        registerAccount(@"[email protected]", @"12345678h", @"1995-08-01");
 
-        [SKClient sharedClient].casperAPIKey = kCasperAPIKey;
+#ifdef TB_LOGIN
+        [SKClient sharedClient].casperAPIKey    = kCasperAPIKey;
         [SKClient sharedClient].casperAPISecret = kCasperAPISecret;
+        [SKClient sharedClient].casperUserAgent = kCasperUserAgent;
+#endif
 
-        [[SKClient sharedClient] signInWithUsername:kUsername password:kPassword gmail:kGmail gpass:kGmailPassword completion:^(NSDictionary *dict, NSError *error) {
+        [[SKClient sharedClient] signInWithUsername:kUsername password:kPassword completion:^(NSDictionary *dict, NSError *error) {
             if (!error) {
                 SKSession *session = [SKClient sharedClient].currentSession;
                 [dict writeToFile:[directory stringByAppendingPathComponent:@"current-session.plist"] atomically:YES];

Pod/Classes/Categories/NSDictionary+SnapchatKit.h

@@ -24,4 +24,6 @@
 
 - (NSArray *)allKeyPaths;
 
-@end
+@end
+
+#define SKMergeDictionaries(a, b) [a dictionaryByReplacingValuesForKeys: b]

Pod/Classes/Categories/NSDictionary+SnapchatKit.m

@@ -42,10 +42,8 @@ - (NSDictionary *)dictionaryByReplacingValuesForKeys:(NSDictionary *)dictionary
     if (!dictionary || !dictionary.allKeys.count || !self) return self;
 
     NSMutableDictionary *m = self.mutableCopy;
-    for (NSString *key in dictionary.allKeys)
-        m[key] = dictionary[key];
-
-    return m;
+    [m setValuesForKeysWithDictionary:dictionary];
+    return m.copy;
 }
 
 - (NSDictionary *)dictionaryByReplacingKeysWithNewKeys:(NSDictionary *)oldKeysToNewKeys {

Pod/Classes/Model/SKConversation.m

@@ -88,6 +88,16 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"pendingRecievedSnaps": @"pending_received_snaps"};
 }
 
++ (NSArray *)ignoredJSONKeyPathPrefixes {
+    static NSArray *ignored = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        ignored = @[@"conversation_state", @"last_snap", @"conversation_messages.messaging_auth"];
+    });
+
+    return ignored;
+}
+
 MTLTransformPropertyDate(lastInteraction)
 MTLTransformPropertyDate(lastNotified)
 MTLTransformPropertyDate(lastChatRead)

Pod/Classes/Model/SKMessage.m

@@ -98,6 +98,16 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"type": @"chat_message.type"};
 }
 
++ (NSArray *)ignoredJSONKeyPathPrefixes {
+    static NSArray *ignored = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        ignored = @[@"chat_message.saved_state", @"chat_message.preservations"];
+    });
+
+    return ignored;
+}
+
 + (NSValueTransformer *)messageKindJSONTransformer {
     return [MTLValueTransformer transformerUsingForwardBlock:^id(NSString *type, BOOL *success, NSError *__autoreleasing *error) {
         return @(SKMessageKindFromString(type));

Pod/Classes/Model/SKRequest.h

@@ -58,23 +58,14 @@
  This method will replace all ekeys in a request query with the given values in \c endpoints. */
 + (void)overrideEndpoints:(NSDictionary *)endpoints;
 
-/**
- @param endpoint The endpoint of the request relative to the base URL.
- @param json The parameters for the request.
- @param gauth Optional parameter set to the X-Snapchat-Client-Auth-Token header field.
- @param token The Snapchat auth token returned from logging in. Used to set the req_token parameter for requests.
- */
-+ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json gauth:(NSString *)gauth token:(NSString *)token callback:(RequestBlock)callback;
-
 /**
  @param endpoint The endpoint of the request relative to the base URL.
  @param json The parameters for the request.
  @param httpHeaders Optional. Sets the corresponding header fields.
- @param token The Snapchat auth token returned from logging in. Used to set the req_token parameter for requests.
  */
-+ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json headers:(NSDictionary *)httpHeaders token:(NSString *)token callback:(RequestBlock)callback;
++ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json headers:(NSDictionary *)httpHeaders callback:(RequestBlock)callback;
 
-+ (void)get:(NSString *)endpoint callback:(RequestBlock)callback;
++ (void)get:(NSString *)endpoint headers:(NSDictionary *)httpHeaders callback:(RequestBlock)callback;
 
 + (void)sendEvents:(NSDictionary *)eventData callback:(RequestBlock)callback;
 
@@ -89,11 +80,10 @@
  - Content-Type
  
  @param endpoint The endpoint to post to. Example: @"/loq/login"
- @param token The token to use to generate the req_token query parameter. Defaults to kStaticToken.
  @param params The JSON key-value mapping parameters of the request. Example: ?foo=bar would be @{@"foo": @"bar"}
  @param httpHeaders Additional HTTP header fields to set or override. This parameter may be nil.
  */
-- (id)initWithPOSTEndpoint:(NSString *)endpoint token:(NSString *)token query:(NSDictionary *)params headers:(NSDictionary *)httpHeaders ts:(NSString *)timestamp;
+- (id)initWithPOSTEndpoint:(NSString *)endpoint query:(NSDictionary *)params headers:(NSDictionary *)httpHeaders;
 
 
 /**

Pod/Classes/Model/SKRequest.m

@@ -87,24 +87,19 @@ + (NSError *)unknownError {
 
 #pragma mark POST / GET
 
-+ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json gauth:(NSString *)gauth token:(NSString *)token callback:(RequestBlock)callback {
-    NSDictionary *headers = @{SKHeaders.clientAuthToken: [NSString stringWithFormat:@"Bearer %@", gauth]};
-    [self postTo:endpoint query:json headers:headers token:token callback:callback];
-}
-
-+ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json headers:(NSDictionary *)httpHeaders token:(NSString *)token callback:(RequestBlock)callback {
++ (void)postTo:(NSString *)endpoint query:(NSDictionary *)json headers:(NSDictionary *)httpHeaders callback:(RequestBlock)callback {
     NSParameterAssert(endpoint); NSParameterAssert(callback);
 
-    SKRequest *request = [[SKRequest alloc] initWithPOSTEndpoint:endpoint token:token query:json headers:httpHeaders ts:nil];
+    SKRequest *request = [[SKRequest alloc] initWithPOSTEndpoint:endpoint query:json headers:httpHeaders];
 
     NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
     NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:callback];
     [dataTask resume];
 }
 
-+ (void)get:(NSString *)endpoint callback:(RequestBlock)callback {
++ (void)get:(NSString *)endpoint headers:(NSDictionary *)httpHeaders callback:(RequestBlock)callback {
     NSParameterAssert(endpoint); NSParameterAssert(callback);
-    SKRequest *request = [[SKRequest alloc] initWithGETEndpoint:endpoint headers:nil];
+    SKRequest *request = [[SKRequest alloc] initWithGETEndpoint:endpoint headers:httpHeaders];
 
     NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
     NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:callback];
@@ -140,8 +135,8 @@ - (id)initWithHeaderFields:(NSDictionary *)httpHeaders {
     return self;
 }
 
-- (id)initWithPOSTEndpoint:(NSString *)endpoint token:(NSString *)token query:(NSDictionary *)params headers:(NSDictionary *)httpHeaders ts:(NSString *)timestamp {
-    if (!token) token = SKConsts.staticToken;
+- (id)initWithPOSTEndpoint:(NSString *)endpoint query:(NSDictionary *)params headers:(NSDictionary *)httpHeaders {
+    NSParameterAssert(params[@"timestamp"]);
     httpHeaders = SKRequestApplyHeaderOverrides(httpHeaders, endpoint);
 
     self = [self initWithHeaderFields:httpHeaders];
@@ -152,11 +147,7 @@ - (id)initWithPOSTEndpoint:(NSString *)endpoint token:(NSString *)token query:(N
         self.HTTPMethod = @"POST";
 
         NSMutableDictionary *json = [params mutableCopy];
-        if (!timestamp) timestamp = [NSString timestamp];
-
-        // HTTP body
-        if (!json[@"req_token"]) json[@"req_token"] = [NSString hashSCString:token and:timestamp];
-        if (!json[@"timestamp"]) json[@"timestamp"] = @([timestamp longLongValue]);
+        NSString *timestamp = params[@"timestamp"];
 
         // Set HTTPBody
         // Only for uploading snaps here
@@ -176,7 +167,7 @@ - (id)initWithPOSTEndpoint:(NSString *)endpoint token:(NSString *)token query:(N
 
             self.HTTPBody = body;
         } else {
-            self.HTTPBody     = [[NSString queryStringWithParams:json] dataUsingEncoding:NSUTF8StringEncoding];
+            self.HTTPBody = [[NSString queryStringWithParams:json] dataUsingEncoding:NSUTF8StringEncoding];
         }
 
         if ([endpoint isEqualToString:SKEPSnaps.loadBlob] || [endpoint isEqualToString:SKEPChat.media])

Pod/Classes/Model/SKSession.m

@@ -101,7 +101,7 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"canUseCash": @"updates_response.allowed_to_use_cash",
              @"isCashActive": @"udpates_response.is_cash_active",
              @"cashCustomerIdentifier": @"updates_response.cash_customer_id",
-             @"cashClientProperties": @"updates_response.client_properties",
+             @"clientProperties": @"updates_response.client_properties",
              @"cashProvider": @"updates_response.cash_provider",
              @"email": @"updates_response.email",
              @"mobileNumber": @"updates_response.mobile",
@@ -111,7 +111,7 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"recents": @"updates_response.recents",
              @"requests": @"updates_response.requests",
              @"addedFriendsTimestamp": @"updates_response.added_friends_timestamp",
-             @"auth_token": @"updates_response.auth_token",
+             @"authToken": @"updates_response.auth_token",
              @"canSeeMatureContent": @"updates_response.can_view_mature_content",
              @"countryCode": @"updates_response.countryCode",
              @"devicetoken": @"updates_response.device_token",
@@ -151,12 +151,27 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"trophyCase": @"identity_check_response.trophy_case.response",
              @"serverInfo": @"server_info",
              @"ringerSoundOn": @"updates_response.ringing_sound_setting",
+             @"payReplaySnaps": @"updates_response.feature_settings.pay_replay_snaps",
              @"IAPEnabledCurrencies": @"updates_response.enabled_iap_currencies",
              @"enabledLensStoreCurrencies": @"updates_response.enabled_lens_store_currencies",
              @"friendmojis": @"updates_response.friendmoji_dict",
              @"friendmojisReadOnly": @"updates_response.friendmoji_read_only_dict",
              @"friendmojisMutable": @"updates_response.friendmoji_mutable_dict",
-             @"industries": @"updates_response.industries"};
+             @"industries": @"updates_response.industries",
+             @"enableGuggenheim": @"updates_response.feature_settings.guggenheim_enabled"};
+}
+
++ (NSArray *)ignoredJSONKeyPathPrefixes {
+    static NSArray *ignored = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        ignored = @[@"updates_response.friendmoji_dict", @"updates_response.friendmoji_read_only_dict",
+                    @"updates_response.friendmoji_mutable_dict", @"ad_placement_metadata",
+                    @"updates_response.study_settings", @"sponsored", @"updates_response.client_properties",
+                    @"updates_response.targeting", @"messaging_gateway_info"];
+    });
+
+    return ignored;
 }
 
 + (NSValueTransformer *)bestFriendUsernamesJSONTransformer {
@@ -167,10 +182,6 @@ + (NSValueTransformer *)bestFriendUsernamesJSONTransformer {
     }];
 }
 
-+ (NSValueTransformer *)discoverSupportedJSONTransformer {
-    return [NSValueTransformer mtl_valueMappingTransformerWithDictionary:@{@"supported": @YES, @"device_not_supported": @NO} defaultValue:@NO reverseDefaultValue:@"device_not_supported"];
-}
-
 MTLTransformPropertyDate(addedFriendsTimestamp)
 MTLTransformPropertyDate(lastAddressBookUpdateDate)
 MTLTransformPropertyDate(lastReplayedSnapDate)
@@ -181,7 +192,10 @@ + (NSValueTransformer *)addedFriendsJSONTransformer { return [self sk_modelMutab
 + (NSValueTransformer *)conversationsJSONTransformer { return [self sk_modelMutableOrderedSetTransformerForClass:[SKConversation class]]; }
 + (NSValueTransformer *)storiesJSONTransformer { return [self sk_modelMutableOrderedSetTransformerForClass:[SKStoryCollection class]]; }
 + (NSValueTransformer *)userStoriesJSONTransformer { return [self sk_modelMutableOrderedSetTransformerForClass:[SKUserStory class]]; }
++ (NSValueTransformer *)groupStoriesJSONTransformer { return [self sk_modelMutableOrderedSetTransformerForClass:[SKStory class]]; }
 + (NSValueTransformer *)trophyCaseJSONTransformer { return [self sk_modelMutableOrderedSetTransformerForClass:[SKTrophy class]]; }
++ (NSValueTransformer *)ringerSoundOnJSONTransformer { return [self sk_onOffTransformer]; }
++ (NSValueTransformer *)enableNotificationSoundsJSONTransformer { return [self sk_onOffTransformer]; }
 
 + (NSValueTransformer *)storyPrivacyJSONTransformer {
     return [MTLValueTransformer transformerUsingForwardBlock:^id(NSString *p, BOOL *success, NSError *__autoreleasing *error) {
@@ -199,6 +213,13 @@ + (NSValueTransformer *)privacyEveryoneJSONTransformer {
     }];
 }
 
++ (NSValueTransformer *)discoverSupportedJSONTransformer {
+    return [NSValueTransformer mtl_valueMappingTransformerWithDictionary:@{@"supported": @YES, @"device_not_supported": @NO} defaultValue:@NO reverseDefaultValue:@"device_not_supported"];
+}
+
++ (NSValueTransformer *)canUseCashJSONTransformer {
+    return [NSValueTransformer mtl_valueMappingTransformerWithDictionary:@{@"OK": @YES, @"NO_VERIFIED_PHONE": @NO} defaultValue:@NO reverseDefaultValue:@"NO_VERIFIED_PHONE"];
+}
 
 @end
 

Pod/Classes/Model/SKStoryCollection.m

@@ -27,11 +27,21 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey {
              @"isLocal": @"is_local",
              @"viewedThumbnail": @"thumbnails.viewed.url",
              @"unviewedThumbnail": @"thumbnails.unviewed.url",
-             @"viewedThumbnailNeedsAuth": @"thumbnails.viewed.needs_auth",
-             @"unviewedThumbnailNeedsAuth": @"thumbnails.unviewed.needs_auth",
+             @"viewedThumbNeedsAuth": @"thumbnails.viewed.needs_auth",
+             @"unviewedThumbNeedsAuth": @"thumbnails.unviewed.needs_auth",
              @"stories": @"stories"};
 }
 
++ (NSArray *)ignoredJSONKeyPathPrefixes {
+    static NSArray *ignored = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        ignored = @[@"ad_placement_metadata"];
+    });
+
+    return ignored;
+}
+
 MTLTransformPropertyURL(viewedThumbnail)
 MTLTransformPropertyURL(unviewedThumbnail)
 

Pod/Classes/Model/SKThing.h

@@ -29,6 +29,8 @@ return [self sk_dateTransformer]; }
 + (NSValueTransformer *)sk_dateTransformer;
 /// Transforms strings into NSURL objects.
 + (NSValueTransformer *)sk_urlTransformer;
+/// Transforms strings from "ON" and "OFF" to YES and NO.
++ (NSValueTransformer *)sk_onOffTransformer;
 /// Transforms an array of dictionaries into an array of model objects of class \c cls.
 + (NSValueTransformer *)sk_modelArrayTransformerForClass:(Class)cls;
 /// Transforms an array of dictionaries into an ordered set of model objects of class \c cls.
@@ -38,6 +40,9 @@ return [self sk_dateTransformer]; }
 + (NSArray *)knownJSONKeys;
 /// Calculated once when first accessed, using \c knownJSONKeys.
 + (NSArray *)unknownJSONKeys;
++ (NSDictionary *)allSubclassesUnknownJSONKeys;
+/// Used to filter out unused JSON keys I don't want to use.
++ (NSArray *)ignoredJSONKeyPathPrefixes;
 
 /// Transforms \c jsons to an array of model objects of class \c cls.
 + (NSArray *)transformJSONArray:(NSArray *)jsons toModelsOfClass:(Class)cls;

Pod/Classes/Model/SKThing.m

@@ -27,7 +27,7 @@ @implementation SKThing
 
 - (id)initWithDictionary:(NSDictionary *)json {
     NSParameterAssert(json.allKeys.count > 0);
-    self = [super initWithDictionary:json error:nil];
+    self = [MTLJSONAdapter modelOfClass:[self class] fromJSONDictionary:json error:nil];
 
 #if kDebugJSON
     static dispatch_once_t onceToken;
@@ -53,11 +53,28 @@ + (NSArray *)knownJSONKeys {
 
 + (NSArray *)unknownJSONKeys {
     NSMutableSet *unknown = [NSMutableSet setWithArray:[_allJSONKeys[CLASS_KEY] allObjects]];
+    NSArray *ignored = [self ignoredJSONKeyPathPrefixes];
     [unknown minusSet:_knownJSONKeys[CLASS_KEY] ?: [NSSet set]];
 
-    return unknown.allObjects;
+    NSMutableSet *unknownWithoutIgnored = unknown.mutableCopy;
+
+    for (NSString *prefix in ignored)
+        for (NSString *key in unknown)
+            if ([key hasPrefix:prefix])
+                [unknownWithoutIgnored removeObject:key];
+
+    unknown = unknownWithoutIgnored.mutableCopy;
+
+    for (NSString *prefix in unknown)
+        for (NSString *fullKey in [self knownJSONKeys])
+            if ([fullKey hasPrefix:prefix])
+                [unknownWithoutIgnored removeObject:prefix];
+
+    return unknownWithoutIgnored.allObjects;
 }
 
++ (NSArray *)ignoredJSONKeyPathPrefixes { return @[]; }
+
 + (void)setAllJSONKeys:(NSArray *)keys {
     NSMutableSet *all = _allJSONKeys[CLASS_KEY];
     if (all)
@@ -78,15 +95,15 @@ - (NSDictionary *)JSONDictionary {
     return [MTLJSONAdapter JSONDictionaryFromModel:self error:nil];
 }
 
-+ (NSArray *)allSubclassesUnknownJSONKeys {
++ (NSDictionary *)allSubclassesUnknownJSONKeys {
     NSArray *subclasses = [self allSubclasses];
 
-    NSMutableArray *allUnknownKeys = [NSMutableArray array];
+    NSMutableDictionary *allUnknownKeys = [NSMutableDictionary dictionary];
 
     for (Class c in subclasses) {
         NSArray *unknown = [c unknownJSONKeys];
         if (unknown.count)
-            [allUnknownKeys addObject:[NSString stringWithFormat:@"%@: %@", NSStringFromClass(c), unknown.JSONString]];
+            allUnknownKeys[NSStringFromClass(c)] = [unknown sortedArrayUsingSelector:@selector(compare:)];
     }
 
     return allUnknownKeys;
@@ -137,8 +154,12 @@ + (NSValueTransformer *)sk_urlTransformer {
     return [NSValueTransformer valueTransformerForName:MTLURLValueTransformerName];
 }
 
++ (NSValueTransformer *)sk_onOffTransformer {
+    return [NSValueTransformer mtl_valueMappingTransformerWithDictionary:@{@"ON": @YES, @"OFF": @NO} defaultValue:@NO reverseDefaultValue:@"OFF"];
+}
+
 + (NSValueTransformer *)sk_modelArrayTransformerForClass:(Class)cls {
-    NSParameterAssert([(id)[cls class] isKindOfClass:[SKThing class]]);
+    NSParameterAssert([(id)[cls class] isSubclassOfClass:[SKThing class]]);
 
     return [MTLValueTransformer transformerUsingForwardBlock:^id(NSArray *dictionaries, BOOL *success, NSError *__autoreleasing *error) {
         NSMutableArray *models = [NSMutableArray new];
@@ -151,7 +172,7 @@ + (NSValueTransformer *)sk_modelArrayTransformerForClass:(Class)cls {
 }
 
 + (NSValueTransformer *)sk_modelMutableOrderedSetTransformerForClass:(Class)cls {
-    NSParameterAssert([(id)[cls class] isKindOfClass:[SKThing class]]);
+    NSParameterAssert([(id)[cls class] isSubclassOfClass:[SKThing class]]);
 
     return [MTLValueTransformer transformerUsingForwardBlock:^id(NSArray *dictionaries, BOOL *success, NSError *__autoreleasing *error) {
         NSMutableOrderedSet *models = [NSMutableOrderedSet orderedSet];

Pod/Classes/Model/SKUser.h

@@ -18,6 +18,9 @@
 /** \c nil if the user is not a shared story. */
 @property (nonatomic, readonly) NSString *sharedStoryIdentifier;
 
+/** Number of days the snap streak has gone on for, if at all. */
+@property (nonatomic, readonly) NSInteger snapStreakCount;
+
 /** NO if your stories are hidden from this user in "who can see my stories?". */
 @property (nonatomic, readonly) BOOL canSeeCustomStories;
 @property (nonatomic, readonly) BOOL needsLove;