Merge branch 'master' of github.com:sprhawk/ytoolkit

sprhawk · Feb 9, 2012 · 0d25f24 · 0d25f24
2 parents 1af2d65 + 31e1f4c
commit 0d25f24
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/ycocoaadditions/code/NSString+YHTTPURLString.h b/ycocoaadditions/code/NSString+YHTTPURLString.h
@@ -56,4 +56,5 @@
 //requestURI is not in Unit Test
 - (NSString *)requestURI NOTTESTED;
 
+- (NSArray *)emailParts;
 @end
diff --git a/ycocoaadditions/code/NSString+YHTTPURLString.m b/ycocoaadditions/code/NSString+YHTTPURLString.m
@@ -410,4 +410,15 @@ - (NSString *)requestURI {
     return [NSString stringWithFormat:@"%@%@%@", absolutePath, queryCompoent?queryCompoent:@"", fragmentCompoent?fragmentCompoent:@""];
 }
 
+- (NSArray *)emailParts
+{
+    NSArray * emailParts = [self componentsSeparatedByString:@"@"];
+    if (2 != [emailParts count]) {
+        return nil;
+    }
+
+    // may be user@anydomain , will not test the number of the parts of the domain.
+    return emailParts;
+}
+
 @end
diff --git a/yoauth/code/oauthv2/NSError+YOAuthv2.m b/yoauth/code/oauthv2/NSError+YOAuthv2.m
@@ -74,6 +74,9 @@ + (NSError *)errorByCheckingOAuthv2RedirectURIParameters:(NSDictionary *)paramet
                                                                   __YToolkitBundle, 
                                                                   errorType);
         NSMutableDictionary * userInfo = [NSMutableDictionary dictionaryWithCapacity:3];
+      if (nil == errorName) {
+        errorName = @"Unknown";
+      }
         [userInfo setObject:errorName forKey:NSLocalizedDescriptionKey];
         [userInfo addEntriesFromDictionary:parameters];
         return [[self class] errorWithDomain:YOAuthv2ErrorDomain