fix logic ordering (#141)

This commit is contained in:
Lucy
2024-04-22 12:59:51 -04:00
committed by GitHub
parent ae14680a54
commit bb63e1ea82

View File

@@ -272,12 +272,12 @@ checkAdminAllowedPkgs pkgId adminId = do
-- if pkg does not exist yet, allow, because authorized by whitelist -- if pkg does not exist yet, allow, because authorized by whitelist
pkg <- runDB $ getPkgById (PkgRecordKey pkgId) pkg <- runDB $ getPkgById (PkgRecordKey pkgId)
pkgExtracted <- runDB $ getPkgOnlyCreated (PkgRecordKey pkgId) pkgExtracted <- runDB $ getPkgOnlyCreated (PkgRecordKey pkgId)
if length pkg > 0 if length pkgExtracted > 0
then do then pure (True, True)
else if length pkg > 0
then do
res <- runDB $ getAllowedPkgs pkgId (AdminKey adminId) res <- runDB $ getAllowedPkgs pkgId (AdminKey adminId)
pure $ if length res > 0 then (True, False) else (False, False) pure $ if length res > 0 then (True, False) else (False, False)
else if length pkgExtracted > 0
then pure (True, True)
else pure (True, True) else pure (True, True)
checkAdminAuth :: PkgId -> Handler (Bool, Text) checkAdminAuth :: PkgId -> Handler (Bool, Text)