Merge pull request #1780 from GitHawkApp/vulnerability-support

rnystrom · web-flow · commit de801c5601a1 · 2018-05-10T09:09:25.000-04:00
Add support for vulnerability alerts
diff --git a/Classes/Bookmark/BookmarkViewModel.swift b/Classes/Bookmark/BookmarkViewModel.swift
@@ -24,13 +24,17 @@ final class BookmarkViewModel: ListDiffable {
             style: Styles.Text.body.with(foreground: Styles.Colors.Gray.dark.color)
         ))
         switch bookmark.type {
-        case .issue, .pullRequest:
+        case .securityVulnerability:
+            assertionFailure("Type \(bookmark.type) is not expected to be bookmarkable.")
+            fallthrough
+        case .issue, .pullRequest, .release:
             builder.add(text: bookmark.title)
-        case .commit, .repo:
+        case .commit:
+            assertionFailure("Type \(bookmark.type) is not expected to be bookmarkable.")
+            fallthrough
+        case .repo:
             builder.add(text: "\(bookmark.owner)/")
                 .add(text: bookmark.name, traits: .traitBold)
-        case .release:
-            builder.add(text: bookmark.title)
         }
 
         text = StyledTextRenderer(
diff --git a/Classes/Notifications/NotificationType+Icon.swift b/Classes/Notifications/NotificationType+Icon.swift
@@ -18,6 +18,7 @@ extension NotificationType {
         case .issue: image = #imageLiteral(resourceName: "issue-opened")
         case .pullRequest: image = #imageLiteral(resourceName: "git-pull-request")
         case .release: image = #imageLiteral(resourceName: "tag")
+        case .securityVulnerability: image = #imageLiteral(resourceName: "alert")
         }
 
         return image
diff --git a/Classes/Notifications/NotificationType.swift b/Classes/Notifications/NotificationType.swift
@@ -15,6 +15,7 @@ enum NotificationType: String {
     case commit = "Commit"
     case repo = "Repository"
     case release = "Release"
+    case securityVulnerability = "RepositoryVulnerabilityAlert"
 
     var localizedString: String {
         switch self {
@@ -23,6 +24,7 @@ enum NotificationType: String {
         case .repo: return NSLocalizedString("Repository", comment: "")
         case .release: return NSLocalizedString("Release", comment: "")
         case .pullRequest: return Constants.Strings.pullRequest
+        case .securityVulnerability: return NSLocalizedString("Security Vulnerability", comment: "")
         }
     }
 }
diff --git a/FreetimeTests/Bookmark Tests/BookmarkViewModelTests.swift b/FreetimeTests/Bookmark Tests/BookmarkViewModelTests.swift
@@ -12,24 +12,25 @@ import XCTest
 @testable import Freetime
 class BookmarkViewModelTests: XCTestCase {
 
-    var issue: Bookmark!
-    var other: Bookmark!
+    var bookmark: Bookmark!
+    var bookmarkViewModel: BookmarkViewModel!
 
-    var issueModel: BookmarkViewModel!
-    var otherModel: BookmarkViewModel!
-
-    override func setUp() {
-        super.setUp()
-
-        issue = Bookmark(type: .issue, name: "IGListKit on Bookmarks", owner: "rizwankce", title: "Bookmarks view controller not using IGLK")
-        issueModel = BookmarkViewModel(bookmark: issue, contentSizeCategory: .large, width: 0)
+    func test_bookmarkText_issue() {
+        bookmark = Bookmark(type: .issue, name: "IGListKit on Bookmarks", owner: "rizwankce", title: "Bookmarks view controller not using IGLK")
+        bookmarkViewModel = BookmarkViewModel(bookmark: bookmark, contentSizeCategory: .large, width: 0)
+        XCTAssertEqual(bookmark.title, bookmarkViewModel.text.string.allText)
+    }
 
-        other = Bookmark(type: .commit, name: "Implemented Bookmark ViewModel", owner: "heshamsalman")
-        otherModel = BookmarkViewModel(bookmark: other, contentSizeCategory: .large, width: 0)
+    func test_bookmarkText_pullRequest() {
+        bookmark = Bookmark(type: .pullRequest, name: "Implemented Bookmark ViewModel", owner: "heshamsalman")
+        bookmarkViewModel = BookmarkViewModel(bookmark: bookmark, contentSizeCategory: .large, width: 0)
+        XCTAssertEqual(bookmark.title, bookmarkViewModel.text.string.allText)
     }
 
-    func test_bookmarkText_other() {
-        XCTAssertEqual("\(other.owner)/\(other.name)", otherModel.text.string.allText)
+    func test_bookmarkText_repository() {
+        bookmark = Bookmark(type: .repo, name: "GitHawk", owner: "GitHawkApp")
+        bookmarkViewModel = BookmarkViewModel(bookmark: bookmark, contentSizeCategory: .large, width: 0)
+        XCTAssertEqual("\(bookmark.owner)/\(bookmark.name)", bookmarkViewModel.text.string.allText)
     }
 
 }
diff --git a/Local Pods/GitHubAPI/GitHubAPI.xcodeproj/project.pbxproj b/Local Pods/GitHubAPI/GitHubAPI.xcodeproj/project.pbxproj
@@ -61,6 +61,7 @@
 		29F8BAC0204B577800E5CA32 /* V3NotificationSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29F8BABF204B577800E5CA32 /* V3NotificationSubject.swift */; };
 		29F8BAC2204B57EC00E5CA32 /* V3Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29F8BAC1204B57EC00E5CA32 /* V3Notification.swift */; };
 		4906A18D206ADECE0031F6F5 /* invitation_notification.json in Resources */ = {isa = PBXBuildFile; fileRef = 4906A18C206ADECE0031F6F5 /* invitation_notification.json */; };
+		496C9CE620965F2800F13F09 /* security_vulnerability.json in Resources */ = {isa = PBXBuildFile; fileRef = 496C9CE520965F2800F13F09 /* security_vulnerability.json */; };
 		985AD904C6ABF3E0A1F46079 /* Pods_GitHubAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB687054FAA1CE0478BE468 /* Pods_GitHubAPI.framework */; };
 		D4D67C0931ACEE218D81A041 /* Pods_GitHubAPITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD96096F323FEE96EB3F8D0D /* Pods_GitHubAPITests.framework */; };
 /* End PBXBuildFile section */
