Skip to content

Commit e84ce77

Browse files
committed
Drop VaporToOpenAPI
1 parent cb69d0c commit e84ce77

File tree

7 files changed

+83
-206
lines changed

7 files changed

+83
-206
lines changed

Package.resolved

Lines changed: 1 addition & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ let package = Package(
3636
.package(url: "https://github.com/SwiftPackageIndex/SemanticVersion.git", from: "0.3.0"),
3737
.package(url: "https://github.com/SwiftPackageIndex/ShellOut.git", from: "3.1.4"),
3838
.package(url: "https://github.com/swiftlang/swift-package-manager.git", branch: "release/5.10"),
39-
.package(url: "https://github.com/dankinsoid/VaporToOpenAPI.git", from: "4.4.4"),
4039
.package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "1.0.0"),
4140
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.8.0"),
4241
.package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0"),
@@ -75,7 +74,6 @@ let package = Package(
7574
.product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
7675
.product(name: "SwiftPMPackageCollections", package: "swift-package-manager"),
7776
.product(name: "Vapor", package: "vapor"),
78-
.product(name: "VaporToOpenAPI", package: "VaporToOpenAPI"),
7977
.product(name: "SotoCognitoAuthentication", package: "soto-cognito-authentication")
8078
],
8179
swiftSettings: swiftSettings,

Sources/App/Controllers/API/Types+WithExample.swift

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@
1414

1515
import Foundation
1616

17-
import VaporToOpenAPI
1817
import DependencyResolution
1918
import PackageCollectionsSigning
2019

20+
#warning("Keep this?")
21+
protocol WithExample { }
22+
2123

2224
// MARK: - External types
2325

24-
extension Date: VaporToOpenAPI.WithExample {
26+
extension Date: WithExample {
2527
public static var example: Self { .init(rfc1123: "Sat, 25 Apr 2020 10:55:00 UTC")! }
2628
}
2729

30+
extension UUID: WithExample {
31+
static var example: Self { .init() }
32+
}
33+
2834

2935
// MARK: - Internal types
3036

@@ -101,7 +107,7 @@ extension API.PostPackageCollectionDTO: WithExample {
101107
}
102108
}
103109

