forked from tangled.org/core
Monorepo for Tangled

appview/models: move db.PublicKey into models

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 775ea4d7 07f809fc

verified
Changed files
+35 -28
appview
commitverify
db
models
pages
+2 -1
appview/commitverify/verify.go
··· 5 6 "github.com/go-git/go-git/v5/plumbing/object" 7 "tangled.org/core/appview/db" 8 "tangled.org/core/crypto" 9 "tangled.org/core/types" 10 ) ··· 45 func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) { 46 vcs := VerifiedCommits{} 47 48 - didPubkeyCache := make(map[string][]db.PublicKey) 49 50 for _, commit := range ndCommits { 51 c := commit.Commit
··· 5 6 "github.com/go-git/go-git/v5/plumbing/object" 7 "tangled.org/core/appview/db" 8 + "tangled.org/core/appview/models" 9 "tangled.org/core/crypto" 10 "tangled.org/core/types" 11 ) ··· 46 func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) { 47 vcs := VerifiedCommits{} 48 49 + didPubkeyCache := make(map[string][]models.PublicKey) 50 51 for _, commit := range ndCommits { 52 c := commit.Commit
+7 -26
appview/db/pubkeys.go
··· 1 package db 2 3 import ( 4 - "encoding/json" 5 "time" 6 ) 7 ··· 29 return err 30 } 31 32 - type PublicKey struct { 33 - Did string `json:"did"` 34 - Key string `json:"key"` 35 - Name string `json:"name"` 36 - Rkey string `json:"rkey"` 37 - Created *time.Time 38 - } 39 - 40 - func (p PublicKey) MarshalJSON() ([]byte, error) { 41 - type Alias PublicKey 42 - return json.Marshal(&struct { 43 - Created string `json:"created"` 44 - *Alias 45 - }{ 46 - Created: p.Created.Format(time.RFC3339), 47 - Alias: (*Alias)(&p), 48 - }) 49 - } 50 - 51 - func GetAllPublicKeys(e Execer) ([]PublicKey, error) { 52 - var keys []PublicKey 53 54 rows, err := e.Query(`select key, name, did, rkey, created from public_keys`) 55 if err != nil { ··· 58 defer rows.Close() 59 60 for rows.Next() { 61 - var publicKey PublicKey 62 var createdAt string 63 if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Rkey, &createdAt); err != nil { 64 return nil, err ··· 75 return keys, nil 76 } 77 78 - func GetPublicKeysForDid(e Execer, did string) ([]PublicKey, error) { 79 - var keys []PublicKey 80 81 rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did) 82 if err != nil { ··· 85 defer rows.Close() 86 87 for rows.Next() { 88 - var publicKey PublicKey 89 var createdAt string 90 if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Rkey, &createdAt); err != nil { 91 return nil, err
··· 1 package db 2 3 import ( 4 + "tangled.org/core/appview/models" 5 "time" 6 ) 7 ··· 29 return err 30 } 31 32 + func GetAllPublicKeys(e Execer) ([]models.PublicKey, error) { 33 + var keys []models.PublicKey 34 35 rows, err := e.Query(`select key, name, did, rkey, created from public_keys`) 36 if err != nil { ··· 39 defer rows.Close() 40 41 for rows.Next() { 42 + var publicKey models.PublicKey 43 var createdAt string 44 if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Rkey, &createdAt); err != nil { 45 return nil, err ··· 56 return keys, nil 57 } 58 59 + func GetPublicKeysForDid(e Execer, did string) ([]models.PublicKey, error) { 60 + var keys []models.PublicKey 61 62 rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did) 63 if err != nil { ··· 66 defer rows.Close() 67 68 for rows.Next() { 69 + var publicKey models.PublicKey 70 var createdAt string 71 if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Rkey, &createdAt); err != nil { 72 return nil, err
+25
appview/models/pubkey.go
···
··· 1 + package models 2 + 3 + import ( 4 + "encoding/json" 5 + "time" 6 + ) 7 + 8 + type PublicKey struct { 9 + Did string `json:"did"` 10 + Key string `json:"key"` 11 + Name string `json:"name"` 12 + Rkey string `json:"rkey"` 13 + Created *time.Time 14 + } 15 + 16 + func (p PublicKey) MarshalJSON() ([]byte, error) { 17 + type Alias PublicKey 18 + return json.Marshal(&struct { 19 + Created string `json:"created"` 20 + *Alias 21 + }{ 22 + Created: p.Created.Format(time.RFC3339), 23 + Alias: (*Alias)(&p), 24 + }) 25 + }
+1 -1
appview/pages/pages.go
··· 303 304 type UserKeysSettingsParams struct { 305 LoggedInUser *oauth.User 306 - PubKeys []db.PublicKey 307 Tabs []map[string]any 308 Tab string 309 }
··· 303 304 type UserKeysSettingsParams struct { 305 LoggedInUser *oauth.User 306 + PubKeys []models.PublicKey 307 Tabs []map[string]any 308 Tab string 309 }