Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Authv2 / Networking improvements #3746

Merged
merged 18 commits into from
Jan 27, 2025
Merged

Authv2 / Networking improvements #3746

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bb0a340
Networking v2 and dependency tree improvements
federicocappelli Jan 17, 2025
5ec2aad
frameworks fix
federicocappelli Jan 17, 2025
110acef
BSK updated
federicocappelli Jan 17, 2025
430d86d
Merge branch 'main' into fcappelli/authv2/networking_improvements
federicocappelli Jan 20, 2025
eb9acf4
dependencies re-added
federicocappelli Jan 20, 2025
0471757
Merge branch 'main' into fcappelli/authv2/networking_improvements
federicocappelli Jan 20, 2025
c563518
BSK updated
federicocappelli Jan 20, 2025
1a99c3e
unit tests updated
federicocappelli Jan 20, 2025
851bc52
lint
federicocappelli Jan 20, 2025
65a896e
dependencies fixed
federicocappelli Jan 20, 2025
8e0f29d
PR suggestions implemented
federicocappelli Jan 23, 2025
0499fa5
BSK update
federicocappelli Jan 24, 2025
be575e9
pr suggestions
federicocappelli Jan 27, 2025
d4e74ca
translations reverted
federicocappelli Jan 27, 2025
aa42fcf
bsk updated
federicocappelli Jan 27, 2025
3a3bd59
Merge branch 'main' into fcappelli/authv2/networking_improvements
federicocappelli Jan 27, 2025
2a39752
TestUtils removed
federicocappelli Jan 27, 2025
19b8ffb
BSK Version 231.0.0
federicocappelli Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 18 additions & 42 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,6 @@
37219B3B2CBFD4F300C9D7A8 /* NewTabPageSearchBoxExperiment+Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37219B392CBFD4F300C9D7A8 /* NewTabPageSearchBoxExperiment+Logger.swift */; };
37219B3D2CC27DB700C9D7A8 /* NewTabPageSearchBoxExperimentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37219B3C2CC27DB300C9D7A8 /* NewTabPageSearchBoxExperimentTests.swift */; };
37219B3E2CC27DB700C9D7A8 /* NewTabPageSearchBoxExperimentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37219B3C2CC27DB300C9D7A8 /* NewTabPageSearchBoxExperimentTests.swift */; };
372217802B3337FE00B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 3722177F2B3337FE00B8E9C2 /* TestUtils */; };
372217822B33380700B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 372217812B33380700B8E9C2 /* TestUtils */; };
37269EFB2B332F9E005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFA2B332F9E005E8E46 /* Common */; };
37269EFD2B332FAC005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFC2B332FAC005E8E46 /* Common */; };
37269EFF2B332FBB005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFE2B332FBB005E8E46 /* Common */; };
Expand Down Expand Up @@ -1327,7 +1325,6 @@
37FC2A192CF903080048E226 /* MockPrivacyStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FC2A172CF903060048E226 /* MockPrivacyStats.swift */; };
37FD78112A29EBD100B36DB1 /* SyncErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD78102A29EBD100B36DB1 /* SyncErrorHandler.swift */; };
37FD78122A29EBD100B36DB1 /* SyncErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD78102A29EBD100B36DB1 /* SyncErrorHandler.swift */; };
46066CBC2D1330A100AB683B /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = 46066CBB2D1330A100AB683B /* Persistence */; };
467D16672D0C98D5007C020A /* CrashReportSenderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 467D16662D0C98D5007C020A /* CrashReportSenderExtensions.swift */; };
467D16682D0C98D5007C020A /* CrashReportSenderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 467D16662D0C98D5007C020A /* CrashReportSenderExtensions.swift */; };
4B0135CE2729F1AA00D54834 /* NSPasteboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0135CD2729F1AA00D54834 /* NSPasteboardExtension.swift */; };
Expand Down Expand Up @@ -1975,8 +1972,6 @@
84B479092CCA7A3E00F40329 /* Logger+UnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B479072CCA7A3900F40329 /* Logger+UnitTests.swift */; };
84B49F0D2CB10F0900FF08BB /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = 84B49F0C2CB10F0900FF08BB /* OHHTTPStubs */; };
84B49F0F2CB10F0900FF08BB /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 84B49F0E2CB10F0900FF08BB /* OHHTTPStubsSwift */; };
84BBC7FF2CFA0D2F00BAE57A /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 84BBC7FE2CFA0D2F00BAE57A /* TestUtils */; };
84BBC8012CFA0D3800BAE57A /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 84BBC8002CFA0D3800BAE57A /* TestUtils */; };
84C96E462CF9BB6400A80A01 /* malwareFilterSet.json in Resources */ = {isa = PBXBuildFile; fileRef = 84C96E442CF9BB6400A80A01 /* malwareFilterSet.json */; };
84C96E472CF9BB6400A80A01 /* malwareHashPrefixes.json in Resources */ = {isa = PBXBuildFile; fileRef = 84C96E452CF9BB6400A80A01 /* malwareHashPrefixes.json */; };
84C96E482CF9BB6400A80A01 /* malwareFilterSet.json in Resources */ = {isa = PBXBuildFile; fileRef = 84C96E442CF9BB6400A80A01 /* malwareFilterSet.json */; };
Expand Down Expand Up @@ -3180,6 +3175,7 @@
F118EA862BEACC7000F77634 /* NonStandardPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F118EA842BEACC7000F77634 /* NonStandardPixel.swift */; };
F1476FC02C1359FB00EAE46A /* SubscriptionUIHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1476FBF2C1359FB00EAE46A /* SubscriptionUIHandler.swift */; };
F1476FC12C1359FB00EAE46A /* SubscriptionUIHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1476FBF2C1359FB00EAE46A /* SubscriptionUIHandler.swift */; };
F15E544C2D3EB86100A91187 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F15E544B2D3EB86100A91187 /* PixelKitTestingUtilities */; };
F17114822C7C98FB009836C1 /* Logger+Favicons.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17114812C7C98FB009836C1 /* Logger+Favicons.swift */; };
F17114832C7C98FB009836C1 /* Logger+Favicons.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17114812C7C98FB009836C1 /* Logger+Favicons.swift */; };
F17114852C7C9D28009836C1 /* Logger+Fire.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17114842C7C9D28009836C1 /* Logger+Fire.swift */; };
Expand Down Expand Up @@ -3272,6 +3268,7 @@
F1DF95E42BD1807C0045E591 /* Crashes in Frameworks */ = {isa = PBXBuildFile; productRef = 537FC71EA5115A983FAF3170 /* Crashes */; };
F1DF95E52BD1807C0045E591 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = DC3F73D49B2D44464AFEFCD8 /* Subscription */; };
F1DF95E72BD188B60045E591 /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = F1DF95E62BD188B60045E591 /* LoginItems */; };
F1E9E5D22D3A86F60022D45B /* PersistenceTestingUtils in Frameworks */ = {isa = PBXBuildFile; productRef = F1E9E5D12D3A86F60022D45B /* PersistenceTestingUtils */; };
F1F861152C1B25D4005DB446 /* SubscriptionUIHandlerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F861142C1B25D4005DB446 /* SubscriptionUIHandlerMock.swift */; };
F1F861172C1B25D4005DB446 /* SubscriptionUIHandlerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F861142C1B25D4005DB446 /* SubscriptionUIHandlerMock.swift */; };
F1FD5B672C2B0AAA0040FA0D /* SubscriptionPagesUseSubscriptionFeature.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FD5B662C2B0AAA0040FA0D /* SubscriptionPagesUseSubscriptionFeature.swift */; };
Expand Down Expand Up @@ -5091,7 +5088,6 @@
4BCBE45A2BA7E17800FC75A1 /* Subscription in Frameworks */,
B6EC37FF29B8D915001ACE79 /* Configuration in Frameworks */,
567A23C52C7F75BB0010F66C /* SpecialErrorPages in Frameworks */,
372217822B33380700B8E9C2 /* TestUtils in Frameworks */,
3706FCAA293F65D500E42796 /* UserScript in Frameworks */,
5641734D2CFE169400F4B716 /* PixelExperimentKit in Frameworks */,
85E2BBD02B8F534A00DBEC7A /* History in Frameworks */,
Expand All @@ -5114,7 +5110,6 @@
files = (
3706FE88293F661700E42796 /* OHHTTPStubs in Frameworks */,
F116A7C72BD1925500F3FCF7 /* PixelKitTestingUtilities in Frameworks */,
84BBC7FF2CFA0D2F00BAE57A /* TestUtils in Frameworks */,
B65CD8CF2B316E0200A595BB /* SnapshotTesting in Frameworks */,
9DC5FACD2C6B8E620011F068 /* AppKitExtensions in Frameworks */,
374EFDF12D01C70A00B30939 /* Utilities in Frameworks */,
Expand All @@ -5129,6 +5124,7 @@
files = (
B65CD8D12B316E0C00A595BB /* SnapshotTesting in Frameworks */,
9DC5FACF2C6BA23C0011F068 /* AppKitExtensions in Frameworks */,
F15E544C2D3EB86100A91187 /* PixelKitTestingUtilities in Frameworks */,
84B49F0F2CB10F0900FF08BB /* OHHTTPStubsSwift in Frameworks */,
84B49F0D2CB10F0900FF08BB /* OHHTTPStubs in Frameworks */,
1EB028332C91C754005343F6 /* Common in Frameworks */,
Expand Down Expand Up @@ -5371,7 +5367,6 @@
37BA812D29B3CD690053F1A3 /* SyncUI in Frameworks */,
9D9DE5732C63AA0700D20B15 /* AppKitExtensions in Frameworks */,
F1DF95E72BD188B60045E591 /* LoginItems in Frameworks */,
372217802B3337FE00B8E9C2 /* TestUtils in Frameworks */,
CBECDB8A2CDBD616005B8B87 /* PageRefreshMonitor in Frameworks */,
7BA076BB2B65D61400D7FB72 /* NetworkProtectionProxy in Frameworks */,
4B4D60B12A0C83B900BCD287 /* NetworkProtectionUI in Frameworks */,
Expand All @@ -5385,13 +5380,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
46066CBC2D1330A100AB683B /* Persistence in Frameworks */,
B6DA44172616C13800DD1EC2 /* OHHTTPStubs in Frameworks */,
F116A7C32BD1924B00F3FCF7 /* PixelKitTestingUtilities in Frameworks */,
84BBC8012CFA0D3800BAE57A /* TestUtils in Frameworks */,
B65CD8CB2B316DF100A595BB /* SnapshotTesting in Frameworks */,
9DC5FACB2C6B8E050011F068 /* AppKitExtensions in Frameworks */,
374EFDEF2D01C70300B30939 /* Utilities in Frameworks */,
F1E9E5D22D3A86F60022D45B /* PersistenceTestingUtils in Frameworks */,
F1DA51A92BF6114C00CF29FA /* SubscriptionTestingUtilities in Frameworks */,
B6DA44192616C13800DD1EC2 /* OHHTTPStubsSwift in Frameworks */,
);
Expand Down Expand Up @@ -10011,7 +10005,6 @@
37DF000629F9C061002B7D3E /* SyncDataProviders */,
9DC70B192AA1FA5B005A844B /* LoginItems */,
37269EFC2B332FAC005E8E46 /* Common */,
372217812B33380700B8E9C2 /* TestUtils */,
4BF97AD02B43C43F00EB4240 /* NetworkProtectionIPC */,
4BF97AD22B43C43F00EB4240 /* NetworkProtectionUI */,
4BF97AD42B43C43F00EB4240 /* NetworkProtection */,
Expand Down Expand Up @@ -10070,7 +10063,6 @@
F116A7C62BD1925500F3FCF7 /* PixelKitTestingUtilities */,
F1DA51A42BF6114200CF29FA /* SubscriptionTestingUtilities */,
9DC5FACC2C6B8E620011F068 /* AppKitExtensions */,
84BBC7FE2CFA0D2F00BAE57A /* TestUtils */,
374EFDF02D01C70A00B30939 /* Utilities */,
);
productName = DuckDuckGoTests;
Expand Down Expand Up @@ -10098,6 +10090,7 @@
1EB028322C91C754005343F6 /* Common */,
84B49F0C2CB10F0900FF08BB /* OHHTTPStubs */,
84B49F0E2CB10F0900FF08BB /* OHHTTPStubsSwift */,
F15E544B2D3EB86100A91187 /* PixelKitTestingUtilities */,
);
productName = "Integration Tests";
productReference = 3706FEB2293F662100E42796 /* Integration Tests App Store.xctest */;
Expand Down Expand Up @@ -10502,7 +10495,6 @@
7BA59C9A2AE18B49009A97B1 /* SystemExtensionManager */,
31A3A4E22B0C115F0021063C /* DataBrokerProtection */,
37269EFA2B332F9E005E8E46 /* Common */,
3722177F2B3337FE00B8E9C2 /* TestUtils */,
7BA076BA2B65D61400D7FB72 /* NetworkProtectionProxy */,
85E2BBCD2B8F534000DBEC7A /* History */,
1EA7B8D22B7E078C000330A4 /* SubscriptionUI */,
Expand Down Expand Up @@ -10557,9 +10549,8 @@
F116A7C22BD1924B00F3FCF7 /* PixelKitTestingUtilities */,
F1DA51A82BF6114C00CF29FA /* SubscriptionTestingUtilities */,
9DC5FACA2C6B8E050011F068 /* AppKitExtensions */,
84BBC8002CFA0D3800BAE57A /* TestUtils */,
374EFDEE2D01C70300B30939 /* Utilities */,
46066CBB2D1330A100AB683B /* Persistence */,
F1E9E5D12D3A86F60022D45B /* PersistenceTestingUtils */,
);
productName = DuckDuckGoTests;
productReference = AA585D90248FD31400E9A3E2 /* Unit Tests.xctest */;
Expand Down Expand Up @@ -15385,8 +15376,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 226.0.0;
branch = fcappelli/authv2/networking_improvements;
kind = branch;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down Expand Up @@ -15657,16 +15648,6 @@
package = 371D00DF29D8509400EC8598 /* XCRemoteSwiftPackageReference "OpenSSL-XCFramework" */;
productName = OpenSSL;
};
3722177F2B3337FE00B8E9C2 /* TestUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = TestUtils;
};
372217812B33380700B8E9C2 /* TestUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = TestUtils;
};
37269EFA2B332F9E005E8E46 /* Common */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
Expand Down Expand Up @@ -15789,11 +15770,6 @@
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = Navigation;
};
46066CBB2D1330A100AB683B /* Persistence */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = Persistence;
};
4B2D062B2A11C0E100DE1F49 /* Networking */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
Expand Down Expand Up @@ -16041,16 +16017,6 @@
package = B6DA44152616C13800DD1EC2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */;
productName = OHHTTPStubsSwift;
};
84BBC7FE2CFA0D2F00BAE57A /* TestUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = TestUtils;
};
84BBC8002CFA0D3800BAE57A /* TestUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = TestUtils;
};
85D44B852BA08D29001B4AB5 /* Suggestions */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
Expand Down Expand Up @@ -16393,6 +16359,11 @@
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = PixelKitTestingUtilities;
};
F15E544B2D3EB86100A91187 /* PixelKitTestingUtilities */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = PixelKitTestingUtilities;
};
F198C7112BD18A28000BF24D /* PixelKit */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
Expand Down Expand Up @@ -16467,6 +16438,11 @@
isa = XCSwiftPackageProductDependency;
productName = LoginItems;
};
F1E9E5D12D3A86F60022D45B /* PersistenceTestingUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = PersistenceTestingUtils;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
Expand Down
31 changes: 29 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "d1275238d88f25cd31a29be2b4f20bbba5de9aa1",
"version" : "226.0.0"
"branch" : "fcappelli/authv2/networking_improvements",
"revision" : "7bbe6d302af60435e3ece133414c72de0bb7bf49"
}
},
{
Expand Down Expand Up @@ -72,6 +72,15 @@
"version" : "6.0.1"
}
},
{
"identity" : "jwt-kit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/jwt-kit.git",
"state" : {
"revision" : "c2595b9ad7f512d7f334830b4df1fed6e917946a",
"version" : "4.13.4"
}
},
{
"identity" : "lottie-spm",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -135,6 +144,24 @@
"version" : "1.4.0"
}
},
{
"identity" : "swift-asn1",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
"revision" : "ae33e5941bb88d88538d0a6b19ca0b01e6c76dcf",
"version" : "1.3.1"
}
},
{
"identity" : "swift-crypto",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto.git",
"state" : {
"revision" : "ff0f781cf7c6a22d52957e50b104f5768b50c779",
"version" : "3.10.0"
}
},
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
Expand Down
16 changes: 8 additions & 8 deletions DuckDuckGo/InfoPlist.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"localizations" : {
federicocappelli marked this conversation as resolved.
Show resolved Hide resolved
"de" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
Expand All @@ -19,43 +19,43 @@
},
"es" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "DuckDuckGo"
}
}
Expand Down
Loading