MOB-1817 Environment staging updates

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

@@ -50,7 +50,7 @@
       "location" : "https://github.com/ecosia/ios-core.git",
       "state" : {
         "branch" : "main",
-        "revision" : "22dbb1cd3a41557c6741f5f96794a4c2ee6a256a"
+        "revision" : "7008973ed30a59a616355f821b96952418af69ef"
       }
     },
     {

Client.xcodeproj/xcshareddata/xcschemes/EcosiaBeta.xcscheme

@@ -238,7 +238,7 @@
       buildConfiguration = "BetaDebug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Beta"
+      buildConfiguration = "Development_TestFlight"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

Client/Application/AppDelegate.swift

@@ -34,9 +34,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         appLaunchUtil = AppLaunchUtil(profile: profile)
         appLaunchUtil?.setUpPreLaunchDependencies()
-
-        // Setup environment
-        Environment.current = AppConstants.BuildChannel == .release ? .production : .staging
 
         // Set up a web server that serves us static content. Do this early so that it is ready when the UI is presented.
         webServerUtil = WebServerUtil(profile: profile)

Client/Ecosia/Analytics/Analytics.swift

@@ -24,7 +24,7 @@ final class Analytics {
             .userId(User.shared.analyticsId.uuidString)
 
         return Snowplow.createTracker(namespace: namespace,
-                                      network: .init(endpoint: Environment.current.snowplow),
+                                      network: .init(endpoint: Environment.current.urlProvider.snowplow),
                                       configurations: [trackerConfiguration, subjectConfiguration])!
     }
 

Client/Ecosia/Settings/EcosiaSettings.swift

@@ -112,7 +112,7 @@ final class EcosiaPrivacyPolicySetting: Setting {
     }
 
     override var url: URL? {
-        return Environment.current.privacy
+        return Environment.current.urlProvider.privacy
     }
 
     override func onClick(_ navigationController: UINavigationController?) {
@@ -161,7 +161,7 @@ final class EcosiaTermsSetting: Setting {
     }
 
     override var url: URL? {
-        return Environment.current.terms
+        return Environment.current.urlProvider.terms
     }
 
     override func onClick(_ navigationController: UINavigationController?) {

Client/Ecosia/UI/Impact/YourImpact.Section.swift

@@ -95,15 +95,15 @@ extension YourImpact {
             var url: URL {
                 switch self {
                 case .info:
-                    return Environment.current.howEcosiaWorks
+                    return Environment.current.urlProvider.howEcosiaWorks
                 case .finance:
-                    return Environment.current.financialReports
+                    return Environment.current.urlProvider.financialReports
                 case .trees:
-                    return Environment.current.trees
+                    return Environment.current.urlProvider.trees
                 case .faq:
-                    return Environment.current.faq
+                    return Environment.current.urlProvider.faq
                 case .privacy:
-                    return Environment.current.privacy
+                    return Environment.current.urlProvider.privacy
                 }
             }
 

Client/Ecosia/UI/Impact/YourImpact.swift

@@ -285,7 +285,7 @@ final class YourImpact: UICollectionViewController, UICollectionViewDelegateFlow
     }
 
     @objc private func learnMore(button: UIControl) {
-        delegate?.yourImpact(didSelectURL: Environment.current.aboutCounter)
+        delegate?.yourImpact(didSelectURL: Environment.current.urlProvider.aboutCounter)
         Analytics.shared.navigation(.open, label: .counter)
 
         dismiss(animated: true) { [weak self] in

Client/Frontend/Browser/BrowserViewController/BrowserViewController+WebViewDelegates.swift

@@ -588,7 +588,7 @@ extension BrowserViewController: WKNavigationDelegate {
         }
 
         // Ecosia: intercept URL to impact
-        if Environment.current.isYourImpact(url: url),
+        if Environment.current.urlProvider.isYourImpact(url: url),
            navigationAction.navigationType == .linkActivated {
             presentYourImpact()
             decisionHandler(.cancel)

Client/Frontend/Browser/Tab.swift

@@ -562,14 +562,18 @@ class Tab: NSObject {
                 return webView.load(readerModeRequest)
             }
             lastRequest = request
+
             if let url = request.url, url.isFileURL, request.isPrivileged {
                 return webView.loadFileURL(url, allowingReadAccessTo: url)
             }
 
+            // Ecosia: updating the request with cookies and auth parameters if needed
+            var ecosiaUpdatedRequest = request
             // Ecosia: inject analytics id
-            var request = request
-            request.url = request.url?.ecosified(isIncognitoEnabled: _isPrivate)
-            return webView.load(request)
+            ecosiaUpdatedRequest.url = ecosiaUpdatedRequest.url?.ecosified(isIncognitoEnabled: _isPrivate)
+            // Ecosia: inject auth parameters if needed
+            ecosiaUpdatedRequest = ecosiaUpdatedRequest.withAuthParameters()
+            return webView.load(ecosiaUpdatedRequest)
         }
         return nil
     }

Client/Frontend/Browser/TabManager.swift

@@ -110,7 +110,7 @@ class TabManager: NSObject, FeatureFlaggable, TabManagerProtocol {
         configuration.setURLSchemeHandler(InternalSchemeHandler(), forURLScheme: InternalURL.scheme)
 
         //Ecosia: inject cookie when config is created to make sure they are present
-        let cookie = isPrivate ? Cookie.incognito : Cookie.standard
+        let cookie = isPrivate ? Cookie.makeIncognito() : Cookie.makeStandard()
         configuration.websiteDataStore.httpCookieStore.setCookie(cookie)
         return configuration
     }
@@ -195,8 +195,8 @@ class TabManager: NSObject, FeatureFlaggable, TabManagerProtocol {
         searchSettingsObserver = NotificationCenter.default
             .publisher(for: .searchSettingsChanged)
             .sink() { [privateConfiguration, configuration] _ in
-                configuration.websiteDataStore.httpCookieStore.setCookie(Cookie.standard)
-                privateConfiguration.websiteDataStore.httpCookieStore.setCookie(Cookie.incognito)
+                configuration.websiteDataStore.httpCookieStore.setCookie(Cookie.makeStandard())
+                privateConfiguration.websiteDataStore.httpCookieStore.setCookie(Cookie.makeIncognito())
             }
     }
 

Client/Frontend/Settings/AppSettingsOptions.swift

@@ -708,7 +708,7 @@ class VersionSetting: Setting {
     }
 
     override var title: NSAttributedString? {
-        return NSAttributedString(string: .init(format: .localized(.version), Bundle.version) + " (\(Environment.current.name))", attributes: [NSAttributedString.Key.foregroundColor: UIColor.theme.tableView.rowText])
+        return NSAttributedString(string: .init(format: .localized(.version), Bundle.version) + " (\(Environment.current.urlProvider))", attributes: [NSAttributedString.Key.foregroundColor: UIColor.theme.tableView.rowText])
     }
 
     public static var appVersion: String {

README.md

@@ -67,6 +67,11 @@ In case the error was due to `xcrun: error: unable to lookup item 'PlatformPath'
 
 *Fix:* Switch the default SDK location by running `sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer`.
 
+#### Build configurations
+
+The app is equipped by two custom Build Configurations for ad-hoc distribution over TestFlight and AppCenter.
+The `Development_` prefix added to those two, serves the purpose of picking the correct `Core` module build configuration.
+
 ### CI/CD
 
 Fastlane is used to push builds to the Appstore and to manage our certs and profiles. Follow the [docs](https://docs.fastlane.tools/getting-started/ios/setup/) to install. We recommend to use fastlane with bundler.

Storage/DefaultSuggestedSites.swift

@@ -9,23 +9,23 @@ open class DefaultSuggestedSites {
     public static let sites = [
         "default": [
             SuggestedSiteData(
-                url: Environment.current.financialReports.absoluteString,
+                url: Environment.current.urlProvider.financialReports.absoluteString,
                 bgColor: "0x000000",
                 imageUrl: "asset://suggestedsites_ecosia-org",
                 faviconUrl: "asset://defaultFavicon",
                 trackingId: 0,
                 title: NSLocalizedString("Financial reports", tableName: "Ecosia", comment: "")
             ),
             SuggestedSiteData(
-                url: Environment.current.privacy.absoluteString,
+                url: Environment.current.urlProvider.privacy.absoluteString,
                 bgColor: "0x000000",
                 imageUrl: "asset://suggestedsites_ecosia-org",
                 faviconUrl: "asset://defaultFavicon",
                 trackingId: 0,
                 title: NSLocalizedString("Privacy", tableName: "Ecosia", comment: "")
             ),
             SuggestedSiteData(
-                url: Environment.current.blog.absoluteString,
+                url: Environment.current.urlProvider.blog.absoluteString,
                 bgColor: "0x000000",
                 imageUrl: "asset://suggestedsites_ecosia-org",
                 faviconUrl: "asset://defaultFavicon",

Tests/ClientTests/SearchTests.swift

@@ -16,7 +16,7 @@ class SearchTests: XCTestCase {
         XCTAssertEqual(engine.shortName, "Google")
 
         // Test regular search queries.
-        XCTAssertTrue(engine.searchURLForQuery("foobar")!.absoluteString.hasPrefix("https://www.ecosia.org/search?q=foobar"))
+        XCTAssertTrue(engine.searchURLForQuery("foobar")!.absoluteString.hasPrefix("https://www.ecosia-staging.xyz/search?q=foobar"))
 
         // Test search suggestion queries.
         XCTAssertEqual(engine.suggestURLForQuery("foobar")!.absoluteString, "https://www.google.com/complete/search?client=firefox&q=foobar")

fastlane/Fastfile

@@ -46,7 +46,7 @@ platform :ios do
       scheme: "Ecosia",
       project: project,
       export_method: "ad-hoc",
-      configuration: "AppCenter",
+      configuration: "Development_AppCenter",
       export_options: {iCloudContainerEnvironment: 'Development'}
     )
     appcenter_upload(
@@ -71,7 +71,7 @@ platform :ios do
     gym(
       scheme: "Ecosia",
       export_method: "app-store",
-      configuration: "Beta"
+      configuration: "Development_TestFlight"
     )
     pilot(
       skip_waiting_for_build_processing: true,