Browse Source

change api to GET

abhishek9686 1 year ago
parent
commit
26e1ac3092
1 changed files with 11 additions and 9 deletions
  1. 11 9
      pro/controllers/users.go

+ 11 - 9
pro/controllers/users.go

@@ -149,20 +149,22 @@ func getUserRemoteAccessGws(w http.ResponseWriter, r *http.Request) {
 		return
 		return
 	}
 	}
 	remoteAccessClientID := r.URL.Query().Get("remote_access_clientid")
 	remoteAccessClientID := r.URL.Query().Get("remote_access_clientid")
-	fmt.Println("##### REMOTE CLIENT ID: ", remoteAccessClientID)
 	var req models.UserRemoteGwsReq
 	var req models.UserRemoteGwsReq
-
-	err := json.NewDecoder(r.Body).Decode(&req)
-	if err != nil {
-		slog.Error("error decoding request body: ", "error", err)
-		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
-		return
+	if remoteAccessClientID == "" {
+		err := json.NewDecoder(r.Body).Decode(&req)
+		if err != nil {
+			slog.Error("error decoding request body: ", "error", err)
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+			return
+		}
 	}
 	}
-
-	if req.RemoteAccessClientID == "" {
+	if req.RemoteAccessClientID == "" && remoteAccessClientID == "" {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest"))
 		return
 		return
 	}
 	}
+	if req.RemoteAccessClientID == "" {
+		req.RemoteAccessClientID = remoteAccessClientID
+	}
 	userGws := make(map[string][]models.UserRemoteGws)
 	userGws := make(map[string][]models.UserRemoteGws)
 	user, err := logic.GetUser(username)
 	user, err := logic.GetUser(username)
 	if err != nil {
 	if err != nil {