mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2025-01-03 02:28:41 +00:00
Code Issues Projects Releases Wiki Activity

Renaming

Browse source
This commit is contained in:
Justin Mazzocchi 2020-08-08 18:37:46 -07:00
parent 330d796442
commit 6f487524dd
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Development Assets/DevelopmentModels.swift
View file

@ -75,7 +75,7 @@ extension AppEnvironment {
identityDatabase: IdentityDatabase = .fresh(), identityDatabase: IdentityDatabase = .fresh(),
defaults: Defaults = .fresh(), defaults: Defaults = .fresh(),
secrets: Secrets = .fresh(), secrets: Secrets = .fresh(),
webAuthSessionType: WebAuthSession.Type = SuccessfulStubbingWebAuthSession.self) -> AppEnvironment { webAuthSessionType: WebAuthSessionType.Type = SuccessfulMockWebAuthSession.self) -> AppEnvironment {
AppEnvironment( AppEnvironment(
URLSessionConfiguration: URLSessionConfiguration, URLSessionConfiguration: URLSessionConfiguration,
identityDatabase: identityDatabase, identityDatabase: identityDatabase,
@ -89,7 +89,7 @@ extension AppEnvironment {
identityDatabase: .development, identityDatabase: .development,
defaults: .development, defaults: .development,
secrets: .development, secrets: .development,
webAuthSessionType: SuccessfulStubbingWebAuthSession.self) webAuthSessionType: SuccessfulMockWebAuthSession.self)
} }
extension IdentityService { extension IdentityService {

6
Development Assets/StubbingWebAuthSession.swift → Development Assets/MockWebAuthSession.swift
View file

@ -2,7 +2,7 @@
import Foundation import Foundation
class StubbingWebAuthSession: WebAuthSession { class MockWebAuthSession: WebAuthSessionType {
let completionHandler: WebAuthSessionCompletionHandler let completionHandler: WebAuthSessionCompletionHandler
let url: URL let url: URL
let callbackURLScheme: String? let callbackURLScheme: String?
@ -32,7 +32,7 @@ class StubbingWebAuthSession: WebAuthSession {
} }
} }
class SuccessfulStubbingWebAuthSession: StubbingWebAuthSession { class SuccessfulMockWebAuthSession: MockWebAuthSession {
private let redirectURL: URL private let redirectURL: URL
required init( required init(
@ -59,7 +59,7 @@ class SuccessfulStubbingWebAuthSession: StubbingWebAuthSession {
} }
} }
class CanceledLoginStubbingWebAuthSession: StubbingWebAuthSession { class CanceledLoginMockWebAuthSession: MockWebAuthSession {
override var completionHandlerError: Error? { override var completionHandlerError: Error? {
WebAuthSessionError(.canceledLogin) WebAuthSessionError(.canceledLogin)
} }

16
Metatext.xcodeproj/project.pbxproj
View file

@ -84,8 +84,8 @@
D06B492024D3FB8000642749 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D06B491E24D3F7FE00642749 /* Localizable.strings */; }; D06B492024D3FB8000642749 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D06B491E24D3F7FE00642749 /* Localizable.strings */; };
D06B492324D4611300642749 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D06B492224D4611300642749 /* KingfisherSwiftUI */; }; D06B492324D4611300642749 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D06B492224D4611300642749 /* KingfisherSwiftUI */; };
D06B492524D4612400642749 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D06B492424D4612400642749 /* KingfisherSwiftUI */; }; D06B492524D4612400642749 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = D06B492424D4612400642749 /* KingfisherSwiftUI */; };
D074577724D29006004758DB /* StubbingWebAuthSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577624D29006004758DB /* StubbingWebAuthSession.swift */; }; D074577724D29006004758DB /* MockWebAuthSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577624D29006004758DB /* MockWebAuthSession.swift */; };
D074577824D29006004758DB /* StubbingWebAuthSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577624D29006004758DB /* StubbingWebAuthSession.swift */; }; D074577824D29006004758DB /* MockWebAuthSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577624D29006004758DB /* MockWebAuthSession.swift */; };
D074577A24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */; }; D074577A24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */; };
D074577B24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */; }; D074577B24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */; };
D081A40524D0F1A8001B016E /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D081A40424D0F1A8001B016E /* String+Extensions.swift */; }; D081A40524D0F1A8001B016E /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D081A40424D0F1A8001B016E /* String+Extensions.swift */; };
@ -218,7 +218,7 @@
D0666A6E24C6DFB300F3F04B /* AccessToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessToken.swift; sourceTree = "<group>"; }; D0666A6E24C6DFB300F3F04B /* AccessToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessToken.swift; sourceTree = "<group>"; };
D0666A7124C6E0D300F3F04B /* Secrets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = "<group>"; }; D0666A7124C6E0D300F3F04B /* Secrets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = "<group>"; };
D06B491E24D3F7FE00642749 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; }; D06B491E24D3F7FE00642749 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
D074577624D29006004758DB /* StubbingWebAuthSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StubbingWebAuthSession.swift; sourceTree = "<group>"; }; D074577624D29006004758DB /* MockWebAuthSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWebAuthSession.swift; sourceTree = "<group>"; };
D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSessionConfiguration+Extensions.swift"; sourceTree = "<group>"; }; D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSessionConfiguration+Extensions.swift"; sourceTree = "<group>"; };
D081A40424D0F1A8001B016E /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; }; D081A40424D0F1A8001B016E /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
D0A1CA7324DAC2F1003063E9 /* KingfisherOptionsInfo+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KingfisherOptionsInfo+Extensions.swift"; sourceTree = "<group>"; }; D0A1CA7324DAC2F1003063E9 /* KingfisherOptionsInfo+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KingfisherOptionsInfo+Extensions.swift"; sourceTree = "<group>"; };
@ -536,13 +536,13 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D04FD74124D4AA34007D572D /* DevelopmentModels.swift */, D04FD74124D4AA34007D572D /* DevelopmentModels.swift */,
D0DC177624D0CF2600A75C65 /* MockKeychainService.swift */,
D052BBC824D74B6400A80A7A /* MockUserDefaults.swift */,
D0DC175724D0130800A75C65 /* HTTPStubs.swift */, D0DC175724D0130800A75C65 /* HTTPStubs.swift */,
D0DC174824CFF13700A75C65 /* Mastodon API Stubs */, D0DC174824CFF13700A75C65 /* Mastodon API Stubs */,
D0DC177624D0CF2600A75C65 /* MockKeychainService.swift */,
D052BBC824D74B6400A80A7A /* MockUserDefaults.swift */,
D074577624D29006004758DB /* MockWebAuthSession.swift */,
D0DC174C24CFF1F100A75C65 /* Stubbing.swift */, D0DC174C24CFF1F100A75C65 /* Stubbing.swift */,
D0DC174524CFEC2000A75C65 /* StubbingURLProtocol.swift */, D0DC174524CFEC2000A75C65 /* StubbingURLProtocol.swift */,
D074577624D29006004758DB /* StubbingWebAuthSession.swift */,
D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */, D074577924D29366004758DB /* URLSessionConfiguration+Extensions.swift */,
); );
path = "Development Assets"; path = "Development Assets";
@ -803,7 +803,7 @@
D0091B6E24DD68090040E8D2 /* PreferencesView.swift in Sources */, D0091B6E24DD68090040E8D2 /* PreferencesView.swift in Sources */,
D0159F8F24DE743700E78478 /* IdentitiesView.swift in Sources */, D0159F8F24DE743700E78478 /* IdentitiesView.swift in Sources */,
D0DB6EF424C5228A00D965FE /* AddIdentityView.swift in Sources */, D0DB6EF424C5228A00D965FE /* AddIdentityView.swift in Sources */,
D074577724D29006004758DB /* StubbingWebAuthSession.swift in Sources */, D074577724D29006004758DB /* MockWebAuthSession.swift in Sources */,
D0159FA524DE989700E78478 /* NSMutableAttributedString+Extensions.swift in Sources */, D0159FA524DE989700E78478 /* NSMutableAttributedString+Extensions.swift in Sources */,
D0ED1BCE24CF768200B4899C /* MastodonEndpoint.swift in Sources */, D0ED1BCE24CF768200B4899C /* MastodonEndpoint.swift in Sources */,
D074577A24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */, D074577A24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */,
@ -876,7 +876,7 @@
D019E6EA24DF72E700697C7D /* InstanceEndpoint.swift in Sources */, D019E6EA24DF72E700697C7D /* InstanceEndpoint.swift in Sources */,
D0159F9C24DE748C00E78478 /* SidebarNavigationView.swift in Sources */, D0159F9C24DE748C00E78478 /* SidebarNavigationView.swift in Sources */,
D019E6F124DF7C2F00697C7D /* DatabaseError.swift in Sources */, D019E6F124DF7C2F00697C7D /* DatabaseError.swift in Sources */,
D074577824D29006004758DB /* StubbingWebAuthSession.swift in Sources */, D074577824D29006004758DB /* MockWebAuthSession.swift in Sources */,
D0ED1BCF24CF768200B4899C /* MastodonEndpoint.swift in Sources */, D0ED1BCF24CF768200B4899C /* MastodonEndpoint.swift in Sources */,
D074577B24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */, D074577B24D29366004758DB /* URLSessionConfiguration+Extensions.swift in Sources */,
D0ED1BB824CE47F400B4899C /* WebAuthSession.swift in Sources */, D0ED1BB824CE47F400B4899C /* WebAuthSession.swift in Sources */,

