Add error handling for access token

Author: 須藤将史

Demo/StudyplusSDKDemo/StudyplusSDK/SPLStudyplus.m

@@ -141,8 +141,8 @@ - (BOOL)openURL:(NSURL*)url
     }
 
     if ([url.pathComponents[1] isEqualToString:@"success"]) {
-        NSString *accessToken = url.pathComponents[2];
-        NSString *username = url.pathComponents[3];
+        NSString *accessToken = [url.pathComponents[2] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+        NSString *username = [url.pathComponents[3] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
         [self saveAccessToken:accessToken andUsername:username];
         [self.delegate studyplusDidConnect:self];
     } else if ([url.pathComponents[1] isEqualToString:@"fail"]) {

Demo/StudyplusSDKDemo/StudyplusSDK/SPLStudyplusAPIRequest.m

@@ -65,6 +65,11 @@ - (void)postRequestWithPath:(NSString *)path
                   completed:(void(^)(NSDictionary *response))completed
                      failed:(void(^)(NSError *error))failed
 {
+    if (!self.accessToken || self.accessToken.length == 0) {
+        failed([SPLStudyplusError errorFromStudyplusErrorCode:SPLErrorCodeNoAccessToken]);
+        return;
+    }
+    
     [self sendRequestWithPath:path
                 requestParams:requestParameter
                     completed:completed

Demo/StudyplusSDKDemo/StudyplusSDK/SPLStudyplusError.h

@@ -31,6 +31,7 @@ typedef NS_ENUM(NSInteger, SPLErrorCode) {
     SPLErrorCodeNetworkUnavailable = 6000,
     SPLErrorCodeServerError = 7000,
     SPLErrorCodePostRecordFailed = 8000,
+    SPLErrorCodeNoAccessToken = 9000,
     SPLErrorCodeUnknown = 90000
 };
 

Demo/StudyplusSDKDemo/StudyplusSDK/SPLStudyplusError.m

@@ -70,7 +70,12 @@ + (NSError*)errorFromStudyplusErrorCode:(SPLErrorCode)studyplusErrorCode
             error = [SPLStudyplusError errorWithCode:studyplusErrorCode
                          localizedDescription:@"Failed to post study record. (400 bad request)"];
             break;
-            
+
+        case SPLErrorCodeNoAccessToken:
+            error = [SPLStudyplusError errorWithCode:studyplusErrorCode
+                                localizedDescription:@"No access token"];
+            break;
+
         case SPLErrorCodeUnknown:
             error = [SPLStudyplusError errorWithCode:SPLErrorCodeUnknown
                          localizedDescription:@"Unknown Error."];