@@ -135,6 +136,7 @@
 		29F8BAC1204B57EC00E5CA32 /* V3Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = V3Notification.swift; sourceTree = "<group>"; };
 		33E0718D024CC4F81EBF7364 /* Pods-GitHubAPITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GitHubAPITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests.release.xcconfig"; sourceTree = "<group>"; };
 		4906A18C206ADECE0031F6F5 /* invitation_notification.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = invitation_notification.json; sourceTree = "<group>"; };
+		496C9CE520965F2800F13F09 /* security_vulnerability.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = security_vulnerability.json; sourceTree = "<group>"; };
 		8FAA1C36CB3C11579EF5BE54 /* Pods-GitHubAPI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GitHubAPI.release.xcconfig"; path = "Pods/Target Support Files/Pods-GitHubAPI/Pods-GitHubAPI.release.xcconfig"; sourceTree = "<group>"; };
 		AAB687054FAA1CE0478BE468 /* Pods_GitHubAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GitHubAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AD96096F323FEE96EB3F8D0D /* Pods_GitHubAPITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GitHubAPITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -247,6 +249,7 @@
 				29C1A9EF204B22A200CB6995 /* Info.plist */,
 				2958050A204B5A68009CFD51 /* notifications.json */,
 				4906A18C206ADECE0031F6F5 /* invitation_notification.json */,
+				496C9CE520965F2800F13F09 /* security_vulnerability.json */,
 			);
 			path = GitHubAPITests;
 			sourceTree = "<group>";
@@ -377,6 +380,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				496C9CE620965F2800F13F09 /* security_vulnerability.json in Resources */,
 				2958050B204B5A68009CFD51 /* notifications.json in Resources */,
 				4906A18D206ADECE0031F6F5 /* invitation_notification.json in Resources */,
 			);
diff --git a/Local Pods/GitHubAPI/GitHubAPI.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Local Pods/GitHubAPI/GitHubAPI.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Local Pods/GitHubAPI/GitHubAPI/V3Notification.swift b/Local Pods/GitHubAPI/GitHubAPI/V3Notification.swift
@@ -21,6 +21,7 @@ public struct V3Notification: Codable {
         case subscribed = "subscribed"
         case teamMention = "team_mention"
         case reviewRequested = "review_requested"
+        case securityAlert = "security_alert"
     }
 
     public let id: String
