fix bug where new authenticated bootstrapper format (top level bootst…

…rap object in JSON) isn't recognized
gtritchie · Aug 4, 2016 · e82e8d6 · e82e8d6
1 parent d319f5d
commit e82e8d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 1.0.8 (2016-08-04)
+
+- Fix [Newer authenticated bootstrapper response format not handled correctly](https://github.com/gtritchie/WOPIAuth/issues/9)
+
 ### 1.0.7 (2016-07-27)
 
 - Fix [Token request does not include redirect_uri as per oauth2 spec](https://github.com/gtritchie/WOPIAuth/issues/8)

diff --git a/WOPIAuth/Info.plist b/WOPIAuth/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>8</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/WOPIAuth/ProfileResult.swift b/WOPIAuth/ProfileResult.swift
@@ -59,7 +59,12 @@ class ProfileResult {
 		Parse JSON response from profile endpoint
 	*/
 	func populateFromResponseData(data: NSData) throws {
-		let topLevelDict = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! NSDictionary
+		var topLevelDict = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! NSDictionary
+
+		if topLevelDict["Bootstrap"] as? NSDictionary != nil {
+			topLevelDict = topLevelDict["Bootstrap"] as! NSDictionary
+		}
+
 		guard let id = topLevelDict["UserId"] as? String else {
 			throw ProfileResult.errorWithMessage("Unable to extract userId")
 		}