@@ -39,7 +39,7 @@ def use_filestore_auth(user: User):
39
39
def get_filestore_token (user_login , host , verify ):
40
40
try :
41
41
r_userlogin = requests .get (f"https://{ host } /storemng/api/login" ,
42
- data = json .dumps (user_login ), verify = verify )
42
+ data = json .dumps (user_login ), verify = verify )
43
43
r_userlogin .raise_for_status ()
44
44
except (requests .exceptions .ConnectionError , requests .exceptions .HTTPError ) as err :
45
45
print ("{0}: " .format (err ))
@@ -75,9 +75,11 @@ def add_filestore_auth(user: User):
75
75
fs_user ["data" ]["password" ] = user .password
76
76
fs_user ["data" ]["lockPassword" ] = True
77
77
fs_user ["data" ]["perm" ]["admin" ] = user .is_superuser
78
- # NOTE: ["data"]["scope"] must be set in PUT, not POST /api/users for staff users.
79
- # POST /api/users will automatically overwrite scope with user-only scope when settings.createUserDir=true.
80
- # A call in views.storelogin() will do this, using set_filestore_staff() making sure staff users get the root scope.
78
+ if user .is_staff : # admin and staff get root scope
79
+ fs_user ["data" ]["scope" ] = "."
80
+ else :
81
+ # setting scope in users POST will generate user dir
82
+ fs_user ["data" ]["scope" ] = get_user_scope (user )
81
83
82
84
# add new user to filestore db
83
85
try :
0 commit comments