Skip to content

feat: handle adding user AffiliationEnds section in the CS when modifying the user from CSAPI #8392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Dec 3, 2025
+11 −1
Merged

feat: handle adding user AffiliationEnds section in the CS when modifying the user from CSAPI #8392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/DIRAC/ConfigurationSystem/Client/CSAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,13 +456,23 @@ def modifyUser(self, username, properties, createIfNonExistant=False):
gLogger.error("User is not registered: ", repr(username))
return S_OK(False)
for prop in properties:
if prop == "Groups":
if prop in ["Groups", "AffiliationEnds"]:
continue
prevVal = self.__csMod.getValue(f"{self.__baseSecurity}/Users/{username}/{prop}")
if not prevVal or prevVal != properties[prop]:
gLogger.info(f"Setting {prop} property for user {username} to {properties[prop]}")
self.__csMod.setOptionValue(f"{self.__baseSecurity}/Users/{username}/{prop}", properties[prop])
modifiedUser = True
if properties.get("AffiliationEnds", None):
user_affiliationends_section = f"{self.__baseSecurity}/Users/{username}/AffiliationEnds"
# add the section for AffiliationEnds
res = gConfig.getSections(user_affiliationends_section)
if not res["OK"]:
self.__csMod.createSection(user_affiliationends_section)
# now set value VO = end date
for vo, end_date in properties["AffiliationEnds"].items():
self.__csMod.setOptionValue(f"{user_affiliationends_section}/{vo}", end_date)
modifiedUser = True
if "Groups" in properties:
result = self.listGroups()
if not result["OK"]:
Expand Down
Loading