Logins+ authentication

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,9 +5,9 @@
         "package": "BrowserServicesKit",
         "repositoryURL": "https://github.com/duckduckgo/BrowserServicesKit",
         "state": {
-          "branch": null,
-          "revision": "b00ea4f240613766e303ccdcf7c5fed15f60ddd1",
-          "version": "10.0.0"
+          "branch": "sam/logins-authentication",
+          "revision": "313b4d579cdd8c95cd04500efcd3f7ff605da28b",
+          "version": null
         }
       },
       {
@@ -63,15 +63,6 @@
           "revision": "6b2aa2748a7881eebb9f84fb10c01293e15b52ca",
           "version": "0.5.0"
         }
-      },
-      {
-        "package": "TrackerRadarKit",
-        "repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git",
-        "state": {
-          "branch": null,
-          "revision": "5f4caf35b8418700a48c64c7c61eb43308c8dacc",
-          "version": "1.0.3"
-        }
       }
     ]
   },

DuckDuckGo/AppDelegate/AppDelegate.swift

@@ -125,7 +125,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         crashReporter.checkForNewReports()
 #endif
         urlEventHandler.applicationDidFinishLaunching()
-        
+
         UserDefaultsWrapper<Any>.clearRemovedKeys()
     }
 

DuckDuckGo/Assets.xcassets/Colors/BlackWhite10.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Colors/BlackWhite60.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.600",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.600",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Colors/NeutralBackgroundColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF0",
+          "green" : "0xEF",
+          "red" : "0xF1"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.200",
+          "green" : "0.200",
+          "red" : "0.200"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Logins+.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Logins+.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Logins+/LoginsLockPassword.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "LoginsLockPassword.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Logins+/LoginsLockTouchID.imageset/Contents.json