diff --git a/Local Pods/GitHubAPI/GitHubAPI/V3NotificationSubject.swift b/Local Pods/GitHubAPI/GitHubAPI/V3NotificationSubject.swift
@@ -17,6 +17,7 @@ public struct V3NotificationSubject: Codable {
         case repo = "Repository"
         case release = "Release"
         case invitation = "RepositoryInvitation"
+        case vulnerabilityAlert = "RepositoryVulnerabilityAlert"
     }
 
     public let title: String
diff --git a/Local Pods/GitHubAPI/GitHubAPITests/GitHubAPITests.swift b/Local Pods/GitHubAPI/GitHubAPITests/GitHubAPITests.swift
@@ -125,7 +125,7 @@ class GitHubAPITests: XCTestCase {
         let data = try! Data(contentsOf: Bundle(for: type(of: self)).url(forResource: "invitation_notification", withExtension: "json")!)
         let result = processResponse(request: V3NotificationRequest(), input: data)
         switch result {
-        case .failure: XCTFail()
+        case .failure(let error): XCTFail(error?.localizedDescription ?? "Failed without error")
         case .success(let response):
             XCTAssertEqual(response.data.count, 1)
 
@@ -138,5 +138,22 @@ class GitHubAPITests: XCTestCase {
             XCTAssertEqual(first.subject.title, "Invitation to join \(repo) from \(first.repository.owner.login)")
         }
     }
+
+    func test_securityVulnerabilityJSON() {
+        let data = try! Data(contentsOf: Bundle(for: type(of: self)).url(forResource: "security_vulnerability", withExtension: "json")!)
+        let result = processResponse(request: V3NotificationRequest(), input: data)
+        switch result {
+        case .failure(let error): XCTFail(error?.localizedDescription ?? "Failed without error")
+        case .success(let response):
+            XCTAssertEqual(response.data.count, 1)
+
+            let first = response.data.first!
+            XCTAssertEqual(first.id, "328706116")
+            XCTAssertEqual(first.reason, .securityAlert)
+            XCTAssertEqual(first.repository.name, "eslint-docs")
+            XCTAssertEqual(first.repository.owner.login, "j-f1")
+            XCTAssertEqual(first.subject.title, "Potential security vulnerability found in the hoek dependency")
+        }
+    }
     
 }
