Skip to content

Fix authorisation issue. Fixes #2. #5

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
rdougan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix authorisation issue. Fixes #2. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Classes/AccountPreferences.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ -(void)accountSetupController:(AccountSetupController *)c didFinishSetupWithOAut
[syncInstruction.managedObjectContext deleteObject:syncInstruction];
}
[PutIOAPIKeychainManager setKeychainItemPassword:token];
[[PutIOAPI api] setOAuthAccessToken:token];

// Reset username/email, we need to retrieve those from put.io
NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
Expand Down
2 changes: 1 addition & 1 deletion Classes/PutIOAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@property (readonly) NSString *oAuthClientID;
@property (readonly) NSString *oAuthClientSecret;
@property (readonly) NSString *oAuthRedirectURI;
@property (readonly) NSString *oAuthAccessToken;
@property (strong) NSString *oAuthAccessToken;
@property (readonly) BOOL isAuthenticated;

- (instancetype)initWithBaseURL:(NSURL*)baseURL oAuthAccessToken:(NSString*)oAuthAccessToken oAuthClientID:(NSString*)clientID oAuthRedirectURI:(NSString*)redirectURI;
Expand Down
2 changes: 0 additions & 2 deletions Classes/PutIOAPI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
#define kDefaultClientID @"197"
#define kDefaultRedirectURI @"https://matthiasschwab.de/putiosync/callback.html"

static NSString *oAuthAccessToken;

@interface PutIOAPI()
{
NSOperationQueue *queue;
Expand Down
12 changes: 6 additions & 6 deletions Classes/PutIOAPIRequest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ -(NSString *)queryString

-(void)main
{
if(!self.api.isAuthenticated){
[self failWithInternalError:PutIOAPIInternalErrorNotAuthorized userMessage:nil];
return;
}

NSString *requestURLString = [self.api.baseURL absoluteString];
requestURLString = [requestURLString stringByAppendingPathComponent:self.endpoint];
NSMutableDictionary *parameters;
Expand All @@ -49,7 +44,12 @@ -(void)main
}else{
parameters = [self.parameters mutableCopy];
}
parameters[@"oauth_token"] = self.api.oAuthAccessToken;

// only add the oauth token if we are logged in
if (self.api.oAuthAccessToken) {
parameters[@"oauth_token"] = self.api.oAuthAccessToken;
}

NSString *parameterString = [parameters URLQueryString];
if(self.method == PutIOAPIMethodGET){
requestURLString = [requestURLString stringByAppendingFormat:@"?%@", parameterString];
Expand Down
6 changes: 1 addition & 5 deletions Classes/PutIOSync-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>330</string>
=======
<string>326</string>
>>>>>>> release/0.8.2_beta
<string>366</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down