fix(refresh): prevent sign-outs on non-400 http statuses

rownd · Nov 21, 2022 · 8af36fb · 8af36fb
1 parent 6503c0a
commit 8af36fb
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 87 deletions.
diff --git a/RowndFramework.xcodeproj/project.pbxproj b/RowndFramework.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		B302E2BD28641AA9005FD927 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2BC28641AA9005FD927 /* Context.swift */; };
 		B302E2C028641F41005FD927 /* AppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2BF28641F41005FD927 /* AppConfig.swift */; };
 		B302E2C228642329005FD927 /* Rownd.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2C128642329005FD927 /* Rownd.swift */; };
-		B302E2C72865012F005FD927 /* ReSwiftThunk in Frameworks */ = {isa = PBXBuildFile; productRef = B302E2C62865012F005FD927 /* ReSwiftThunk */; };
 		B302E2C928650C1D005FD927 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2C828650C1D005FD927 /* APIClient.swift */; };
 		B302E2CB28662749005FD927 /* APIResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2CA28662748005FD927 /* APIResource.swift */; };
 		B302E2CD2866C75A005FD927 /* Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B302E2CC2866C75A005FD927 /* Auth.swift */; };
@@ -65,6 +64,8 @@
 		B396004528D4348D00754238 /* Get in Frameworks */ = {isa = PBXBuildFile; productRef = B396004428D4348D00754238 /* Get */; };
 		B39ECA9728E242B10055CB60 /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = B39ECA9628E242B10055CB60 /* Lottie */; };
 		B39ECA9E28E2A2B50055CB60 /* LottieSwiftView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39ECA9D28E2A2B50055CB60 /* LottieSwiftView.swift */; };
+		B3B164F6292C13FE002129A7 /* ReSwift in Frameworks */ = {isa = PBXBuildFile; productRef = B3B164F5292C13FE002129A7 /* ReSwift */; };
+		B3B164FD292C1567002129A7 /* ReSwiftThunk in Frameworks */ = {isa = PBXBuildFile; productRef = B3B164FC292C1567002129A7 /* ReSwiftThunk */; };
 		B3F01B0328A8A60800EE764B /* KeyTransferViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F01B0228A8A60800EE764B /* KeyTransferViewController.swift */; };
 		B3F01B0528A8A66700EE764B /* KeyTransferView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F01B0428A8A66700EE764B /* KeyTransferView.swift */; };
 		B3F01B0C28AB55B600EE764B /* RowndApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F01B0B28AB55B600EE764B /* RowndApi.swift */; };
@@ -157,11 +158,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B302E2C72865012F005FD927 /* ReSwiftThunk in Frameworks */,
 				B38A40C92882727F00FD0813 /* SwiftKeychainWrapper in Frameworks */,
 				B30FBD9428E7811D00216034 /* CodeScanner_Rownd in Frameworks */,
 				B30FBD8F28E780BF00216034 /* GoogleSignIn in Frameworks */,
 				B30FBD9128E780BF00216034 /* GoogleSignInSwift in Frameworks */,
+				B3B164FD292C1567002129A7 /* ReSwiftThunk in Frameworks */,
 				B38A40A12881157D00FD0813 /* LBBottomSheet in Frameworks */,
 				C5ACD08E28E38D9B00A9F2D9 /* AnyCodable in Frameworks */,
 				B347C27B287CB46A00935115 /* JWTDecode in Frameworks */,
@@ -187,6 +188,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B3B164F6292C13FE002129A7 /* ReSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -430,7 +432,6 @@
 			name = Rownd;
 			packageProductDependencies = (
 				B302E2BA28641A7A005FD927 /* ReSwift */,
-				B302E2C62865012F005FD927 /* ReSwiftThunk */,
 				B347C27A287CB46A00935115 /* JWTDecode */,
 				B38A40A02881157D00FD0813 /* LBBottomSheet */,
 				B38A40C82882727F00FD0813 /* SwiftKeychainWrapper */,
@@ -443,6 +444,7 @@
 				B30FBD9028E780BF00216034 /* GoogleSignInSwift */,
 				B30FBD9328E7811D00216034 /* CodeScanner_Rownd */,
 				B36AA913291DF829002B3B60 /* Factory */,