104-
extension PackageCollectionModel.V1.Collection: VaporToOpenAPI.WithExample {
110+
extension PackageCollectionModel.V1.Collection: WithExample {
105111
public static var example: Self {
106112
.init(name: "Packages by mona",
107113
overview: "A collection of packages authored by mona from the Swift Package Index",
@@ -120,7 +126,7 @@ extension PackageCollectionModel.V1.Collection: VaporToOpenAPI.WithExample {
120126
}
121127
}
122128

123-
extension PackageCollectionModel.V1.Signature.Certificate: VaporToOpenAPI.WithExample {
129+
extension PackageCollectionModel.V1.Signature.Certificate: WithExample {
124130
public static var example: Self {
125131
.init(subject: .init(userID: "V676TFACYJ",
126132
commonName: "Swift Package Collection: SPI Operations Limited",
@@ -133,13 +139,13 @@ extension PackageCollectionModel.V1.Signature.Certificate: VaporToOpenAPI.WithEx
133139
}
134140
}
135141

136-
extension PackageCollectionModel.V1.Signature: VaporToOpenAPI.WithExample {
142+
extension PackageCollectionModel.V1.Signature: WithExample {
137143
public static var example: Self {
138144
.init(signature: "ewogICJhbGciIDogIlJ...<snip>...WD1pXXPrkvVJlv4w", certificate: .example)
139145
}
140146
}
141147

142-
extension PackageCollectionSigning.Model.SignedCollection: VaporToOpenAPI.WithExample {
148+
extension PackageCollectionSigning.Model.SignedCollection: WithExample {
143149
public static var example: Self {
144150
.init(collection: .example, signature: .example)
145151
}

Sources/App/Core/Authentication/User.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import Authentication
1616
import Dependencies
1717
import JWTKit
1818
import Vapor
19-
import VaporToOpenAPI
2019

2120

2221
struct User: Authenticatable, Equatable {
@@ -67,15 +66,3 @@ extension User {
6766
}
6867
}
6968
}
70-
71-
72-
extension AuthSchemeObject {
73-
static var apiBearerToken: Self {
74-
.bearer(id: "api_token",
75-
description: "Token used for API access.")
76-
}
77-
static var builderBearerToken: Self {
78-
.bearer(id: "builder_token",
79-
description: "Token used for build result reporting.")
80-
}
81-
}

Sources/App/routes+documentation.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,76 @@ func docRoutes(_ app: Application) throws {
2222
// redirected to the fully formed documentation URL.
2323
app.get(":owner", ":repository", "documentation") { req -> Response in
2424
req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
25-
}.excludeFromOpenAPI()
25+
}
2626
app.get(":owner", ":repository", "documentation", "**") { req -> Response in
2727
req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
28-
}.excludeFromOpenAPI()
28+
}
2929
app.get(":owner", ":repository", "tutorials", "**") { req -> Response in
3030
req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .tutorials))
31-
}.excludeFromOpenAPI()
31+
}
3232
app.get(":owner", ":repository", ":reference", "documentation") { req -> Response in
3333
req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
34-
}.excludeFromOpenAPI()
34+
}
3535

3636
// Stable URLs with reference (real reference or ~)
3737
app.get(":owner", ":repository", ":reference", "documentation", ":archive") {
3838
let route = try await $0.getDocRoute(fragment: .documentation)
3939
return try await PackageController.documentation(req: $0, route: route)
40-
}.excludeFromOpenAPI()
40+
}
4141
app.get(":owner", ":repository", ":reference", "documentation", ":archive", "**") {
4242
let route = try await $0.getDocRoute(fragment: .documentation)
4343
return try await PackageController.documentation(req: $0, route: route)
44-
}.excludeFromOpenAPI()
44+
}
4545
app.get(":owner", ":repository", ":reference", .fragment(.faviconIco)) {
4646
let route = try await $0.getDocRoute(fragment: .faviconIco)
4747
return try await PackageController.documentation(req: $0, route: route)
48-
}.excludeFromOpenAPI()
48+
}
4949
app.get(":owner", ":repository", ":reference", .fragment(.faviconSvg)) {
5050
let route = try await $0.getDocRoute(fragment: .faviconSvg)
5151
return try await PackageController.documentation(req: $0, route: route)
52-
}.excludeFromOpenAPI()
52+
}
5353
app.get(":owner", ":repository", ":reference", "css", "**") {
5454
let route = try await $0.getDocRoute(fragment: .css)
5555
return try await PackageController.documentation(req: $0, route: route)
56-
}.excludeFromOpenAPI()
56+
}
5757
app.get(":owner", ":repository", ":reference", "data", "**") {
5858
let route = try await $0.getDocRoute(fragment: .data)
5959
return try await PackageController.documentation(req: $0, route: route)
60-
}.excludeFromOpenAPI()
60+
}
6161
app.get(":owner", ":repository", ":reference", "images", "**") {
6262
let fragment: DocRoute.Fragment = $0.parameters.hasSuffix(".svg", caseInsensitive: true) ? .svgImages : .images
6363
let route = try await $0.getDocRoute(fragment: fragment)
6464
return try await PackageController.documentation(req: $0, route: route)
65-
}.excludeFromOpenAPI()
65+
}
6666
app.get(":owner", ":repository", ":reference", "img", "**") {
6767
let fragment: DocRoute.Fragment = $0.parameters.hasSuffix(".svg", caseInsensitive: true) ? .svgImg : .img
6868
let route = try await $0.getDocRoute(fragment: fragment)
6969
return try await PackageController.documentation(req: $0, route: route)
70-
}.excludeFromOpenAPI()
70+
}
7171
app.get(":owner", ":repository", ":reference", "index", "**") {
7272
let route = try await $0.getDocRoute(fragment: .index)
7373
return try await PackageController.documentation(req: $0, route: route)
74-
}.excludeFromOpenAPI()
74+
}
7575
app.get(":owner", ":repository", ":reference", "js", "**") {
7676
let route = try await $0.getDocRoute(fragment: .js)
7777
return try await PackageController.documentation(req: $0, route: route)
78-
}.excludeFromOpenAPI()
78+
}
7979
app.get(":owner", ":repository", ":reference", .fragment(.linkablePaths)) {
8080
let route = try await $0.getDocRoute(fragment: .linkablePaths)
8181
return try await PackageController.documentation(req: $0, route: route)
82-
}.excludeFromOpenAPI()
82+
}
8383
app.get(":owner", ":repository", ":reference", .fragment(.themeSettings)) {
8484
let route = try await $0.getDocRoute(fragment: .themeSettings)
8585
return try await PackageController.documentation(req: $0, route: route)
86-
}.excludeFromOpenAPI()
86+
}
8787
app.get(":owner", ":repository", ":reference", "tutorials", "**") {
8888
let route = try await $0.getDocRoute(fragment: .tutorials)
8989
return try await PackageController.documentation(req: $0, route: route)
90-
}.excludeFromOpenAPI()
90+
}
9191
app.get(":owner", ":repository", ":reference", "videos", "**") {
9292
let route = try await $0.getDocRoute(fragment: .videos)
9393
return try await PackageController.documentation(req: $0, route: route)
94-
}.excludeFromOpenAPI()
94+
}
9595
}
9696

9797

0 commit comments

Comments
 (0)