💄 Run Swiftlint

Author: lukasackee

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         .library(
             name: "OpenGoogleSignInSDK",
             targets: ["OpenGoogleSignInSDK"]
-        ),
+        )
     ],
     dependencies: [],
     targets: [
@@ -22,6 +22,6 @@ let package = Package(
         .testTarget(
             name: "OpenGoogleSignInSDKTests",
             dependencies: ["OpenGoogleSignInSDK"]
-        ),
+        )
     ]
 )

Sources/OpenGoogleSignInSDK/Model/GoogleSignInError.swift

@@ -5,44 +5,20 @@ public enum GoogleSignInError: Error, Equatable {
     case authenticationError(Error)
     case invalidCode
     case invalidResponse
-    case invalidTokenRequest
     case networkError(Error)
     case tokenDecodingError(Error)
     case userCancelledSignInFlow
     case noProfile(Error)
 }
 
-extension GoogleSignInError: LocalizedError {
-    public var errorDescription: String? {
-        switch self {
-        case let .authenticationError(error):
-            return "authenticationError, underlying error \(error.localizedDescription)"
-        case .invalidCode:
-            return "invalidCode"
-        case .invalidResponse:
-            return "invalidResponse"
-        case .invalidTokenRequest:
-            return "invalidTokenRequest"
-        case let .networkError(error):
-            return "network, underlying error \(error.localizedDescription)"
-        case let .tokenDecodingError(error):
-            return "tokenDecoding, underlying error \(error.localizedDescription)"
-        case .userCancelledSignInFlow:
-            return "userCancelledSignInFlow"
-        case let .noProfile(error):
-            return "noProfile, underlying error \(error.localizedDescription)"
-        }
-    }
-}
-
 public func == (lhs: Error, rhs: Error) -> Bool {
     guard type(of: lhs) == type(of: rhs) else { return false }
     let error1 = lhs as NSError
     let error2 = rhs as NSError
     return error1.domain == error2.domain && error1.code == error2.code && "\(lhs)" == "\(rhs)"
 }
 