+				B3B164FC292C1567002129A7 /* ReSwiftThunk */,
 			);
 			productName = framework;
 			productReference = B374E55828545A1C00955719 /* Rownd.framework */;
@@ -483,6 +485,9 @@
 			dependencies = (
 			);
 			name = RowndFrameworkTestApp;
+			packageProductDependencies = (
+				B3B164F5292C13FE002129A7 /* ReSwift */,
+			);
 			productName = RowndFrameworkTestApp;
 			productReference = B38A40B72882185800FD0813 /* RowndFrameworkTestApp.app */;
 			productType = "com.apple.product-type.application";
@@ -524,7 +529,6 @@
 			mainGroup = B374E54E28545A1C00955719;
 			packageReferences = (
 				B302E2B928641A7A005FD927 /* XCRemoteSwiftPackageReference "ReSwift" */,
-				B302E2C52865012F005FD927 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */,
 				B347C279287CB46900935115 /* XCRemoteSwiftPackageReference "JWTDecode" */,
 				B38A409F2881157D00FD0813 /* XCRemoteSwiftPackageReference "LBBottomSheet" */,
 				B38A40C72882727E00FD0813 /* XCRemoteSwiftPackageReference "SwiftKeychainWrapper" */,
@@ -537,6 +541,7 @@
 				B30FBD9228E7811D00216034 /* XCRemoteSwiftPackageReference "CodeScanner_Rownd" */,
 				B36AA909291D7273002B3B60 /* XCRemoteSwiftPackageReference "Mocker" */,
 				B36AA912291DF829002B3B60 /* XCRemoteSwiftPackageReference "Factory" */,
+				B3B164FB292C1566002129A7 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */,
 			);
 			productRefGroup = B374E55928545A1C00955719 /* Products */;
 			projectDirPath = "";
@@ -997,14 +1002,6 @@
 				minimumVersion = 6.0.0;
 			};
 		};
-		B302E2C52865012F005FD927 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/ReSwift/ReSwift-Thunk.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 2.0.0;
-			};
-		};
 		B30FBD8D28E780BF00216034 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git";
@@ -1093,6 +1090,14 @@
 				minimumVersion = 3.0.0;
 			};
 		};
+		B3B164FB292C1566002129A7 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/ReSwift/ReSwift-Thunk.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.0.0;
+			};
+		};
 		C5ACD08728E389C500A9F2D9 /* XCRemoteSwiftPackageReference "AnyCodable" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Flight-School/AnyCodable";
@@ -1109,11 +1114,6 @@
 			package = B302E2B928641A7A005FD927 /* XCRemoteSwiftPackageReference "ReSwift" */;
 			productName = ReSwift;
 		};
-		B302E2C62865012F005FD927 /* ReSwiftThunk */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B302E2C52865012F005FD927 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */;
-			productName = ReSwiftThunk;
-		};
 		B30FBD8E28E780BF00216034 /* GoogleSignIn */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B30FBD8D28E780BF00216034 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
@@ -1174,6 +1174,16 @@
 			package = B39ECA9528E242B10055CB60 /* XCRemoteSwiftPackageReference "lottie-ios" */;
 			productName = Lottie;
 		};
+		B3B164F5292C13FE002129A7 /* ReSwift */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B302E2B928641A7A005FD927 /* XCRemoteSwiftPackageReference "ReSwift" */;
+			productName = ReSwift;
+		};
+		B3B164FC292C1567002129A7 /* ReSwiftThunk */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B3B164FB292C1566002129A7 /* XCRemoteSwiftPackageReference "ReSwift-Thunk" */;
+			productName = ReSwiftThunk;
+		};
 		C5ACD08D28E38D9B00A9F2D9 /* AnyCodable */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = C5ACD08728E389C500A9F2D9 /* XCRemoteSwiftPackageReference "AnyCodable" */;

diff --git a/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist b/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Rownd.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>0</integer>
 		</dict>
 		<key>RowndFrameworkTestApp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>2</integer>
 		</dict>
 		<key>RowndTests.xcscheme_^#shared#^_</key>
 		<dict>