Merge pull request #59 from passepartoutvpn/integrate-protonvpn

Integrate ProtonVPN provider

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- ProtonVPN provider. [#7](https://github.com/passepartoutvpn/passepartout-ios/issues/7)
 - Italian translations. [#58](https://github.com/passepartoutvpn/passepartout-ios/pull/58)
 
 ### Fixed

Passepartout-Core/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Passepartout-CoreTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Passepartout-iOS-Tunnel/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

Passepartout-iOS/Global/SwiftGen+Assets.swift

@@ -283,6 +283,7 @@ internal enum Asset {
   internal enum Providers {
     internal static let mullvad = ImageAsset(name: "mullvad")
     internal static let pia = ImageAsset(name: "pia")
+    internal static let protonvpn = ImageAsset(name: "protonvpn")
     internal static let tunnelbear = ImageAsset(name: "tunnelbear")
     internal static let windscribe = ImageAsset(name: "windscribe")
   }

Passepartout-iOS/Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

Passepartout-iOS/Providers.xcassets/protonvpn.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "protonvpn@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "protonvpn@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Passepartout-iOS/Scenes/AccountViewController.swift

@@ -68,6 +68,9 @@ class AccountViewController: UIViewController, TableModelHost {
         case .pia:
             return V.pia(name.rawValue)
             
+        case .protonVPN:
+            return V.protonvpn(name.rawValue)
+
         case .tunnelBear:
             return V.tunnelbear(name.rawValue)
             

Passepartout/Resources/en.lproj/Localizable.strings

@@ -130,8 +130,9 @@
 "account.sections.credentials.header" = "Credentials";
 "account.sections.guidance.footer.infrastructure.mullvad" = "Use your %@ website account number and password \"m\".";
 "account.sections.guidance.footer.infrastructure.pia" = "Use your %@ website credentials. Your username is usually numeric with a \"p\" prefix.";
+"account.sections.guidance.footer.infrastructure.protonvpn" = "Find your %@ credentials in the \"Account > OpenVPN Login\" section of the website.";
 "account.sections.guidance.footer.infrastructure.tunnelbear" = "Use your %@ website credentials. Your username is usually your e-mail.";
-"account.sections.guidance.footer.infrastructure.windscribe" = "Find your credentials in the OpenVPN Config Generator on the %@ website.";
+"account.sections.guidance.footer.infrastructure.windscribe" = "Find your %@ credentials in the OpenVPN Config Generator on the website.";
 "account.sections.registration.footer" = "Go get an account on the %@ website.";
 "account.cells.username.caption" = "Username";
 "account.cells.username.placeholder" = "username";

Passepartout/Sources/AppConstants.swift

@@ -165,12 +165,14 @@ public class AppConstants {
         }
         
         public static let guidances: [Infrastructure.Name: String] = [
+            .protonVPN: "https://account.protonvpn.com/settings",
             .windscribe: "https://windscribe.com/getconfig/openvpn"
         ]
 
         public static let referrals: [Infrastructure.Name: String] = [
             .mullvad: "https://mullvad.net/en/account/create/",
             .pia: "https://www.privateinternetaccess.com/pages/buy-vpn/",
+            .protonVPN: "https://protonvpn.net/?aid=keeshux",
             .tunnelBear: "https://click.tunnelbear.com/aff_c?offer_id=2&aff_id=7464",
             .windscribe: "https://secure.link/kCsD0prd"
         ]

Passepartout/Sources/Services/Infrastructure.swift

@@ -32,6 +32,8 @@ public struct Infrastructure: Codable {
         
         case pia = "PIA"
         
+        case protonVPN = "ProtonVPN"
+
         case tunnelBear = "TunnelBear"
         
         case windscribe = "Windscribe"

Passepartout/Sources/Services/InfrastructureFactory.swift

@@ -59,6 +59,7 @@ public class InfrastructureFactory {
     public let allNames: [Infrastructure.Name] = [
         .mullvad,
         .pia,
+        .protonVPN,
         .tunnelBear,
         .windscribe
     ]

Passepartout/Sources/SwiftGen+Strings.swift

@@ -106,11 +106,15 @@ public enum L10n {
             public static func pia(_ p1: String) -> String {
               return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.pia", p1)
             }
+            /// Find your %@ credentials in the "Account > OpenVPN Login" section of the website.
+            public static func protonvpn(_ p1: String) -> String {
+              return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.protonvpn", p1)
+            }
             /// Use your %@ website credentials. Your username is usually your e-mail.
             public static func tunnelbear(_ p1: String) -> String {
               return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.tunnelbear", p1)
             }
-            /// Find your credentials in the OpenVPN Config Generator on the %@ website.
+            /// Find your %@ credentials in the OpenVPN Config Generator on the website.
             public static func windscribe(_ p1: String) -> String {
               return L10n.tr("Localizable", "account.sections.guidance.footer.infrastructure.windscribe", p1)
             }

README.md

@@ -57,6 +57,7 @@ Passepartout can connect to a few well-known VPN providers with an existing acco
 
 - [Mullvad][app-net-mullvad]
 - [Private Internet Access][app-net-pia]
+- [ProtonVPN][app-net-protonvpn]
 - [TunnelBear][app-net-tunnelbear]
 - [Windscribe][app-net-windscribe]
 - ...more soon!
@@ -146,6 +147,7 @@ Website: [passepartoutvpn.app][about-website]
 [app-api]: https://github.com/passepartoutvpn/passepartout-api
 [app-net-mullvad]: https://mullvad.net/en/account/create/
 [app-net-pia]: https://www.privateinternetaccess.com/pages/buy-vpn/
+[app-net-protonvpn]: https://protonvpn.net/?aid=keeshux
 [app-net-tunnelbear]: https://click.tunnelbear.com/aff_c?offer_id=2&aff_id=7464
 [app-net-windscribe]: https://secure.link/kCsD0prd
 

fastlane/metadata/en-US/description.txt

@@ -18,6 +18,7 @@ FEATURES
 - Convenient presets for major VPN networks:
   - Mullvad
   - Private Internet Access
+  - ProtonVPN
   - TunnelBear
   - Windscribe
   - ...more soon!