Merge pull request #31 from brokenhandsio/swift-format

Swift Format
brokenhandsio · Jan 1, 2025 · e4c4590 · e4c4590
2 parents 383ada9 + e6c17b8
commit e4c4590
Show file tree

Hide file tree

Showing 46 changed files with 676 additions and 585 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,21 +12,31 @@ jobs:
   ubuntu_test:
     name: Ubuntu Build & Test
     runs-on: ubuntu-22.04
-    container: swift:5.7.3-jammy
+    container: swift:6.0-jammy
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build
       run: swift build -v
     - name: Run tests
       run: swift test
   macos_test:
     name: macOS Build & Test
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
-    runs-on: macos-12
+    runs-on: macos-15
     steps:
-    - uses: actions/checkout@v3
+    - name: Select appropriate Xcode version
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+    - uses: actions/checkout@v4
     - name: Build
       run: swift build -v
     - name: Run tests
       run: swift test
+  format:
+    name: Lint Formatting
+    runs-on: ubuntu-22.04
+    container: swift:6.0-jammy
+    steps:
+    - uses: actions/checkout@v4
+    - name: Lint
+      run: swift format lint --strict --recursive .
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ DerivedData/
 .DS_Store
 db.sqlite
 .swiftpm
-
+Package.resolved
diff --git a/.swift-format b/.swift-format
@@ -0,0 +1,70 @@
+{
+  "fileScopedDeclarationPrivacy": {
+    "accessLevel": "private"
+  },
+  "indentation": {
+    "spaces": 4
+  },
+  "indentConditionalCompilationBlocks": true,
+  "indentSwitchCaseLabels": false,
+  "lineBreakAroundMultilineExpressionChainComponents": false,
+  "lineBreakBeforeControlFlowKeywords": false,
+  "lineBreakBeforeEachArgument": false,
+  "lineBreakBeforeEachGenericRequirement": false,
+  "lineLength": 140,
+  "maximumBlankLines": 1,
+  "multiElementCollectionTrailingCommas": true,
+  "noAssignmentInExpressions": {
+    "allowedFunctions": [
+      "XCTAssertNoThrow"
+    ]
+  },
+  "prioritizeKeepingFunctionOutputTogether": false,
+  "respectsExistingLineBreaks": true,
+  "rules": {
+    "AllPublicDeclarationsHaveDocumentation": false,
+    "AlwaysUseLiteralForEmptyCollectionInit": false,
+    "AlwaysUseLowerCamelCase": true,
+    "AmbiguousTrailingClosureOverload": true,
+    "BeginDocumentationCommentWithOneLineSummary": false,
+    "DoNotUseSemicolons": true,
+    "DontRepeatTypeInStaticProperties": true,
+    "FileScopedDeclarationPrivacy": true,
+    "FullyIndirectEnum": true,
+    "GroupNumericLiterals": true,
+    "IdentifiersMustBeASCII": true,
+    "NeverForceUnwrap": false,
+    "NeverUseForceTry": false,
+    "NeverUseImplicitlyUnwrappedOptionals": false,
+    "NoAccessLevelOnExtensionDeclaration": true,
+    "NoAssignmentInExpressions": true,
+    "NoBlockComments": true,
+    "NoCasesWithOnlyFallthrough": true,
+    "NoEmptyTrailingClosureParentheses": true,
+    "NoLabelsInCasePatterns": true,
+    "NoLeadingUnderscores": false,
+    "NoParensAroundConditions": true,
+    "NoPlaygroundLiterals": true,
+    "NoVoidReturnOnFunctionSignature": true,
+    "OmitExplicitReturns": false,
+    "OneCasePerLine": true,
+    "OneVariableDeclarationPerLine": true,
+    "OnlyOneTrailingClosureArgument": true,
+    "OrderedImports": true,
+    "ReplaceForEachWithForLoop": true,
+    "ReturnVoidInsteadOfEmptyTuple": true,
+    "TypeNamesShouldBeCapitalized": true,
+    "UseEarlyExits": false,
+    "UseExplicitNilCheckInConditions": true,
+    "UseLetInEveryBoundCaseVariable": true,
+    "UseShorthandTypeNames": true,
+    "UseSingleLinePropertyGetter": true,
+    "UseSynthesizedInitializer": true,
+    "UseTripleSlashForDocumentationComments": true,
+    "UseWhereClausesInForLoops": false,
+    "ValidateDocumentationComments": false
+  },
+  "spacesAroundRangeFormationOperators": false,
+  "tabWidth": 4,
+  "version": 1
+}
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -13,16 +13,18 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0")
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.111.0")
     ],
     targets: [
         .target(
             name: "VaporOAuth",
             dependencies: [.product(name: "Vapor", package: "vapor")]
         ),
-        .testTarget(name: "VaporOAuthTests", dependencies: [
-            .target(name: "VaporOAuth"),
-            .product(name: "XCTVapor", package: "vapor")
-        ])
+        .testTarget(
+            name: "VaporOAuthTests",
+            dependencies: [
+                .target(name: "VaporOAuth"),
+                .product(name: "XCTVapor", package: "vapor"),
+            ]),
     ]
 )
diff --git a/Sources/VaporOAuth/Helper/OAuthHelper+remote.swift b/Sources/VaporOAuth/Helper/OAuthHelper+remote.swift
@@ -104,9 +104,10 @@ extension OAuthHelper {
             guard let username: String = tokenInfoJSON[OAuthResponseParameters.username] else {
                 throw Abort(.internalServerError)
             }
-            oauthUser = OAuthUser(userID: userID, username: username,
-                                  emailAddress: tokenInfoJSON[String.self, at: OAuthResponseParameters.email],
-                                  password: "")
+            oauthUser = OAuthUser(
+                userID: userID, username: username,
+                emailAddress: tokenInfoJSON[String.self, at: OAuthResponseParameters.email],
+                password: "")
         }
 
         remoteTokenResponse = RemoteTokenResponse(scopes: scopes, user: oauthUser)

diff --git a/Sources/VaporOAuth/Helper/OAuthHelper.swift b/Sources/VaporOAuth/Helper/OAuthHelper.swift
@@ -6,7 +6,7 @@ public struct OAuthHelper {
 
     public init(
         assertScopes: @escaping ([String]?, Request) async throws -> Void,
-        user: @escaping (Request) async throws  -> OAuthUser
+        user: @escaping (Request) async throws -> OAuthUser
     ) {
         self.assertScopes = assertScopes
         self.user = user

diff --git a/Sources/VaporOAuth/Models/OAuthClient.swift b/Sources/VaporOAuth/Models/OAuthClient.swift
@@ -12,8 +12,10 @@ public final class OAuthClient: Extendable {
 
     public var extend: Vapor.Extend = .init()
 
-    public init(clientID: String, redirectURIs: [String]?, clientSecret: String? = nil, validScopes: [String]? = nil,
-                confidential: Bool? = nil, firstParty: Bool = false, allowedGrantType: OAuthFlowType) {
+    public init(
+        clientID: String, redirectURIs: [String]?, clientSecret: String? = nil, validScopes: [String]? = nil,
+        confidential: Bool? = nil, firstParty: Bool = false, allowedGrantType: OAuthFlowType
+    ) {
         self.clientID = clientID
         self.redirectURIs = redirectURIs
         self.clientSecret = clientSecret