hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions 4

Fix SwiftLint errors

Browse source
This commit is contained in:
Conrad Kramer 2024-09-07 17:36:48 -07:00
parent fa1ef6fcda
commit 3fbb520a10
5 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Apple/App/AppDelegate.swift
View file

@ -2,7 +2,8 @@
import AppKit
import SwiftUI
@MainActor @main
@main
@MainActor
class AppDelegate: NSObject, NSApplicationDelegate {
private let quitItem: NSMenuItem = {
let quitItem = NSMenuItem(

1
Apple/App/BurrowView.swift
View file

@ -42,7 +42,6 @@ struct BurrowView: View {
}
private func addWireGuardNetwork() {
}
private func authenticateWithSlack() async throws {

46
Apple/App/OAuth2.swift
View file

@ -1,6 +1,6 @@
import AuthenticationServices
import SwiftUI
import Foundation
import SwiftUI
enum OAuth2 {
enum Error: Swift.Error {
@ -35,7 +35,7 @@ enum OAuth2 {
}
}
public init(
init(
authorizationEndpoint: URL,
tokenEndpoint: URL,
redirectURI: URL,
@ -125,7 +125,11 @@ enum OAuth2 {
var refreshToken: String?
var credential: Credential {
.init(accessToken: accessToken, refreshToken: refreshToken, expirationDate: expiresIn.map { Date.init(timeIntervalSinceNow: $0) })
.init(
accessToken: accessToken,
refreshToken: refreshToken,
expirationDate: expiresIn.map { Date(timeIntervalSinceNow: $0) }
)
}
}
@ -203,7 +207,24 @@ enum OAuth2 {
}
extension WebAuthenticationSession {
func start(url: URL, redirectURI: URL) async throws -> URL {
#if canImport(BrowserEngineKit)
@available(iOS 17.4, macOS 14.4, tvOS 17.4, watchOS 10.4, *)
fileprivate static func callback(for redirectURI: URL) throws -> ASWebAuthenticationSession.Callback {
switch redirectURI.scheme {
case "https":
guard let host = redirectURI.host else { throw OAuth2.Error.invalidRedirectURI }
return .https(host: host, path: redirectURI.path)
case "http":
throw OAuth2.Error.invalidRedirectURI
case .some(let scheme):
return .customScheme(scheme)
case .none:
throw OAuth2.Error.invalidRedirectURI
}
}
#endif
fileprivate func start(url: URL, redirectURI: URL) async throws -> URL {
#if canImport(BrowserEngineKit)
if #available(iOS 17.4, macOS 14.4, tvOS 17.4, watchOS 10.4, *) {
return try await authenticate(
@ -231,23 +252,6 @@ extension WebAuthenticationSession {
return url
}
}
#if canImport(BrowserEngineKit)
@available(iOS 17.4, macOS 14.4, tvOS 17.4, watchOS 10.4, *)
fileprivate static func callback(for redirectURI: URL) throws -> ASWebAuthenticationSession.Callback {
switch redirectURI.scheme {
case "https":
guard let host = redirectURI.host else { throw OAuth2.Error.invalidRedirectURI }
return .https(host: host, path: redirectURI.path)
case "http":
throw OAuth2.Error.invalidRedirectURI
case .some(let scheme):
return .customScheme(scheme)
case .none:
throw OAuth2.Error.invalidRedirectURI
}
}
#endif
}
extension View {