Merge pull request #95 from writeas/login-fail-gracefully-invalid-url

Remove URL path from server string before logging in
writefreely · Oct 12, 2020 · ca6ab8c · ca6ab8c
2 parents 69a9b5e + 73c0b12
commit ca6ab8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Shared/Models/WriteFreelyModel.swift b/Shared/Models/WriteFreelyModel.swift
@@ -94,8 +94,12 @@ extension WriteFreelyModel {
             serverString = serverString.replacingOccurrences(of: insecureProtocolPrefix, with: secureProtocolPrefix)
         }
         isLoggingIn = true
-        account.server = serverString
-        client = WFClient(for: URL(string: serverString)!)
+        var serverURL = URL(string: serverString)!
+        if !serverURL.path.isEmpty {
+            serverURL.deleteLastPathComponent()
+        }
+        account.server = serverURL.absoluteString
+        client = WFClient(for: serverURL)
         client?.login(username: username, password: password, completion: loginHandler)
     }
 

diff --git a/WriteFreely-MultiPlatform.xcodeproj/project.pbxproj b/WriteFreely-MultiPlatform.xcodeproj/project.pbxproj
@@ -1141,7 +1141,7 @@
 			repositoryURL = "[email protected]:writeas/writefreely-swift.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.1.1;
+				minimumVersion = 0.2.3;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */