asdf

Author: AsifNawaz-cnic

apiclient/apiclient.go

@@ -103,6 +103,7 @@ type APIClient struct {
 	ua            string
 	logger        LG.ILogger
 	subUser       string
+	roleSeparator string
 }
 
 // RequestOptions represents the options for an API request.
@@ -127,6 +128,7 @@ func NewAPIClient() *APIClient {
 		curlopts:      map[string]string{},
 		ua:            "",
 		logger:        nil,
+		roleSeparator: ":",
 	}
 	cl.UseLIVESystem()
 	cl.SetDefaultLogger()
@@ -297,7 +299,7 @@ func (cl *APIClient) GetVersion() string {
 func (cl *APIClient) SaveSession(sessionobj map[string]interface{}) *APIClient {
 	sessionobj["socketcfg"] = map[string]string{
 		"session": cl.socketConfig.GetSession(),
-		"login": cl.socketConfig.GetLogin(),
+		"login":   cl.socketConfig.GetLogin(),
 	}
 	return cl
 }
@@ -306,7 +308,7 @@ func (cl *APIClient) SaveSession(sessionobj map[string]interface{}) *APIClient {
 // to rebuild and reuse connection settings
 func (cl *APIClient) ReuseSession(sessionobj map[string]interface{}) *APIClient {
 	cfg := sessionobj["socketcfg"].(map[string]string)
-	cl.SetLogin(cfg["login"])
+	cl.SetCredentials(cfg["login"])
 	cl.SetSession(cfg["session"])
 	return cl
 }
@@ -323,31 +325,39 @@ func (cl *APIClient) SetSession(value string) *APIClient {
 	return cl
 }
 
-// Set Login method to set an API user id to be used for API communication
-func (cl *APIClient) SetLogin(value string) *APIClient {
-	cl.socketConfig.SetLogin(value)
-	return cl
-}
-
 // SetPersistent method sets the API connection to use a persistent session
 func (cl *APIClient) SetPersistent() *APIClient {
 	cl.socketConfig.SetPersistent()
 	return cl
 }
 
 // SetCredentials method to set Credentials to be used for API communication
-func (cl *APIClient) SetCredentials(uid string, pw string) *APIClient {
-	cl.socketConfig.SetLogin(uid)
-	cl.socketConfig.SetPassword(pw)
+func (cl *APIClient) SetCredentials(params ...string) *APIClient {
+	fmt.Printf("params: %v\n", params)
+	if len(params) > 0 {
+		cl.socketConfig.SetLogin(params[0])
+	}
+	if len(params) > 1 {
+		cl.socketConfig.SetPassword(params[1])
+	}
 	return cl
 }
 
 // SetRoleCredentials method to set Role User Credentials to be used for API communication
-func (cl *APIClient) SetRoleCredentials(uid string, role string, pw string) *APIClient {
-	if len(role) > 0 {
-		return cl.SetCredentials(uid+":"+role, pw)
+func (cl *APIClient) SetRoleCredentials(params ...string) *APIClient {
+	if len(params) > 0 {
+		uid := params[0]
+		if len(params) > 1 && len(params[1]) > 0 {
+			role := params[1]
+			uid = uid + cl.roleSeparator + role
+		}
+		if len(params) > 2 {
+			pw := params[2]
+			return cl.SetCredentials(uid, pw)
+		}
+		return cl.SetCredentials(uid)
 	}
-	return cl.SetCredentials(uid, pw)
+	return cl
 }
 
 // Login method to perform API login to start session-based communication

apiclient/apiclient_test.go

@@ -183,7 +183,7 @@ func TestSetURL(t *testing.T) {
 }
 
 func TestSetSession1(t *testing.T) {
-	cl.SetSession("12345678").SetLogin("myaccountid")
+	cl.SetSession("12345678").SetCredentials("myaccountid")
 	tmp := cl.GetPOSTData(map[string]string{
 		"COMMAND": "StatusAccount",
 	})
@@ -313,6 +313,27 @@ func TestLogin3(t *testing.T) {
 	}
 }
 
+/**
+ * Make sure session is Cleaned up if password is provided after session is saved
+ */
+func TestLogin4(t *testing.T) {
+	// Initialize the first APIClient instance
+	cl.SetSession("12345678").SetCredentials("myaccountid", "password").EnableDebugMode()
+
+	// Prepare the command map
+	cmd := map[string]string{
+		"COMMAND": "StatusAccount",
+	}
+
+	// Get the POST data from the second APIClient instance
+	tmp := cl.GetPOSTData(cmd)
+
+	// Validate the result
+	if strings.Compare(tmp, "s_login=myaccountid&s_pw=password&s_command=COMMAND%3DStatusAccount") != 0 {
+		t.Error("TestLogin4: Expected post data string not matching." + tmp)
+	}
+}
+
 // validate against mocked API response [login failed; http timeout] // need mocking
 // validate against mocked API response [login succeeded; no session returned] // need mocking
 
@@ -333,7 +354,7 @@ func TestLogout1(t *testing.T) {
 func TestSaveAndReuseSession(t *testing.T) {
 	// Initialize the first APIClient instance
 	sessionobj := make(map[string]interface{})
-	cl.SetSession("12345678").SetLogin("myaccountid").SaveSession(sessionobj).EnableDebugMode()
+	cl.SetSession("12345678").SetCredentials("myaccountid").SaveSession(sessionobj).EnableDebugMode()
 
 	// Initialize the second APIClient instance
 	cl2 := NewAPIClient()