ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-12 04:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converting request to mdm.Response was a bad idea. panic.

Browse Source 
Update statement to reflect new composite key of udid and serial_number.
This commit is contained in:
Mosen
2016-06-23 17:33:14 +10:00
parent 3da3a3555e
commit 80aedab989
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
connect/endpoint.go
View File

@@ -32,7 +32,7 @@ func makeConnectEndpoint(svc Service) endpoint.Endpoint {
var err error
switch req.Status {
case "Acknowledged":
total, err := svc.Acknowledge(ctx, request.(mdm.Response))
total, err := svc.Acknowledge(ctx, req)
if err != nil {
return mdmConnectResponse{Err: err}, nil
}
@@ -40,14 +40,14 @@ func makeConnectEndpoint(svc Service) endpoint.Endpoint {
return mdmConnectResponse{}, nil
}
if total != 0 {
next, _, err := svc.NextCommand(ctx, request.(mdm.Response))
next, _, err := svc.NextCommand(ctx, req)
if err != nil {
return mdmConnectResponse{Err: err}, nil
}
return mdmConnectResponse{payload: next}, nil
}
case "Idle":
next, total, err := svc.NextCommand(ctx, request.(mdm.Response))
next, total, err := svc.NextCommand(ctx, req)
if err != nil {
return mdmConnectResponse{Err: err}, nil
}

2
device/datastore.go
View File

@@ -53,7 +53,7 @@ var (
meid
)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8)
ON CONFLICT (udid)
ON CONFLICT (udid, serial_number)
DO UPDATE SET
apple_mdm_topic=$2,
os_version=$3,