Skip to content

Commit 38d0b2a

Browse files
authored
Поправил запросы (#258)
SWClient не обрабатывает ошибку получения токена - просто передает его в сетевой сервис и все, даже если там `nil`
1 parent 2a3e47e commit 38d0b2a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@
846846
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
847847
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
848848
CODE_SIGN_STYLE = Automatic;
849-
CURRENT_PROJECT_VERSION = 8;
849+
CURRENT_PROJECT_VERSION = 1;
850850
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
851851
DEVELOPMENT_TEAM = CR68PP2Z3F;
852852
ENABLE_PREVIEWS = YES;
@@ -867,7 +867,7 @@
867867
"$(inherited)",
868868
"@executable_path/Frameworks",
869869
);
870-
MARKETING_VERSION = 3.5.9;
870+
MARKETING_VERSION = 3.5.10;
871871
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
872872
PRODUCT_NAME = WorkoutApp;
873873
RUN_CLANG_STATIC_ANALYZER = YES;
@@ -896,7 +896,7 @@
896896
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
897897
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
898898
CODE_SIGN_STYLE = Automatic;
899-
CURRENT_PROJECT_VERSION = 8;
899+
CURRENT_PROJECT_VERSION = 1;
900900
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
901901
DEVELOPMENT_TEAM = CR68PP2Z3F;
902902
ENABLE_PREVIEWS = YES;
@@ -917,7 +917,7 @@
917917
"$(inherited)",
918918
"@executable_path/Frameworks",
919919
);
920-
MARKETING_VERSION = 3.5.9;
920+
MARKETING_VERSION = 3.5.10;
921921
PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
922922
PRODUCT_NAME = WorkoutApp;
923923
RUN_CLANG_STATIC_ANALYZER = YES;

SwiftUI-WorkoutApp/Libraries/SWNetworkClient/Sources/SWNetworkClient/SWClient.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ public struct SWClient: Sendable {
573573

574574
extension SWClient {
575575
private func makeStatus(for request: URLRequest?) async throws -> Bool {
576-
let encodedString = try await defaults.basicAuthInfo().base64Encoded
577576
do {
577+
let encodedString = try? await defaults.basicAuthInfo().base64Encoded
578578
return try await service.makeStatus(for: request, encodedString: encodedString)
579579
} catch APIError.invalidCredentials {
580580
if canForceLogout {
@@ -587,8 +587,8 @@ extension SWClient {
587587
}
588588

589589
private func makeResult<T: Decodable>(_ type: T.Type, for request: URLRequest?) async throws -> T {
590-
let encodedString = try await defaults.basicAuthInfo().base64Encoded
591590
do {
591+
let encodedString = try? await defaults.basicAuthInfo().base64Encoded
592592
return try await service.makeResult(type, for: request, encodedString: encodedString)
593593
} catch APIError.invalidCredentials {
594594
if canForceLogout {

0 commit comments

Comments
 (0)