fix login bug

Author: GhazanfarShahbaz

MarkStream.xcodeproj/project.pbxproj

@@ -18,7 +18,7 @@
 		6A8BC28A2C33AF3500200875 /* ObsidianRequester.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8BC2892C33AF3500200875 /* ObsidianRequester.swift */; };
 		6A8BC2912C3651B000200875 /* ObsidianRequester.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8BC2892C33AF3500200875 /* ObsidianRequester.swift */; };
 		6A8BC2922C3651B300200875 /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8BC2872C33A7FE00200875 /* KeychainManager.swift */; };
-		6A8BC2992C365AF100200875 /* TokenGranterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AF76F4A2C311468000F58B8 /* TokenGranterTests.swift */; };
+		6AB544CF2C37937200189E1F /* TokenGranterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AF76F4A2C311468000F58B8 /* TokenGranterTests.swift */; };
 		6ADA4F302C310C540057C65D /* MarkStreamApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ADA4F2F2C310C540057C65D /* MarkStreamApp.swift */; };
 		6ADA4F322C310C540057C65D /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ADA4F312C310C540057C65D /* Persistence.swift */; };
 		6ADA4F352C310C540057C65D /* MarkStream.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 6ADA4F332C310C540057C65D /* MarkStream.xcdatamodeld */; };
@@ -528,7 +528,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6A8BC2992C365AF100200875 /* TokenGranterTests.swift in Sources */,
+				6AB544CF2C37937200189E1F /* TokenGranterTests.swift in Sources */,
 				6ADA4F472C310C560057C65D /* MarkStreamTests.swift in Sources */,
 				6ADA4F622C310E5A0057C65D /* TokenGranter.swift in Sources */,
 				6A8BC2912C3651B000200875 /* ObsidianRequester.swift in Sources */,

MarkStream/MainEntryView/LoginView.swift

@@ -18,7 +18,7 @@ struct LoginView: View {
 
     func validate_user() async -> Bool {
         let setCorrectly = TokenGranter.shared.set_username_and_password(username: self.username, password: self.password);
-        
+                
         if(setCorrectly){
             return await TokenGranter.shared.grant_access_token();
         }
@@ -62,13 +62,13 @@ struct LoginView: View {
 
             Button(action: {
                 // Implement your login logic here
-                print("Login button tapped")
                 self.isAuthenticating = true // Disable inputs and button
 
 
                 Task {
                     let validated: Bool = await validate_user()
                     self.isAuthenticated = validated;
+                    self.showError = false;
 
 
                     if(validated){
@@ -94,7 +94,6 @@ struct LoginView: View {
 
         }
         .padding()
-        
     }
 }
 

MarkStream/MainEntryView/MarkdownViews/MarkdownFileView.swift

@@ -20,3 +20,4 @@ struct MarkdownFileView: View {
     MarkdownFileView(fileName: "Some File Here")
         .preferredColorScheme(.dark)
 }
+

MarkStream/ServerRequester/TokenGranter.swift

@@ -61,7 +61,7 @@ class TokenGranter {
 
 
     public func set_username_and_password(username: String, password: String) -> Bool {
-        if(self.username().isEmpty || self.password().isEmpty){
+        if(username.isEmpty || password.isEmpty){
             return false;
         }
 
@@ -124,7 +124,7 @@ class TokenGranter {
                 }
             }
         }
-//        
+
 //        return await withCheckedContinuation { continuation in
 //            AF.request(
 //                grantTokenUrl,

MarkStreamTests/TokenGranterTests.swift

@@ -17,12 +17,12 @@ class TokenGranterTests: XCTestCase {
     override func setUp() {
         super.setUp()
 
-        // Read local.config
-        
+    
+
         self.username = ProcessInfo.processInfo.environment["APP_USERNAME"] ?? "";
         self.password = ProcessInfo.processInfo.environment["APP_PASSWORD"] ?? "";
 
-        // TURN ON FOR LOCLA TESTING, ENABLE loca.confog targets for markstream
+//         // TURN ON FOR LOCAL TESTING, ENABLE loca.confog targets for markstream
 //        if(self.username.isEmpty){
 //            let configPath = Bundle.main.path(forResource: "local", ofType: "config") //
 //