2
Shared/MetatextApp.swift
View file

@ -20,7 +20,7 @@ struct MetatextApp: App {
identityDatabase: identityDatabase, identityDatabase: identityDatabase,
defaults: Defaults(userDefaults: .standard), defaults: Defaults(userDefaults: .standard),
secrets: Secrets(keychainService: KeychainService(serviceName: "com.metabolist.metatext")), secrets: Secrets(keychainService: KeychainService(serviceName: "com.metabolist.metatext")),
webAuthSessionType: RealWebAuthSession.self) webAuthSessionType: WebAuthSession.self)
} }
var body: some Scene { var body: some Scene {

2
Shared/Model/AppEnvironment.swift
View file

@ -7,5 +7,5 @@ struct AppEnvironment {
let identityDatabase: IdentityDatabase let identityDatabase: IdentityDatabase
let defaults: Defaults let defaults: Defaults
let secrets: Secrets let secrets: Secrets
let webAuthSessionType: WebAuthSession.Type let webAuthSessionType: WebAuthSessionType.Type
} }

8
Shared/Networking/WebAuthSession.swift
View file

@ -4,7 +4,7 @@ import Foundation
import AuthenticationServices import AuthenticationServices
import Combine import Combine
protocol WebAuthSession: AnyObject { protocol WebAuthSessionType: AnyObject {
init(url URL: URL, init(url URL: URL,
callbackURLScheme: String?, callbackURLScheme: String?,
completionHandler: @escaping WebAuthSessionCompletionHandler) completionHandler: @escaping WebAuthSessionCompletionHandler)
@ -12,7 +12,7 @@ protocol WebAuthSession: AnyObject {
@discardableResult func start() -> Bool @discardableResult func start() -> Bool
} }
extension WebAuthSession { extension WebAuthSessionType {
static func publisher( static func publisher(
url: URL, url: URL,
callbackURLScheme: String?, callbackURLScheme: String?,
@ -44,6 +44,6 @@ class WebAuthSessionContextProvider: NSObject, ASWebAuthenticationPresentationCo
typealias WebAuthSessionCompletionHandler = ASWebAuthenticationSession.CompletionHandler typealias WebAuthSessionCompletionHandler = ASWebAuthenticationSession.CompletionHandler
typealias WebAuthSessionError = ASWebAuthenticationSessionError typealias WebAuthSessionError = ASWebAuthenticationSessionError
typealias WebAuthPresentationContextProviding = ASWebAuthenticationPresentationContextProviding typealias WebAuthPresentationContextProviding = ASWebAuthenticationPresentationContextProviding
typealias RealWebAuthSession = ASWebAuthenticationSession typealias WebAuthSession = ASWebAuthenticationSession
extension RealWebAuthSession: WebAuthSession {} extension WebAuthSession: WebAuthSessionType {}

2
Shared/View Models/AddIdentityViewModel.swift
View file

@ -114,7 +114,7 @@ private extension Publisher where Output == AppAuthorization {
private extension Publisher where Output == (AppAuthorization, URL), Failure == Error { private extension Publisher where Output == (AppAuthorization, URL), Failure == Error {
func authenticate( func authenticate(
webAuthSessionType: WebAuthSession.Type, webAuthSessionType: WebAuthSessionType.Type,
contextProvider: WebAuthSessionContextProvider, contextProvider: WebAuthSessionContextProvider,
callbackURLScheme: String) -> AnyPublisher<(AppAuthorization, URL), Error> { callbackURLScheme: String) -> AnyPublisher<(AppAuthorization, URL), Error> {
flatMap { appAuthorization, url in flatMap { appAuthorization, url in

2
Tests/View Models/AddIdentityViewModelTests.swift
View file

@ -61,7 +61,7 @@ class AddIdentityViewModelTests: XCTestCase {
} }
func testDoesNotAlertCanceledLogin() throws { func testDoesNotAlertCanceledLogin() throws {
let environment = AppEnvironment.fresh(webAuthSessionType: CanceledLoginStubbingWebAuthSession.self) let environment = AppEnvironment.fresh(webAuthSessionType: CanceledLoginMockWebAuthSession.self)
let sut = AddIdentityViewModel(environment: environment) let sut = AddIdentityViewModel(environment: environment)
let recorder = sut.$alertItem.record() let recorder = sut.$alertItem.record()