Merge pull request #202 from derrh/master

derrh · derrh · commit f6cdc662d702 · 2015-08-17T15:39:07.000-06:00
Fixes cascading logout fail
diff --git a/CanvasKit/Networking/CKIClient+CKIUser.m b/CanvasKit/Networking/CKIClient+CKIUser.m
@@ -40,6 +40,10 @@ - (RACSignal *)fetchStudentsForContext:(id<CKIContext>)context {
 
 - (RACSignal *)fetchCurrentUser
 {
+    if (self.accessToken == nil) {
+        return [RACSignal empty];
+    }
+    
     NSString *path = [CKIRootContext.path stringByAppendingPathComponent:@"users/self/profile"];
     return [self fetchResponseAtPath:path parameters:nil modelClass:[CKIUser class] context:nil];
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ - (RACSignal *)fetchStudentsForContext:(id<CKIContext>)context {`
`40`	`40`
`41`	`41`	`- (RACSignal *)fetchCurrentUser`
`42`	`42`	`{`
	`43`	`+ if (self.accessToken == nil) {`
	`44`	`+ return [RACSignal empty];`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`NSString *path = [CKIRootContext.path stringByAppendingPathComponent:@"users/self/profile"];`
`44`	`48`	`return [self fetchResponseAtPath:path parameters:nil modelClass:[CKIUser class] context:nil];`
`45`	`49`	`}`