diff --git a/Local Pods/GitHubAPI/GitHubAPITests/security_vulnerability.json b/Local Pods/GitHubAPI/GitHubAPITests/security_vulnerability.json
@@ -0,0 +1,82 @@
+[
+  {
+    "id": "328706116",
+    "unread": false,
+    "reason": "security_alert",
+    "updated_at": "2018-04-26T15:25:17Z",
+    "last_read_at": "2018-04-27T00:34:20Z",
+    "subject": {
+      "title": "Potential security vulnerability found in the hoek dependency",
+      "url": "https://api.github.com/repos/j-f1/eslint-docs",
+      "latest_comment_url": "https://api.github.com/repos/j-f1/eslint-docs",
+      "type": "RepositoryVulnerabilityAlert"
+    },
+    "repository": {
+      "id": 100884355,
+      "name": "eslint-docs",
+      "full_name": "j-f1/eslint-docs",
+      "owner": {
+        "login": "j-f1",
+        "id": 25517624,
+        "avatar_url": "https://avatars2.githubusercontent.com/u/25517624?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/j-f1",
+        "html_url": "https://github.com/j-f1",
+        "followers_url": "https://api.github.com/users/j-f1/followers",
+        "following_url": "https://api.github.com/users/j-f1/following{/other_user}",
+        "gists_url": "https://api.github.com/users/j-f1/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/j-f1/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/j-f1/subscriptions",
+        "organizations_url": "https://api.github.com/users/j-f1/orgs",
+        "repos_url": "https://api.github.com/users/j-f1/repos",
+        "events_url": "https://api.github.com/users/j-f1/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/j-f1/received_events",
+        "type": "User",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/j-f1/eslint-docs",
+      "description": "Keep your rule names and descriptions up-to-date across your repo",
+      "fork": false,
+      "url": "https://api.github.com/repos/j-f1/eslint-docs",
+      "forks_url": "https://api.github.com/repos/j-f1/eslint-docs/forks",
+      "keys_url": "https://api.github.com/repos/j-f1/eslint-docs/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/j-f1/eslint-docs/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/j-f1/eslint-docs/teams",
+      "hooks_url": "https://api.github.com/repos/j-f1/eslint-docs/hooks",
+      "issue_events_url": "https://api.github.com/repos/j-f1/eslint-docs/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/j-f1/eslint-docs/events",
+      "assignees_url": "https://api.github.com/repos/j-f1/eslint-docs/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/j-f1/eslint-docs/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/j-f1/eslint-docs/tags",
+      "blobs_url": "https://api.github.com/repos/j-f1/eslint-docs/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/j-f1/eslint-docs/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/j-f1/eslint-docs/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/j-f1/eslint-docs/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/j-f1/eslint-docs/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/j-f1/eslint-docs/languages",
+      "stargazers_url": "https://api.github.com/repos/j-f1/eslint-docs/stargazers",
+      "contributors_url": "https://api.github.com/repos/j-f1/eslint-docs/contributors",
+      "subscribers_url": "https://api.github.com/repos/j-f1/eslint-docs/subscribers",
+      "subscription_url": "https://api.github.com/repos/j-f1/eslint-docs/subscription",
+      "commits_url": "https://api.github.com/repos/j-f1/eslint-docs/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/j-f1/eslint-docs/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/j-f1/eslint-docs/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/j-f1/eslint-docs/issues/comments{/number}",
+      "contents_url": "https://api.github.com/repos/j-f1/eslint-docs/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/j-f1/eslint-docs/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/j-f1/eslint-docs/merges",
+      "archive_url": "https://api.github.com/repos/j-f1/eslint-docs/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/j-f1/eslint-docs/downloads",
+      "issues_url": "https://api.github.com/repos/j-f1/eslint-docs/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/j-f1/eslint-docs/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/j-f1/eslint-docs/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/j-f1/eslint-docs/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/j-f1/eslint-docs/labels{/name}",
+      "releases_url": "https://api.github.com/repos/j-f1/eslint-docs/releases{/id}",
+      "deployments_url": "https://api.github.com/repos/j-f1/eslint-docs/deployments"
+    },
+    "url": "https://api.github.com/notifications/threads/328706116",
+    "subscription_url": "https://api.github.com/notifications/threads/328706116/subscription"
+  }
+]

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ extension NotificationType {`
`18`	`18`	`case .issue: image = #imageLiteral(resourceName: "issue-opened")`
`19`	`19`	`case .pullRequest: image = #imageLiteral(resourceName: "git-pull-request")`
`20`	`20`	`case .release: image = #imageLiteral(resourceName: "tag")`
	`21`	`+ case .securityVulnerability: image = #imageLiteral(resourceName: "alert")`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`return image`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ enum NotificationType: String {`
`15`	`15`	`case commit = "Commit"`
`16`	`16`	`case repo = "Repository"`
`17`	`17`	`case release = "Release"`
	`18`	`+ case securityVulnerability = "RepositoryVulnerabilityAlert"`
`18`	`19`
`19`	`20`	`var localizedString: String {`
`20`	`21`	`switch self {`
`@@ -23,6 +24,7 @@ enum NotificationType: String {`
`23`	`24`	`case .repo: return NSLocalizedString("Repository", comment: "")`
`24`	`25`	`case .release: return NSLocalizedString("Release", comment: "")`
`25`	`26`	`case .pullRequest: return Constants.Strings.pullRequest`
	`27`	`+ case .securityVulnerability: return NSLocalizedString("Security Vulnerability", comment: "")`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public struct V3Notification: Codable {`
`21`	`21`	`case subscribed = "subscribed"`
`22`	`22`	`case teamMention = "team_mention"`
`23`	`23`	`case reviewRequested = "review_requested"`
	`24`	`+ case securityAlert = "security_alert"`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public let id: String`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public struct V3NotificationSubject: Codable {`
`17`	`17`	`case repo = "Repository"`
`18`	`18`	`case release = "Release"`
`19`	`19`	`case invitation = "RepositoryInvitation"`
	`20`	`+ case vulnerabilityAlert = "RepositoryVulnerabilityAlert"`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public let title: String`