@@ -0,0 +1,27 @@
+{
+  "images" : [
+    {
+      "filename" : "LoginsLockTouchID.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LoginsLockTouchID@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LoginsLockTouchID@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
+  }
+}

DuckDuckGo/BrowserTab/Model/Tab.swift

@@ -57,6 +57,8 @@ final class Tab: NSObject {
                 return .homepage
             } else if url == .welcome {
                 return .onboarding
+            } else if url == .preferences {
+                return .preferences
             } else {
                 return .url(url ?? .blankPage)
             }
@@ -688,7 +690,13 @@ extension Tab: SecureVaultManagerDelegate {
 
     func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: Int64) {
         Pixel.fire(.formAutofilled(kind: type.formAutofillKind))
-    } 
+    }
+
+    func secureVaultManager(_: SecureVaultManager, didRequestAuthenticationWithCompletionHandler handler: @escaping (Bool) -> Void) {
+        DeviceAuthenticator.shared.authenticateUser(reason: .autofill) { authenticated in
+            handler(authenticated)
+        }
+    }
 
     func secureVaultInitFailed(_ error: SecureVaultError) {
         SecureVaultErrorReporter.shared.secureVaultInitFailed(error)

DuckDuckGo/Common/Extensions/URLExtension.swift

@@ -85,6 +85,10 @@ extension URL {
     static var welcome: URL {
         return URL(string: "about:welcome")!
     }
+
+    static var preferences: URL {
+        return URL(string: "about:preferences")!
+    }
 
     // MARK: Pixel
 

DuckDuckGo/Common/Localizables/UserText.swift

@@ -219,6 +219,7 @@ struct UserText {
     static let downloads = NSLocalizedString("preferences.downloads", value: "Downloads", comment: "Show downloads browser preferences")
     static let isDefaultBrowser = NSLocalizedString("preferences.default-browser.active", value: "DuckDuckGo is your default browser", comment: "Indicate that the browser is the default")
     static let isNotDefaultBrowser = NSLocalizedString("preferences.default-browser.inactive", value: "DuckDuckGo is not your default browser.", comment: "Indicate that the browser is not the default")
+    static let loginsPlus = NSLocalizedString("preferences.logins-plus", value: "Logins+", comment: "Show Logins+ preferences")
 
     static func versionLabel(version: String, build: String) -> String {
         let localized = NSLocalizedString("version",

DuckDuckGo/Common/Utilities/Logging.swift

@@ -55,6 +55,10 @@ extension OSLog {
     static var favicons: OSLog {
         Logging.faviconLoggingEnabled ? Logging.faviconLog : .disabled
     }
+
+    static var autoLock: OSLog {
+        Logging.autoLockLoggingEnabled ? Logging.autoLockLog : .disabled
+    }
 
 }
 
@@ -83,6 +87,9 @@ struct Logging {
 
     fileprivate static let faviconLoggingEnabled = false
     fileprivate static let faviconLog: OSLog = OSLog(subsystem: Bundle.main.bundleIdentifier ?? "DuckDuckGo", category: "Favicons")
+
+    fileprivate static let autoLockLoggingEnabled = false
+    fileprivate static let autoLockLog: OSLog = OSLog(subsystem: Bundle.main.bundleIdentifier ?? "DuckDuckGo", category: "Auto-Lock")
 
     fileprivate static let autoconsentLoggingEnabled = false
     fileprivate static let autoconsentLog: OSLog = OSLog(subsystem: Bundle.main.bundleIdentifier ?? "DuckDuckGo", category: "Autoconsent")

DuckDuckGo/Common/View/AppKit/ColorView.swift

@@ -56,6 +56,8 @@ final class ColorView: NSView {
             layer?.borderWidth = borderWidth
         }
     }
+
+    @IBInspectable var interceptClickEvents: Bool = false
 
     func setupView() {
         self.wantsLayer = true
@@ -66,5 +68,25 @@ final class ColorView: NSView {
         layer?.backgroundColor = backgroundColor?.cgColor
         layer?.borderColor = borderColor?.cgColor
     }
+
+    // MARK: - Click Event Interception
+
+    override func mouseDown(with event: NSEvent) {
+        if !interceptClickEvents {
+            super.mouseDown(with: event)
+        }
+    }
+
+    override func mouseUp(with event: NSEvent) {
+        if !interceptClickEvents {
+            super.mouseUp(with: event)
+        }
+    }
+
+    override func mouseDragged(with event: NSEvent) {
+        if !interceptClickEvents {
+            super.mouseDragged(with: event)
+        }
+    }
 
 }

DuckDuckGo/Common/View/AppKit/FlatButton.swift

@@ -0,0 +1,46 @@
+//
+//  FlatButton.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+@IBDesignable class FlatButton: NSButton {
+
+    @IBInspectable var cornerRadius: CGFloat = 5
+    @IBInspectable var horizontalPadding: CGFloat = 10
+    @IBInspectable var verticalPadding: CGFloat = 10
+    @IBInspectable var backgroundColor: NSColor = .blue
+
+    override func draw(_ dirtyRect: NSRect) {
+
+        self.wantsLayer = true
+        self.layer?.cornerRadius = cornerRadius
+
+        if isHighlighted {
+            layer?.backgroundColor = backgroundColor.blended(withFraction: 0.2, of: .black)?.cgColor
+        } else {
+            layer?.backgroundColor = backgroundColor.cgColor
+        }
+
+        let originalBounds = self.bounds
+        defer { self.bounds = originalBounds }
+
+        self.bounds = originalBounds.insetBy(dx: horizontalPadding, dy: verticalPadding)
+
+        super.draw(dirtyRect)
+    }
+}

DuckDuckGo/Common/View/AppKit/ToggleableScrollView.swift

@@ -0,0 +1,35 @@
+//
+//  ToggleableScrollView.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+@IBDesignable
+
+public class ToggleableScrollView: NSScrollView {
+
+    @IBInspectable public var isEnabled: Bool = true
+
+    public override func scrollWheel(with event: NSEvent) {
+        if isEnabled {
+            super.scrollWheel(with: event)
+        } else {
+            nextResponder?.scrollWheel(with: event)
+        }
+    }
+
+}