Skip to content

Commit ff0ae17

Browse files
須藤将史須藤将史
authored andcommitted
Add error handling for access token
1 parent 95cab47 commit ff0ae17

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

StudyplusSDK/SPLStudyplus.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ - (BOOL)openURL:(NSURL*)url
142142
}
143143

144144
if ([url.pathComponents[1] isEqualToString:@"success"]) {
145-
NSString *accessToken = url.pathComponents[2];
146-
NSString *username = url.pathComponents[3];
145+
NSString *accessToken = [url.pathComponents[2] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
146+
NSString *username = [url.pathComponents[3] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
147147
[self saveAccessToken:accessToken andUsername:username];
148148
[self.delegate studyplusDidConnect:self];
149149
} else if ([url.pathComponents[1] isEqualToString:@"fail"]) {

StudyplusSDK/SPLStudyplusAPIRequest.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ - (void)postRequestWithPath:(NSString *)path
6565
completed:(void(^)(NSDictionary *response))completed
6666
failed:(void(^)(NSError *error))failed
6767
{
68+
if (!self.accessToken || self.accessToken.length == 0) {
69+
failed([SPLStudyplusError errorFromStudyplusErrorCode:SPLErrorCodeNoAccessToken]);
70+
return;
71+
}
72+
6873
[self sendRequestWithPath:path
6974
requestParams:requestParameter
7075
completed:completed

StudyplusSDK/SPLStudyplusError.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ typedef NS_ENUM(NSInteger, SPLErrorCode) {
3131
SPLErrorCodeNetworkUnavailable = 6000,
3232
SPLErrorCodeServerError = 7000,
3333
SPLErrorCodePostRecordFailed = 8000,
34+
SPLErrorCodeNoAccessToken = 9000,
3435
SPLErrorCodeUnknown = 90000
3536
};
3637

StudyplusSDK/SPLStudyplusError.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ + (NSError*)errorFromStudyplusErrorCode:(SPLErrorCode)studyplusErrorCode
7171
localizedDescription:@"Failed to post study record. (400 bad request)"];
7272
break;
7373

74+
case SPLErrorCodeNoAccessToken:
75+
error = [SPLStudyplusError errorWithCode:studyplusErrorCode
76+
localizedDescription:@"No access token"];
77+
break;
78+
7479
case SPLErrorCodeUnknown:
7580
error = [SPLStudyplusError errorWithCode:SPLErrorCodeUnknown
7681
localizedDescription:@"Unknown Error."];

0 commit comments

Comments
 (0)