extern/gotosocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-01-26 08:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return VAPID public key when registering an app

Browse Source
This commit is contained in:
Vyr Cossont 2024-11-23 20:41:35 -08:00
parent b082e53c8c
commit 5a2e8341a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/typeutils/internaltofrontend.go
View File

@ -615,6 +615,11 @@ func (c *Converter) AccountToAdminAPIAccount(ctx context.Context, a *gtsmodel.Ac
} }
func (c *Converter) AppToAPIAppSensitive(ctx context.Context, a *gtsmodel.Application) (*apimodel.Application, error) { func (c *Converter) AppToAPIAppSensitive(ctx context.Context, a *gtsmodel.Application) (*apimodel.Application, error) {
vapidKeyPair, err := c.state.DB.GetVAPIDKeyPair(ctx)
if err != nil {
return nil, gtserror.Newf("error getting VAPID public key: %w", err)
}
return &apimodel.Application{ return &apimodel.Application{
ID: a.ID, ID: a.ID,
Name: a.Name, Name: a.Name,
@ -622,6 +627,7 @@ func (c *Converter) AppToAPIAppSensitive(ctx context.Context, a *gtsmodel.Applic
RedirectURI: a.RedirectURI, RedirectURI: a.RedirectURI,
ClientID: a.ClientID, ClientID: a.ClientID,
ClientSecret: a.ClientSecret, ClientSecret: a.ClientSecret,
VapidKey: vapidKeyPair.Public,
}, nil }, nil
} }
@ -1755,7 +1761,7 @@ func (c *Converter) InstanceToAPIV2Instance(ctx context.Context, i *gtsmodel.Ins
vapidKeyPair, err := c.state.DB.GetVAPIDKeyPair(ctx) vapidKeyPair, err := c.state.DB.GetVAPIDKeyPair(ctx)
if err != nil { if err != nil {
return nil, gtserror.Newf("error getting VAPID key pair: %w", err) return nil, gtserror.Newf("error getting VAPID public key: %w", err)
} }
instance.Configuration.VAPID.PublicKey = vapidKeyPair.Public instance.Configuration.VAPID.PublicKey = vapidKeyPair.Public