Skip to content

Commit cace241

Browse files
jamampjamamp
committed
Fix login by removing interval field
1 parent 3f3443c commit cace241

6 files changed

Lines changed: 10 additions & 23 deletions

File tree

‎FloatplaneAPIClient/FloatplaneAPIClient/Classes/OpenAPIs/Models/PlanInfoV2ResponsePlansInner.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public struct PlanInfoV2ResponsePlansInner: Content, Hashable {
2020
public var priceYearly: String?
2121
public var currency: String
2222
public var logo: String?
23-
public var interval: String
2423
public var featured: Bool
2524
public var allowGrandfatheredAccess: Bool?
2625
public var discordServers: [DiscordServerModel]
@@ -35,15 +34,14 @@ public struct PlanInfoV2ResponsePlansInner: Content, Hashable {
3534
public var userIsGrandfathered: Bool?
3635
public var enabledGlobal: Bool
3736

38-
public init(id: String, title: String, description: String, price: String?, priceYearly: String? = nil, currency: String, logo: String?, interval: String, featured: Bool, allowGrandfatheredAccess: Bool? = nil, discordServers: [DiscordServerModel], discordRoles: [DiscordRoleModel], createdAt: Date, updatedAt: Date?, enabled: Bool, paymentID: Int?, trialPeriod: Double, creator: String, userIsSubscribed: Bool, userIsGrandfathered: Bool? = nil, enabledGlobal: Bool) {
37+
public init(id: String, title: String, description: String, price: String?, priceYearly: String? = nil, currency: String, logo: String?, featured: Bool, allowGrandfatheredAccess: Bool? = nil, discordServers: [DiscordServerModel], discordRoles: [DiscordRoleModel], createdAt: Date, updatedAt: Date?, enabled: Bool, paymentID: Int?, trialPeriod: Double, creator: String, userIsSubscribed: Bool, userIsGrandfathered: Bool? = nil, enabledGlobal: Bool) {
3938
self.id = id
4039
self.title = title
4140
self.description = description
4241
self.price = price
4342
self.priceYearly = priceYearly
4443
self.currency = currency
4544
self.logo = logo
46-
self.interval = interval
4745
self.featured = featured
4846
self.allowGrandfatheredAccess = allowGrandfatheredAccess
4947
self.discordServers = discordServers
@@ -67,7 +65,6 @@ public struct PlanInfoV2ResponsePlansInner: Content, Hashable {
6765
case priceYearly
6866
case currency
6967
case logo
70-
case interval
7168
case featured
7269
case allowGrandfatheredAccess
7370
case discordServers
@@ -94,7 +91,6 @@ public struct PlanInfoV2ResponsePlansInner: Content, Hashable {
9491
try container.encodeIfPresent(priceYearly, forKey: .priceYearly)
9592
try container.encode(currency, forKey: .currency)
9693
try container.encode(logo, forKey: .logo)
97-
try container.encode(interval, forKey: .interval)
9894
try container.encode(featured, forKey: .featured)
9995
try container.encodeIfPresent(allowGrandfatheredAccess, forKey: .allowGrandfatheredAccess)
10096
try container.encode(discordServers, forKey: .discordServers)

‎FloatplaneAPIClient/FloatplaneAPIClient/Classes/OpenAPIs/Models/SubscriptionPlanModel.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,19 @@ public struct SubscriptionPlanModel: Content, Hashable {
2020
public var priceYearly: String?
2121
public var currency: String
2222
public var logo: String?
23-
public var interval: String
2423
public var featured: Bool
2524
public var allowGrandfatheredAccess: Bool?
2625
public var discordServers: [DiscordServerModel]
2726
public var discordRoles: [DiscordRoleModel]
2827

29-
public init(id: String, title: String, description: String, price: String?, priceYearly: String? = nil, currency: String, logo: String?, interval: String, featured: Bool, allowGrandfatheredAccess: Bool? = nil, discordServers: [DiscordServerModel], discordRoles: [DiscordRoleModel]) {
28+
public init(id: String, title: String, description: String, price: String?, priceYearly: String? = nil, currency: String, logo: String?, featured: Bool, allowGrandfatheredAccess: Bool? = nil, discordServers: [DiscordServerModel], discordRoles: [DiscordRoleModel]) {
3029
self.id = id
3130
self.title = title
3231
self.description = description
3332
self.price = price
3433
self.priceYearly = priceYearly
3534
self.currency = currency
3635
self.logo = logo
37-
self.interval = interval
3836
self.featured = featured
3937
self.allowGrandfatheredAccess = allowGrandfatheredAccess
4038
self.discordServers = discordServers
@@ -49,7 +47,6 @@ public struct SubscriptionPlanModel: Content, Hashable {
4947
case priceYearly
5048
case currency
5149
case logo
52-
case interval
5350
case featured
5451
case allowGrandfatheredAccess
5552
case discordServers
@@ -67,7 +64,6 @@ public struct SubscriptionPlanModel: Content, Hashable {
6764
try container.encodeIfPresent(priceYearly, forKey: .priceYearly)
6865
try container.encode(currency, forKey: .currency)
6966
try container.encode(logo, forKey: .logo)
70-
try container.encode(interval, forKey: .interval)
7167
try container.encode(featured, forKey: .featured)
7268
try container.encodeIfPresent(allowGrandfatheredAccess, forKey: .allowGrandfatheredAccess)
7369
try container.encode(discordServers, forKey: .discordServers)

‎Wasserflug-tvOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@
855855
CODE_SIGN_ENTITLEMENTS = "Wasserflug-tvOS/Wasserflug-tvOS.entitlements";
856856
CODE_SIGN_IDENTITY = "Apple Development";
857857
CODE_SIGN_STYLE = Automatic;
858-
CURRENT_PROJECT_VERSION = 36;
858+
CURRENT_PROJECT_VERSION = 38;
859859
DEVELOPMENT_ASSET_PATHS = "\"Wasserflug-tvOS/Preview Content\"";
860860
DEVELOPMENT_TEAM = 2TJ5K7WSP8;
861861
ENABLE_PREVIEWS = YES;
@@ -887,7 +887,7 @@
887887
CODE_SIGN_ENTITLEMENTS = "Wasserflug-tvOS/Wasserflug-tvOS.entitlements";
888888
CODE_SIGN_IDENTITY = "Apple Development";
889889
CODE_SIGN_STYLE = Automatic;
890-
CURRENT_PROJECT_VERSION = 36;
890+
CURRENT_PROJECT_VERSION = 38;
891891
DEVELOPMENT_ASSET_PATHS = "\"Wasserflug-tvOS/Preview Content\"";
892892
DEVELOPMENT_TEAM = 2TJ5K7WSP8;
893893
ENABLE_PREVIEWS = YES;
@@ -1073,8 +1073,8 @@
10731073
isa = XCRemoteSwiftPackageReference;
10741074
repositoryURL = "https://github.com/mkrd/Swift-BigInt.git";
10751075
requirement = {
1076-
kind = upToNextMajorVersion;
1077-
minimumVersion = 2.2.1;
1076+
kind = exactVersion;
1077+
version = 2.4.0;
10781078
};
10791079
};
10801080
E7E713312CB4EB19003B8A0F /* XCRemoteSwiftPackageReference "multipart-kit" */ = {

‎Wasserflug-tvOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

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

‎Wasserflug-tvOS/Views/LoginView2.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ struct LoginView2: View {
8686
}
8787
}
8888
case .authorized:
89-
// For some reason we're trying to login while already authorized.
90-
// Force the re-auth to continue by clearing and starting a new authorization.
89+
/// For some reason we're trying to login while already authorized.
90+
/// Force the re-auth to continue by clearing and starting a new authorization.
9191
oauth.clear()
9292
if let provider = oauth.providers.first {
9393
oauth.authorize(provider: provider, grantType: .deviceCode)

‎floatplane-openapi-specification-trimmed.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,9 +2374,6 @@
23742374
"type": "string",
23752375
"nullable": true
23762376
},
2377-
"interval": {
2378-
"type": "string"
2379-
},
23802377
"featured": {
23812378
"type": "boolean"
23822379
},
@@ -2404,7 +2401,6 @@
24042401
"price",
24052402
"currency",
24062403
"logo",
2407-
"interval",
24082404
"featured",
24092405
"discordServers",
24102406
"discordRoles"
@@ -7155,7 +7151,6 @@
71557151
"priceYearly": "50.00",
71567152
"currency": "usd",
71577153
"logo": null,
7158-
"interval": "month",
71597154
"featured": true,
71607155
"allowGrandfatheredAccess": false,
71617156
"discordServers": [],

0 commit comments

Comments
 (0)