Skip to content

Fix permission on relog #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lysanntranvouez wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix permission on relog #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4505a6f
fix permission when re-logging the user with checkAuthorizationOnComp…
lysanntranvouez Sep 20, 2013
da7a0ff
setObject:forKey: looks a bit cleaner than setValue:forKey: when also…
lysanntranvouez Sep 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions Classes/FlickrKit/FlickrKit.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#define kFKStoredTokenKey @"kFKStoredTokenKey"
#define kFKStoredTokenSecret @"kFKStoredTokenSecret"
#define kFKStoredTokenPermission @"kFKStoredTokenPermission"

@interface FlickrKit ()
@property (nonatomic, strong) NSString *apiKey;
Expand Down Expand Up @@ -294,8 +295,9 @@ - (FKDUNetworkOperation *) completeAuthWithURL:(NSURL *)url completion:(FKAPIAut
completion(nil, nil, nil, error);
}
} else {
[[NSUserDefaults standardUserDefaults] setValue:oat forKey:kFKStoredTokenKey];
[[NSUserDefaults standardUserDefaults] setValue:oats forKey:kFKStoredTokenSecret];
[[NSUserDefaults standardUserDefaults] setObject:oat forKey:kFKStoredTokenKey];
[[NSUserDefaults standardUserDefaults] setObject:oats forKey:kFKStoredTokenSecret];
[[NSUserDefaults standardUserDefaults] setObject:@(self.permissionGranted) forKey:kFKStoredTokenPermission];
[[NSUserDefaults standardUserDefaults] synchronize];
self.authorized = YES;
self.authToken = oat;
Expand Down Expand Up @@ -334,7 +336,17 @@ - (FKFlickrNetworkOperation *) checkAuthorizationOnCompletion:(FKAPIAuthCompleti

NSString *storedToken = [[NSUserDefaults standardUserDefaults] stringForKey:kFKStoredTokenKey];
NSString *storedSecret = [[NSUserDefaults standardUserDefaults] stringForKey:kFKStoredTokenSecret];
if(storedToken && storedSecret) {
NSNumber *storedPermission = [[NSUserDefaults standardUserDefaults] objectForKey:kFKStoredTokenPermission];
switch (storedPermission.integerValue) {
case FKPermissionRead:
case FKPermissionWrite:
case FKPermissionDelete:
break;
default:
storedPermission = nil;
break;
}
if(storedToken && storedSecret && storedPermission) {

NSDictionary *args = @{@"oauth_token": storedToken};

Expand All @@ -344,6 +356,7 @@ - (FKFlickrNetworkOperation *) checkAuthorizationOnCompletion:(FKAPIAuthCompleti
if (response) {
self.authToken = storedToken;
self.authSecret = storedSecret;
self.permissionGranted = storedPermission.integerValue;

NSString *username = [response valueForKeyPath:@"oauth.user.username"];
NSString *userid = [response valueForKeyPath:@"oauth.user.nsid"];
Expand Down Expand Up @@ -377,6 +390,7 @@ - (FKFlickrNetworkOperation *) checkAuthorizationOnCompletion:(FKAPIAuthCompleti
- (void) logout {
[[NSUserDefaults standardUserDefaults] removeObjectForKey:kFKStoredTokenKey];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:kFKStoredTokenSecret];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:kFKStoredTokenPermission];
[[NSUserDefaults standardUserDefaults] synchronize];
self.authorized = NO;
self.authSecret = nil;
Expand Down