-
Notifications
You must be signed in to change notification settings - Fork 86
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.
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
New built-in OAuth Access Token Store: iCloud Key-Value Storage #85
Open
fabiomassimo
wants to merge
4
commits into
trivago:master
Choose a base branch
from
fabiomassimo:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2c3cbe3
Implemented a simple iCloud Key Value Store that conforms to requirem…
7a56746
Implemented private method for synchronising an iCloud key-value stor…
528af1d
Updated docs
6c545a2
Improved if statement in case of error when trying to initializing an…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
// | ||
// OAuthAccessTokenICloudKeyValueStore.swift | ||
// Heimdallr | ||
// | ||
// Created by Fabio Milano on 05/06/16. | ||
// Copyright © 2016 B264 GmbH. All rights reserved. | ||
// | ||
|
||
import Foundation | ||
|
||
/// A persistent iCloud Key Value based access token store. | ||
@objc public class OAuthAccessTokenICloudKeyValueStore: NSObject, OAuthAccessTokenStore { | ||
private let store = NSUbiquitousKeyValueStore.defaultStore() | ||
private let service: String | ||
|
||
public init(service: String = "de.rheinfabrik.heimdallr.oauth") { | ||
self.service = service | ||
} | ||
|
||
public func storeAccessToken(accessToken: OAuthAccessToken?) { | ||
if let accessToken = accessToken { | ||
var accessTokenDictionaryRepresentation = [String: String]() | ||
|
||
accessTokenDictionaryRepresentation.updateValue(accessToken.accessToken, forKey: "access_token") | ||
accessTokenDictionaryRepresentation.updateValue(accessToken.tokenType, forKey: "token_type") | ||
|
||
if let refreshToken = accessToken.refreshToken { | ||
accessTokenDictionaryRepresentation.updateValue(refreshToken, forKey: "refresh_token") | ||
} | ||
|
||
accessTokenDictionaryRepresentation.updateValue(accessToken.accessToken, forKey: "access_token") | ||
|
||
if let expiresAt = accessToken.expiresAt { | ||
accessTokenDictionaryRepresentation.updateValue(expiresAt.timeIntervalSince1970.description, forKey: "expires_at") | ||
} | ||
|
||
store.setDictionary(accessTokenDictionaryRepresentation, forKey: service) | ||
} | ||
|
||
synchronize() | ||
} | ||
|
||
public func retrieveAccessToken() -> OAuthAccessToken? { | ||
synchronize() | ||
|
||
if let accessTokenDictionaryRepresentation = store.dictionaryForKey(service) { | ||
let accessToken = accessTokenDictionaryRepresentation["access_token"] as? String | ||
let tokenType = accessTokenDictionaryRepresentation["token_type"] as? String | ||
let refreshToken = accessTokenDictionaryRepresentation["refresh_token"] as? String | ||
let expiresAtString = accessTokenDictionaryRepresentation["expires_at"] as? String | ||
|
||
let expiresAt = expiresAtString.flatMap { description in | ||
return Double(description).flatMap { expiresAtInSeconds in | ||
return NSDate(timeIntervalSince1970: expiresAtInSeconds) | ||
} | ||
} | ||
|
||
if let accessToken = accessToken, tokenType = tokenType { | ||
return OAuthAccessToken(accessToken: accessToken, tokenType: tokenType, expiresAt: expiresAt, refreshToken: refreshToken) | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
private func synchronize() -> Void { | ||
#if DEBUG | ||
let synchronized = store.synchronize() | ||
|
||
if !synchronized { | ||
let userInfo = [ | ||
NSLocalizedDescriptionKey: NSLocalizedString("Could not initialize an iCloud Key Value Store", comment: ""), | ||
NSLocalizedFailureReasonErrorKey: NSLocalizedString("Something went wrong in initializing an iCloud Key Value Store.", comment: "") | ||
] | ||
|
||
NSException(name: "OAuthAccessTokenICloudKeyValueStore", reason: NSLocalizedString("Make sure the app has registered to proper iCloud capabilities.", comment: ""), userInfo: userInfo).raise() | ||
} | ||
#else | ||
store.synchronize() | ||
#endif | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nitpick: Missing newline :) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if the optional
accessToken
is nil?