Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui, agent: POST to eject cause client DELETE doesnt do bodys like a jerk

Browse Source
This commit is contained in:
Aaron Greenspan
2021-01-13 09:07:59 -07:00
committed by Aiden McClelland
parent 90227c0606
commit 3ecfb4e4eb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent/config/routes
View File

@@ -37,7 +37,8 @@
/v0/apps/#AppId/backup/restore RestoreBackupR POST
/v0/apps/#AppId/autoconfig/#AppId AutoconfigureR POST
/v0/disks DisksR GET DELETE
/v0/disks DisksR GET
/v0/disks/eject EjectR POST
/v0/update UpdateAgentR POST
/v0/wifi WifiR GET POST

15
agent/src/Handler/Backups.hs
View File

@@ -57,14 +57,13 @@ instance FromJSON RestoreBackupReq where
restoreBackupPassword <- o .:? "password" .!= Nothing
pure RestoreBackupReq { .. }
data DeleteDisksReq = DeleteDisksReq
{ deleteDisksLogicalName :: Text
data EjectDiskReq = EjectDiskReq
{ ejectDiskLogicalName :: Text
} deriving (Eq, Show)
instance FromJSON DeleteDisksReq where
instance FromJSON EjectDiskReq where
parseJSON = withObject "Eject Disk Req" $ \o -> do
deleteDisksLogicalName <- o .: "logicalName"
pure DeleteDisksReq { .. }
ejectDiskLogicalName <- o .: "logicalName"
pure EjectDiskReq { .. }
-- Handlers
@@ -107,8 +106,8 @@ postRestoreBackupR appId = disableEndpointOnFailedUpdate $ do
getDisksR :: Handler (JSONResponse [AppMgr.DiskInfo])
getDisksR = fmap JSONResponse . runM . handleS9ErrC $ listDisksLogic
deleteDisksR :: Handler ()
deleteDisksR = runM . handleS9ErrC $ requireCheckJsonBody >>= ejectDiskLogic . deleteDisksLogicalName
postEjectR :: Handler ()
postEjectR = runM . handleS9ErrC $ requireCheckJsonBody >>= ejectDiskLogic . ejectDiskLogicalName
-- Logic