Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 114

fix: store the VPP token encoded (#20606)

Browse source 
> Related issue: part of #20229

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Manual QA for all new/changed functionality
This commit is contained in:
Jahziel Villasana-Espinoza 2024-07-19 18:13:01 -04:00 committed by GitHub
parent caa7fd74e4
commit b35724bd30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ee/server/service/vpp.go
View file

@ -2,7 +2,6 @@ package service
import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"net/http"
@ -25,7 +24,7 @@ func (svc *Service) getVPPToken(ctx context.Context) (string, error) {
return "", ctxerr.Wrap(ctx, err, "unmarshaling VPP token data")
}
return base64.StdEncoding.EncodeToString([]byte(vppTokenData.Token)), nil
return vppTokenData.Token, nil
}
func (svc *Service) GetAppStoreApps(ctx context.Context, teamID *uint) ([]*fleet.VPPApp, error) {

14
server/service/mdm.go
View file

@ -2624,13 +2624,8 @@ func (svc *Service) UploadMDMAppleVPPToken(ctx context.Context, token io.ReadSee
return ctxerr.Wrap(ctx, err, "validating VPP token with Apple")
}
decodedTokenBytes, err := base64.StdEncoding.DecodeString(string(tokenBytes))
if err != nil {
return ctxerr.Wrap(ctx, err, "decoding VPP token")
}
data := fleet.VPPTokenData{
Token: string(decodedTokenBytes),
Token: string(tokenBytes),
Location: locName,
}
@ -2694,7 +2689,12 @@ func (svc *Service) GetMDMAppleVPPToken(ctx context.Context) (*fleet.VPPTokenInf
}
var rawToken fleet.VPPTokenRaw
if err := json.Unmarshal([]byte(tokenData.Token), &rawToken); err != nil {
decodedBytes, err := base64.StdEncoding.DecodeString(tokenData.Token)
if err != nil {
return nil, ctxerr.Wrap(ctx, err, "decoding VPP token")
}
if err := json.Unmarshal(decodedBytes, &rawToken); err != nil {
return nil, ctxerr.Wrap(ctx, err, "unmarshaling VPP token")
}