Merge lp://staging/~threeve/ubuntuone-ios-client/in-app-sso into lp://staging/ubuntuone-ios-client
Proposed by
Jason Foreman
| Status: | Merged |
|---|---|
| Approved by: | Zachery Bir |
| Approved revision: | 222 |
| Merged at revision: | 199 |
| Proposed branch: | lp://staging/~threeve/ubuntuone-ios-client/in-app-sso |
| Merge into: | lp://staging/ubuntuone-ios-client |
| Diff against target: |
9732 lines (+8994/-67) 66 files modified
musicstreaming/Dependencies/JSONKit/CHANGELOG.md (+389/-0) musicstreaming/Dependencies/JSONKit/JSONKit.h (+251/-0) musicstreaming/Dependencies/JSONKit/JSONKit.m (+3022/-0) musicstreaming/Dependencies/JSONKit/README.md (+307/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSMutableURLRequest+Parameters.h (+37/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSMutableURLRequest+Parameters.m (+113/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSString+URLEncoding.h (+35/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSString+URLEncoding.m (+73/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSURL+Base.h (+34/-0) musicstreaming/Dependencies/oauthconsumer/Categories/NSURL+Base.m (+37/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/Base64Transcoder.c (+230/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/Base64Transcoder.h (+36/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/hmac.c (+86/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/hmac.h (+31/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/sha1.c (+169/-0) musicstreaming/Dependencies/oauthconsumer/Crypto/sha1.h (+13/-0) musicstreaming/Dependencies/oauthconsumer/OAAttachment.h (+26/-0) musicstreaming/Dependencies/oauthconsumer/OAAttachment.m (+33/-0) musicstreaming/Dependencies/oauthconsumer/OACall.h (+63/-0) musicstreaming/Dependencies/oauthconsumer/OACall.m (+170/-0) musicstreaming/Dependencies/oauthconsumer/OAConsumer.h (+42/-0) musicstreaming/Dependencies/oauthconsumer/OAConsumer.m (+60/-0) musicstreaming/Dependencies/oauthconsumer/OADataFetcher.h (+44/-0) musicstreaming/Dependencies/oauthconsumer/OADataFetcher.m (+90/-0) musicstreaming/Dependencies/oauthconsumer/OAHMAC_SHA1SignatureProvider.h (+32/-0) musicstreaming/Dependencies/oauthconsumer/OAHMAC_SHA1SignatureProvider.m (+58/-0) musicstreaming/Dependencies/oauthconsumer/OAMutableURLRequest.h (+65/-0) musicstreaming/Dependencies/oauthconsumer/OAMutableURLRequest.m (+222/-0) musicstreaming/Dependencies/oauthconsumer/OAPlaintextSignatureProvider.h (+31/-0) musicstreaming/Dependencies/oauthconsumer/OAPlaintextSignatureProvider.m (+40/-0) musicstreaming/Dependencies/oauthconsumer/OAProblem.h (+53/-0) musicstreaming/Dependencies/oauthconsumer/OAProblem.m (+172/-0) musicstreaming/Dependencies/oauthconsumer/OARequestParameter.h (+48/-0) musicstreaming/Dependencies/oauthconsumer/OARequestParameter.m (+80/-0) musicstreaming/Dependencies/oauthconsumer/OAServiceTicket.h (+46/-0) musicstreaming/Dependencies/oauthconsumer/OAServiceTicket.m (+59/-0) musicstreaming/Dependencies/oauthconsumer/OASignatureProviding.h (+34/-0) musicstreaming/Dependencies/oauthconsumer/OATestServer.rb (+37/-0) musicstreaming/Dependencies/oauthconsumer/OAToken.h (+73/-0) musicstreaming/Dependencies/oauthconsumer/OAToken.m (+356/-0) musicstreaming/Dependencies/oauthconsumer/OATokenManager.h (+68/-0) musicstreaming/Dependencies/oauthconsumer/OATokenManager.m (+401/-0) musicstreaming/Dependencies/oauthconsumer/OAuthConsumer.h (+40/-0) musicstreaming/Dependencies/oauthconsumer/README (+15/-0) musicstreaming/Other Sources/iSubAppDelegate.m (+35/-28) musicstreaming/about/about.html (+71/-0) musicstreaming/categories/NSString+Extras.h (+1/-0) musicstreaming/categories/NSString+Extras.m (+7/-0) musicstreaming/iSub-Info.plist (+2/-2) musicstreaming/iSub.xcodeproj/project.pbxproj (+219/-1) musicstreaming/utilities/UOSSOMusicCredsFetchOperation.h (+24/-0) musicstreaming/utilities/UOSSOMusicCredsFetchOperation.m (+57/-0) musicstreaming/utilities/operations/AbstractNetworkOperation.h (+5/-0) musicstreaming/utilities/operations/AbstractNetworkOperation.m (+29/-12) musicstreaming/utilities/operations/UOHTTPFetchOperation.h (+23/-0) musicstreaming/utilities/operations/UOHTTPFetchOperation.m (+85/-0) musicstreaming/utilities/operations/UOJSONFetchOperation.h (+25/-0) musicstreaming/utilities/operations/UOJSONFetchOperation.m (+83/-0) musicstreaming/view_controllers/SettingsViewController.m (+1/-0) musicstreaming/view_controllers/SubsonicTableViewController.m (+9/-13) musicstreaming/view_controllers/UOMusicLoginController.h (+31/-0) musicstreaming/view_controllers/UOMusicLoginController.m (+198/-0) musicstreaming/view_controllers/UOSSOCredentialsViewController.h (+38/-0) musicstreaming/view_controllers/UOSSOCredentialsViewController.m (+80/-0) musicstreaming/view_controllers/UOSSOCredentialsViewController.xib (+641/-0) musicstreaming/xibs/SongViewController.xib (+9/-11) |
| To merge this branch: | bzr merge lp://staging/~threeve/ubuntuone-ios-client/in-app-sso |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zachery Bir (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Remove the external openid auth and implement in-app SSO, still ultimately using the mobile phone creds instead of oauth.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, woot!