condensed some code

Author: Chase Crawford

README.md

@@ -1 +1,10 @@
-# assim-js-packages
+# Assimalign LLC
+Assimalign LLC is a company based on open source code. The meaning of Assimalign is to assimilate new technology and align them with real world senerios regardless of industry. Within this respository all packages are open source and are inteded to solve particuler problems in real world situations, so please feel free to contribute anytime whether it be updates or ne package additions.
+
+Within this particulatr repository please only contribute Javasript or Typescript based packages. Please refer to all other repostories
+
+## Repostiroy Standards
+- I believe in centralized reposories and reducingdependenies accross
+# Assimalign Json Packackages
+All the package within this respositry are Javascript 
+## 

src/msal-capacitor-plugin/ios/Plugin/Plugin.swift

@@ -5,6 +5,8 @@ import MSAL
 @objc(MsalCap)
 public class MsalPlugin: CAPPlugin {
 
+    typealias AccountCompletion = (MSALAccount?) -> Void
+
     var account: MSALAccount?
     var authResults: MSALResult?
     var client: MSALPublicClientApplication?
@@ -24,38 +26,42 @@ public class MsalPlugin: CAPPlugin {
 
     @objc func setOptions(_ call: CAPPluginCall) {
         do {
-            guard let authorityUri = call.getString("authority") else {
-                return
-            }
-            guard let clientId = call.getString("clientId") else {
-                return
-            }
-            guard let redirectUri  = call.getString("redirectUri") else {
-                return
-            }
-            guard let authorityUrl = URL(string: authorityUri ) else {
-                return
-            }
+            // Step 01: Validate all Options have been passed from  Plugin bridge
+            guard let authorityUri = call.getString("authority") else { return }
+            guard let clientId = call.getString("clientId") else {return }
+            guard let redirectUri  = call.getString("redirectUri") else {return }
+            guard let authorityUrl = URL(string: authorityUri ) else {return }
 
+            // Step 02: If made it this point, then set & create Configuraitons, Authority, & Public Client 
             let clientAuthority = try MSALAADAuthority(url: authorityUrl)
             let clientConfiguration = MSALPublicClientApplicationConfig(clientId: clientId, redirectUri: redirectUri, authority: clientAuthority)
 
+            // Step 03: Set plugin errors
             self.client = try MSALPublicClientApplication(configuration: clientConfiguration)
             self.popupScopes = call.getArray("scopes", String.self)
             self.hasOptions = true
             self.authenticated = false
+
+            // Step 04: Need to resolve void and send response back to the bridge
             call.resolve()
 
         } catch let error {
-            call.error("", error, [
-                "results": "Unable to set options"
+            call.error("Initialization Error", error, [
+                "results": "Unable to set options in iOS Plugin"
             ])
         }
     }
 
     @objc func acquireAccessTokenForUser(_ call: CAPPluginCall) {
-        if self.authenticated == true && self.authResults != nil && self.client != nil{
+        // Step 01: Check if Options have been set
+        if self.hasOptions == false {
+            call.reject("AcquireAccessTokenForUser Error: MSAL Plugin Options have not been set yet. Please run 'setOptions'")
+            return
+        }
 
+        if self.authenticated == true {
+
+            // Step 01: 
             let msalParameters = MSALParameters()
             msalParameters.completionBlockQueue = DispatchQueue.main
 
@@ -65,11 +71,9 @@ public class MsalPlugin: CAPPlugin {
                 }
             })
 
+            // Step
             guard let scopes = call.getArray("scopes", String.self) else {
-                return
-            }
-            
-            guard let account = self.account else {
+                call.reject("AcquireAccessToken Error: No Scopes were provided")
                 return
             }
 
@@ -94,12 +98,19 @@ public class MsalPlugin: CAPPlugin {
                 ])
             })
         } else {
-            call.reject("User has not been Authenticated yet. Please Login first before calling this request")
+            call.reject("AcquireAccessToken Error: User has not been Authenticated yet. Please Login first before calling this request")
         }
     }
 
     @objc func acquireUserRoles(_ call: CAPPluginCall) {
-        if self.hasOptions == true && self.authenticated == true {
+        // Step 01: Check if Options have been set
+        if self.hasOptions == false {
+            call.reject("AcquireUserRoles Error: MSAL Plugin Options have not been set yet. Please run 'setOptions'")
+            return
+        }
+        
+        // Step 02: Check if 
+        if self.authenticated == true {
             guard let claims = self.account?.accountClaims else {
                 call.resolve([
                     "results": []
@@ -116,10 +127,16 @@ public class MsalPlugin: CAPPlugin {
         } else {
             call.reject("Eiether Plugin Confgiuraitons have not been set or the user has not been authenticated")
         }
-        
     }
 
     @objc func acquireAuthenticationResult(_ call: CAPPluginCall) {
+        // Step 01: Check if Options have been set
+        if self.Options == false {
+            call.reject("")
+            return
+        }
+
+        // Step 02: 
         guard let response = self.authResults else {
             call.resolve([
                 "results": []
@@ -151,19 +168,27 @@ public class MsalPlugin: CAPPlugin {
     }
 
     @objc func isAuthenticated(_ call: CAPPluginCall) {
+        // Step 01: Check if Options have been set
+        if self.hasOptions == false {
+            call.reject("isAuthenticated Error: MSAL Plugin Options have not been set yet. Please run 'setOptions'")
+            return
+        }
+
         call.resolve([
             "results": self.authenticated
         ])
     }
 
     @objc func login(_ call: CAPPluginCall)  {
+        // Step 01: Check if Options have been set
         if self.hasOptions == false {
-            call.reject("Options have not been set")
+            call.reject("Login Error: MSAL Plugin Options have not been set yet. Please run 'setOptions'")
             return
         }
 
+        // Step 03: Dispatch
         DispatchQueue.main.async {
-            self.loadAccount {(account) in
+            self.setCurrentAccount {(account) in
                 guard let currentAccount = self.account else {
                     self.loginInteractive(call)
                     return
@@ -174,18 +199,24 @@ public class MsalPlugin: CAPPlugin {
     }
 
     @objc func logout(_ call: CAPPluginCall) {
+        // Step 01: Check if Options have been set
+        if self.hasOptions == false {
+            call.reject("Logout Error: MSAL Plugin Options have not been set yet. Please run 'setOptions'")
+            return
+        }
+
         DispatchQueue.main.async {
             self.logoutInteractive(call)
         }
     }
 
 
-    typealias AccountCompletion = (MSALAccount?) -> Void
+    
 
 
     // This will check to see if there are any avaiable accounts already cached on the device
     // If any account is found it will load it and try to up
-    func loadAccount(completion: AccountCompletion? = nil) {
+    private func setCurrentAccount(completion: AccountCompletion? = nil) {
         let msalParameters = MSALParameters()
         msalParameters.completionBlockQueue = DispatchQueue.main
 
@@ -227,7 +258,7 @@ public class MsalPlugin: CAPPlugin {
             let signoutParameters = MSALSignoutParameters(webviewParameters: webViewParameters)
 
             signoutParameters.signoutFromBrowser = true
-            applicationContext.signout(with: currentAccount, signoutParameters: signoutParameters, completionBlock: {(success, error) in
+            self.client?.signout(with: currentAccount, signoutParameters: signoutParameters, completionBlock: {(success, error) in
                 if let error = error {
                     call.error("Unable to signout", error, [
                         "unexpectedError": error.localizedDescription
@@ -246,7 +277,6 @@ public class MsalPlugin: CAPPlugin {
 
 
     private func loginInteractive(_ call: CAPPluginCall) {
-        
         if self.hasOptions == true {
 
             let webViewParameters = MSALWebviewParameters(authPresentationViewController: self.bridge.viewController)
@@ -300,7 +330,7 @@ public class MsalPlugin: CAPPlugin {
         }
     }
 
-    func loginSilently(_ account : MSALAccount!, _ call: CAPPluginCall) {
+    private func loginSilently(_ account : MSALAccount!, _ call: CAPPluginCall) {
         guard let applicationContext = self.client else { return }
         let parameters = MSALSilentTokenParameters(scopes: self.popupScopes ?? [], account: account)
         applicationContext.acquireTokenSilent(with: parameters) { (response, error) in
@@ -362,3 +392,6 @@ public class MsalPlugin: CAPPlugin {
         }
     }
 }
+
+
+