-extension Equatable where Self : Error {
+extension Equatable where Self: Error {
     public static func == (lhs: Self, rhs: Self) -> Bool {
         lhs as Error == rhs as Error
     }

Sources/OpenGoogleSignInSDK/Model/GoogleUser.swift

@@ -2,44 +2,44 @@ import Foundation
 
 /// Google sign-in user account.
 public struct GoogleUser: Codable, Equatable {
-    
+
     /// User's profile info.
     ///
     /// All the properties are optional according
     /// to the [documentation](https://googleapis.dev/nodejs/googleapis/latest/oauth2/interfaces/Schema$Userinfo.html#info).
     public struct Profile: Codable, Equatable {
-        
+
         /// The obfuscated ID of the user.
         public let id: String?
-        
+
         /// The user's email address.
         public let email: String?
-        
+
         /// Boolean flag which is true if the email address is verified.
         /// Always verified because we only return the user's primary email address.
         public let verifiedEmail: Bool?
-        
+
         /// The user's full name.
         public let name: String?
-        
+
         /// The user's first name.
         public let givenName: String?
-        
+
         /// The user's last name.
         public let familyName: String?
-        
+
         /// The user's gender.
         public let gender: String?
-        
+
         /// URL of the profile page.
         public let link: URL?
-        
+
         /// URL of the user's picture image.
         public let picture: URL?
-        
+
         /// The hosted domain e.g. example.com if the user is Google apps user.
         public let hd: String?
-        
+
         /// The user's preferred locale.
         public let locale: String?
     }

Sources/OpenGoogleSignInSDK/OpenGoogleSignInSDK.swift

@@ -21,38 +21,38 @@ public final class OpenGoogleSignIn: NSObject {
     // MARK: - Public properties
 
     public weak var delegate: OpenGoogleSignInDelegate?
-    
+
     /// The client ID of the app.
     /// It is required for communication with Google API to work.
     public var clientID: String = ""
-    
+
     public var audience: String?
 
     /// Client secret.
     /// It is only used when exchanging the authorization code for an access token.
     public var clientSecret: String = ""
-    
+
     /// `URLSession` used to perform data tasks.
     public var session: URLSession = URLSession.shared
-    
+
     /// Shared `OpenGoogleSignIn` instance
     public static let shared: OpenGoogleSignIn = OpenGoogleSignIn()
-    
+
     /// API scopes requested by the app
     public var scopes: Set<GoogleSignInScope> = [.email, .openID, .profile]
-    
+
     /// View controller to present Google sign-in flow.
     /// Needs to be set for presenting to work correctly.
-    public weak var presentingViewController: ViewController? = nil
-    
+    public weak var presentingViewController: ViewController?
+
     // MARK: - Private properties
 
     /// Session used to authenticate a user with Google sign-in.
-    private var authenticationSession: ASWebAuthenticationSession? = nil
-    
+    private var authenticationSession: ASWebAuthenticationSession?
+
     /// Google API OAuth 2.0 token url.
     private static let tokenURL: URL? = URL(string: "https://www.googleapis.com/oauth2/v4/token")
-    
+
     /// Google API profile url
     private static let profileURL: URL? = URL(string: "https://www.googleapis.com/oauth2/v1/userinfo?alt=json")
 
@@ -79,7 +79,7 @@ public final class OpenGoogleSignIn: NSObject {
             URLQueryItem(name: "client_id", value: clientID),
             URLQueryItem(name: "redirect_uri", value: redirectURI),
             URLQueryItem(name: "response_type", value: "code"),
-            URLQueryItem(name: "scope", value: scopes),
+            URLQueryItem(name: "scope", value: scopes)
         ]
 
         return components.url!
@@ -144,7 +144,7 @@ public final class OpenGoogleSignIn: NSObject {
     }
 
     // MARK: - Private helpers
-    
+
     /// Decodes `GoogleUser` from OAuth 2.0 response.
     private func decodeUser(from data: Data) throws -> GoogleUser {
         try JSONDecoder.app.decode(GoogleUser.self, from: data)
@@ -195,7 +195,7 @@ public final class OpenGoogleSignIn: NSObject {
                 let profile = try? JSONDecoder.app.decode(GoogleUser.Profile.self, from: data)
                 user.profile = profile
                 completion(.success(user))
-                
+
             case let .failure(error):
                 completion(.failure(.noProfile(error)))
             }
@@ -219,14 +219,14 @@ public final class OpenGoogleSignIn: NSObject {
         }
         task.resume()
     }
-    
+
     /// Returns `code` parsed from provided `redirectURL`.
     private func parseCode(from redirectURL: URL) -> String? {
         let components = URLComponents(url: redirectURL, resolvingAgainstBaseURL: false)
 
         return components?.queryItems?.first(where: { $0.name == "code" })?.value
     }
-    
+
     /// Returns `URLRequest` to retrieve Google sign-in OAuth 2.0 token using arameters provided by the app.
     private func makeTokenRequest(with code: String) -> URLRequest? {
         guard let tokenURL = OpenGoogleSignIn.tokenURL else { return nil }
@@ -242,7 +242,7 @@ public final class OpenGoogleSignIn: NSObject {
             "grant_type": "authorization_code",
             "redirect_uri": redirectURI
         ]
-        
+
         if let audience = audience {
             parameters["audience"] = audience
         }
@@ -252,7 +252,7 @@ public final class OpenGoogleSignIn: NSObject {
             .joined(separator: "&")
 
         request.httpBody = body.data(using: .utf8)
-        
+
         return request
     }
 

Tests/OpenGoogleSignInSDKTests/Mocks/MockOpenGoogleSignInDelegate.swift

@@ -4,20 +4,20 @@ import XCTest
 final class MockOpenGoogleSignInDelegate: OpenGoogleSignInDelegate {
     var user: GoogleUser?
     var error: GoogleSignInError?
-    
+
     private var expectation: XCTestExpectation?
     private let testCase: XCTestCase
-    
+
     init(testCase: XCTestCase) {
         self.testCase = testCase
     }
-    
+
     func expectSignInFinish() {
         expectation = testCase.expectation(description: "Expect sign-in flow to finish")
     }
-    
+
     // MARK: - OAuthGoogleSignInDelegate
-    
+
     func sign(didSignInFor user: GoogleUser?, withError error: GoogleSignInError?) {
         self.user = user
         self.error = error

Tests/OpenGoogleSignInSDKTests/Mocks/MockURLSession.swift

@@ -3,14 +3,14 @@ import Foundation
 final class MockURLSession: URLSession {
     var data: Data?
     var error: Error?
-    
+
     override func dataTask(
         with request: URLRequest,
         completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void
     ) -> URLSessionDataTask {
         let data = self.data
         let error = self.error
-        
+
         return MockURLSessionDataTask {
             completionHandler(data, nil, error)
         }

Tests/OpenGoogleSignInSDKTests/OpenGoogleSignInSDKTests.swift

@@ -5,45 +5,45 @@ final class OpenGoogleSignInTests: XCTestCase {
     var sharedInstance: OpenGoogleSignIn!
     var mockDelegate: MockOpenGoogleSignInDelegate!
     var session: MockURLSession!
-    
+
     override func setUp() {
         super.setUp()
 
         sharedInstance = OpenGoogleSignIn.shared
-        
+
         mockDelegate = MockOpenGoogleSignInDelegate(testCase: self)
         sharedInstance.delegate = mockDelegate
-        
+
         session = MockURLSession()
     }
-    
+
     override func tearDown() {
         session = nil
 
         super.tearDown()
     }
-    
+
     func test_invalidCodeError_isThrown() {
         // Given
         let url = URL(string: "https://google.com")!
         mockDelegate.expectSignInFinish()
-        
+
         // When
         sharedInstance.handle(url)
         waitForExpectations(timeout: 0.5)
-        
+
         // Then
         XCTAssertEqual(mockDelegate.error, GoogleSignInError.invalidCode)
         XCTAssertNil(mockDelegate.user)
     }
-    
+
     func test_invalidResponseError_isThrown() {
         // Given
         let url = URL(string: "https://google.com?code=1234")!
         mockDelegate.expectSignInFinish()
         session.data = nil
         sharedInstance.session = session
-        
+
         // When
         sharedInstance.handle(url)
         waitForExpectations(timeout: 0.5)
@@ -52,52 +52,52 @@ final class OpenGoogleSignInTests: XCTestCase {
         XCTAssertEqual(mockDelegate.error, GoogleSignInError.invalidResponse)
         XCTAssertNil(mockDelegate.user)
     }
-    
+
     func test_validUserIsReceived() {
         // Given
         let url = URL(string: "https://google.com?code=1234")!
         mockDelegate.expectSignInFinish()
-        
+
         let user = mockUser()
         let encoder = JSONEncoder()
         guard let data = try? encoder.encode(user) else { return }
-        
+
         session.data = data
         sharedInstance.session = session
-    
+
         // When
         sharedInstance.handle(url)
         waitForExpectations(timeout: 0.5)
-        
+
         // Then
         XCTAssertNil(mockDelegate.error)
         XCTAssertNotNil(mockDelegate.user)
     }
-    
+
     // Since `URL` has optional initializer we need to
     // check if the URL provided by us is valid and
     // therefore we don't need to worry about this edge case.
     func test_tokenRequest_isValid() {
         // When
         let request = sharedInstance.makeTokenRequest(with: "code")
-        
+
         // Then
         XCTAssertNotNil(request)
     }
-    
+
     // Since `URL` has optional initializer we need to
     // check if the URL provided by us is valid and
     // therefore we don't need to worry about this edge case.
     func test_profileRequest_isValid() {
         // Given
         let user = mockUser()
-        
+
         // Then
         XCTAssertNotNil(sharedInstance.makeProfileRequest(user: user))
     }
-    
+
     // MARK: - Private helpers
-    
+
     private func mockUser() -> GoogleUser {
         GoogleUser(
             accessToken: "accessToken",