fix

Author: ganisback

app/http/api/auth.py

@@ -18,8 +18,8 @@ async def signin(request: Request):
         user = await request.json()
         result = authenticate(user['username'], user['password'])
         if result is True:
-            token = slurm_auth.makejwt(user['username'])
             isadmin = isAdmin(user['username'], token)
+            token = slurm_auth.makejwt(user['username'], isadmin)
             return {'success': True, 'token': token, 'userinfos': {'username': user['username'], 'name': user['username'], "isAdmin": isadmin}}
         else:
             return JSONResponse({"status": 'error', 'message': 'Invalid username or password'}, status_code=403)

slurm/slurm_auth.py

@@ -35,12 +35,13 @@ def add_slurm_header(request: Request):
     )
 
 
-def makejwt(username):
+def makejwt(username, isadmin):
     message = {
         "exp": int(time.time() + 604800),
         "iat": int(time.time()),
         "sun": username,
-        "name": username
+        "name": username,
+        "isAdmin": isadmin
     }
     compact_jws = a.encode(message, signing_key, algorithm="HS256")
     return compact_jws

slurm/slurm_operation.py

@@ -8,7 +8,7 @@
 
 def updateUser(username, groups):
     session = requests.Session()
-    newToken = slurm_auth.makejwt("root")
+    newToken = slurm_auth.makejwt("root", True)
     headers = {
         "Content-type": "application/json",
         "X-SLURM-USER-NAME": "root",
@@ -68,7 +68,7 @@ def updateUser(username, groups):
 
 def updateUsers(userGroups: list):
     session = requests.Session()
-    newToken = slurm_auth.makejwt("root")
+    newToken = slurm_auth.makejwt("root", True)
     headers = {
         "Content-type": "application/json",
         "X-SLURM-USER-NAME": "root",
@@ -131,7 +131,7 @@ def updateUsers(userGroups: list):
 
 def updateGroup(name, desc, org="opencsg"):
     session = requests.Session()
-    newToken = slurm_auth.makejwt("root")
+    newToken = slurm_auth.makejwt("root", True)
     headers = {
         "Content-type": "application/json",
         "X-SLURM-USER-NAME": "root",
@@ -162,7 +162,7 @@ def updateGroup(name, desc, org="opencsg"):
 
 def assignUsersToGroup(message):
     session = requests.Session()
-    newToken = slurm_auth.makejwt("root")
+    newToken = slurm_auth.makejwt("root", True)
     headers = {
         "Content-type": "application/json",
         "X-SLURM-USER-NAME": "root",