commit abdf4e5fa26ef5eb8a9cdaea50c309057f8258a5 · kot.pink/core

+30 -2

appview/auth/auth.go

···

       179
       179
        
       }

     

       180
       180
        
       

     

       181
       181
        
       func (a *Auth) GetDID(r *http.Request) string {

     

       182
       182
       -
       	clientSession, _ := a.Store.Get(r, appview.SessionName)

     

       182
       182
       +
       	clientSession, err := a.Store.Get(r, appview.SessionName)

     

       183
       183
       +
       	if err != nil || clientSession.IsNew {

     

       184
       184
       +
       		return ""

     

       185
       185
       +
       	}

     

       186
       186
       +
       

     

       183
       187
        
       	return clientSession.Values[appview.SessionDid].(string)

     

       184
       188
        
       }

     

       185
       189
        
       

     

       186
       190
        
       func (a *Auth) GetHandle(r *http.Request) string {

     

       187
       187
       -
       	clientSession, _ := a.Store.Get(r, appview.SessionHandle)

     

       191
       191
       +
       	clientSession, err := a.Store.Get(r, appview.SessionName)

     

       192
       192
       +
       	if err != nil || clientSession.IsNew {

     

       193
       193
       +
       		return ""

     

       194
       194
       +
       	}

     

       195
       195
       +
       

     

       188
       196
        
       	return clientSession.Values[appview.SessionHandle].(string)

     

       189
       197
        
       }

     

       198
       198
       +
       

     

       199
       199
       +
       type User struct {

     

       200
       200
       +
       	Handle string

     

       201
       201
       +
       	Did    string

     

       202
       202
       +
       	Pds    string

     

       203
       203
       +
       }

     

       204
       204
       +
       

     

       205
       205
       +
       func (a *Auth) GetUser(r *http.Request) *User {

     

       206
       206
       +
       	clientSession, err := a.Store.Get(r, appview.SessionName)

     

       207
       207
       +
       

     

       208
       208
       +
       	if err != nil || clientSession.IsNew {

     

       209
       209
       +
       		return nil

     

       210
       210
       +
       	}

     

       211
       211
       +
       

     

       212
       212
       +
       	return &User{

     

       213
       213
       +
       		Handle: clientSession.Values[appview.SessionHandle].(string),

     

       214
       214
       +
       		Did:    clientSession.Values[appview.SessionDid].(string),

     

       215
       215
       +
       		Pds:    clientSession.Values[appview.SessionPds].(string),

     

       216
       216
       +
       	}

     

       217
       217
       +
       }

+20

appview/pages/layout.html

···

       1
       1
       +
       <!DOCTYPE html>

     

       2
       2
       +
       <html lang="en">

     

       3
       3
       +
       <head>

     

       4
       4
       +
           <meta charset="UTF-8">

     

       5
       5
       +
           <meta name="viewport" content="width=device-width, initial-scale=1.0">

     

       6
       6
       +
           <script src="https://unpkg.com/htmx.org@2.0.4" integrity="sha384-HGfztofotfshcF7+8n44JQL2oJmowVChPTg48S+jvZoztPfvwD79OC/LTtG6dMp+" crossorigin="anonymous"></script>

     

       7
       7
       +
           <title>{{block "title" .}}tangled{{end}}</title>

     

       8
       8
       +
       </head>

     

       9
       9
       +
       <body>

     

       10
       10
       +
       

     

       11
       11
       +
           <div class="navbar">

     

       12
       12
       +
               <a href="/" style="color: white; text-decoration: none;">Home</a>

     

       13
       13
       +
           </div>

     

       14
       14
       +
       

     

       15
       15
       +
           <div class="content">

     

       16
       16
       +
               {{block "content" .}}{{end}}

     

       17
       17
       +
           </div>

     

       18
       18
       +
       

     

       19
       19
       +
       </body>

     

       20
       20
       +
       </html>

+14

appview/pages/login.html

···

       1
       1
       +
       {{define "title"}}login{{end}}

     

       2
       2
       +
       

     

       3
       3
       +
       {{define "content"}}

     

       4
       4
       +
       <h1>Login</h1>

     

       5
       5
       +
       <form method="POST" action="/login">

     

       6
       6
       +
         <label for="handle">handle</label>

     

       7
       7
       +
         <input type="text" id="handle" name="handle" required>

     

       8
       8
       +
       

     

       9
       9
       +
         <label for="app_password">app password</label>

     

       10
       10
       +
         <input type="password" id="app_password" name="app_password" required>

     

       11
       11
       +
       

     

       12
       12
       +
         <button type="submit">login</button>

     

       13
       13
       +
       </form>

     

       14
       14
       +
       {{end}}

+59

appview/pages/pages.go

···

       1
       1
       +
       package pages

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"embed"

     

       5
       5
       +
       	"html/template"

     

       6
       6
       +
       	"io"

     

       7
       7
       +
       	"sync"

     

       8
       8
       +
       

     

       9
       9
       +
       	"github.com/sotangled/tangled/appview/auth"

     

       10
       10
       +
       	"github.com/sotangled/tangled/appview/db"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       //go:embed *.html

     

       14
       14
       +
       var files embed.FS

     

       15
       15
       +
       

     

       16
       16
       +
       var (

     

       17
       17
       +
       	cache = make(map[string]*template.Template)

     

       18
       18
       +
       	mutex sync.Mutex

     

       19
       19
       +
       )

     

       20
       20
       +
       

     

       21
       21
       +
       func parse(file string) *template.Template {

     

       22
       22
       +
       	mutex.Lock()

     

       23
       23
       +
       	defer mutex.Unlock()

     

       24
       24
       +
       

     

       25
       25
       +
       	if tmpl, found := cache[file]; found {

     

       26
       26
       +
       		return tmpl

     

       27
       27
       +
       	}

     

       28
       28
       +
       

     

       29
       29
       +
       	tmpl := template.Must(

     

       30
       30
       +
       		template.New("layout.html").ParseFS(files, "layout.html", file),

     

       31
       31
       +
       	)

     

       32
       32
       +
       

     

       33
       33
       +
       	cache[file] = tmpl

     

       34
       34
       +
       	return tmpl

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       type LoginParams struct {

     

       38
       38
       +
       }

     

       39
       39
       +
       

     

       40
       40
       +
       func Login(w io.Writer, p LoginParams) error {

     

       41
       41
       +
       	return parse("login.html").Execute(w, p)

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       44
       44
       +
       type TimelineParams struct {

     

       45
       45
       +
       	User *auth.User

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       func Timeline(w io.Writer, p TimelineParams) error {

     

       49
       49
       +
       	return parse("timeline.html").Execute(w, p)

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       type SettingsParams struct {

     

       53
       53
       +
       	User    *auth.User

     

       54
       54
       +
       	PubKeys []db.PublicKey

     

       55
       55
       +
       }

     

       56
       56
       +
       

     

       57
       57
       +
       func Settings(w io.Writer, p SettingsParams) error {

     

       58
       58
       +
       	return parse("settings.html").Execute(w, p)

     

       59
       59
       +
       }

+34

appview/pages/settings.html

···

       1
       1
       +
       {{define "title"}}settings{{end}}

     

       2
       2
       +
       

     

       3
       3
       +
       {{define "content"}}

     

       4
       4
       +
           <a href="/">back to timeline</a>

     

       5
       5
       +
           <h1>settings</h1>

     

       6
       6
       +
       

     

       7
       7
       +
           <h2>profile</h2>

     

       8
       8
       +
           <p><strong>handle:</strong> {{.User.Handle}}</p>

     

       9
       9
       +
           <p><strong>did:</strong> {{.User.Did}}</p>

     

       10
       10
       +
           <p><strong>pds:</strong> {{.User.Pds}}</p>

     

       11
       11
       +
       

     

       12
       12
       +
           <h2>ssh keys</h2>

     

       13
       13
       +
           <form hx-put="/settings/keys">

     

       14
       14
       +
               <label for="name">key name:</label>

     

       15
       15
       +
               <input type="text" id="name" name="name" required>

     

       16
       16
       +
       

     

       17
       17
       +
               <label for="key">pub key:</label>

     

       18
       18
       +
               <textarea id="key" name="key" placeholder="ssh-rsa AAAAAA..." required></textarea>

     

       19
       19
       +
       

     

       20
       20
       +
               <button type="submit">add key</button>

     

       21
       21
       +
           </form>

     

       22
       22
       +
       

     

       23
       23
       +
           <h3>existing keys</h3>

     

       24
       24
       +
           <ul id="key-list">

     

       25
       25
       +
               {{range .PubKeys}}

     

       26
       26
       +
                   <li>

     

       27
       27
       +
                       <strong>{{.Name}}</strong><br>

     

       28
       28
       +
                       <code>{{.Key}}</code>

     

       29
       29
       +
                   </li>

     

       30
       30
       +
               {{else}}

     

       31
       31
       +
                   <p>no ssh keys added yet</p>

     

       32
       32
       +
               {{end}}

     

       33
       33
       +
           </ul>

     

       34
       34
       +
       {{end}}

+10

appview/pages/timeline.html

···

       1
       1
       +
       {{define "title"}}timeline{{end}}

     

       2
       2
       +
       

     

       3
       3
       +
       {{define "content"}}

     

       4
       4
       +
           <h1>timeline</h1>

     

       5
       5
       +
       

     

       6
       6
       +
           {{ if .User }}

     

       7
       7
       +
           <p>logged in as {{ .User.Handle }}</p>

     

       8
       8
       +
           <a href="/settings">settings</a>

     

       9
       9
       +
           {{ end }}

     

       10
       10
       +
       {{end}}

+33 -3

appview/state/state.go

···

       18
       18
        
       	"github.com/sotangled/tangled/appview"

     

       19
       19
        
       	"github.com/sotangled/tangled/appview/auth"

     

       20
       20
        
       	"github.com/sotangled/tangled/appview/db"

     

       21
       21
       +
       	"github.com/sotangled/tangled/appview/pages"

     

       21
       22
        
       )

     

       22
       23
        
       

     

       23
       24
        
       type State struct {

     
···

       50
       51
        
       

     

       51
       52
        
       	switch r.Method {

     

       52
       53
        
       	case http.MethodGet:

     

       53
       53
       -
       		log.Println("unimplemented")

     

       54
       54
       +
       		pages.Login(w, pages.LoginParams{})

     

       54
       55
        
       		return

     

       55
       56
        
       	case http.MethodPost:

     

       56
       57
        
       		handle := r.FormValue("handle")

     
···

       84
       85
        
       	}

     

       85
       86
        
       }

     

       86
       87
        
       

     

       88
       88
       +
       func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {

     

       89
       89
       +
       	user := s.auth.GetUser(r)

     

       90
       90
       +
       	fmt.Printf("%+v\n", user)

     

       91
       91
       +
       	pages.Timeline(w, pages.TimelineParams{

     

       92
       92
       +
       		User: user,

     

       93
       93
       +
       	})

     

       94
       94
       +
       	return

     

       95
       95
       +
       }

     

       96
       96
       +
       

     

       87
       97
        
       // requires auth

     

       88
       98
        
       func (s *State) RegistrationKey(w http.ResponseWriter, r *http.Request) {

     

       89
       99
        
       	switch r.Method {

     
···

       118
       128
        
       

     

       119
       129
        
       		w.Write([]byte(key))

     

       120
       130
        
       	}

     

       131
       131
       +
       }

     

       132
       132
       +
       

     

       133
       133
       +
       func (s *State) Settings(w http.ResponseWriter, r *http.Request) {

     

       134
       134
       +
       	// for now, this is just pubkeys

     

       135
       135
       +
       	user := s.auth.GetUser(r)

     

       136
       136
       +
       	pubKeys, err := s.db.GetPublicKeys(user.Did)

     

       137
       137
       +
       	if err != nil {

     

       138
       138
       +
       		log.Println(err)

     

       139
       139
       +
       	}

     

       140
       140
       +
       

     

       141
       141
       +
       	pages.Settings(w, pages.SettingsParams{

     

       142
       142
       +
       		User:    user,

     

       143
       143
       +
       		PubKeys: pubKeys,

     

       144
       144
       +
       	})

     

       145
       145
       +
       	return

     

       146
       146
       +
       

     

       121
       147
        
       }

     

       122
       148
        
       

     

       123
       149
        
       func (s *State) Keys(w http.ResponseWriter, r *http.Request) {

     
···

       284
       310
        
       func (s *State) Router() http.Handler {

     

       285
       311
        
       	r := chi.NewRouter()

     

       286
       312
        
       

     

       313
       313
       +
       	r.Get("/", s.Timeline)

     

       314
       314
       +
       

     

       315
       315
       +
       	r.Get("/login", s.Login)

     

       287
       316
        
       	r.Post("/login", s.Login)

     

       288
       317
        
       

     

       289
       318
        
       	r.Route("/node", func(r chi.Router) {

     
···

       295
       324
        
       		})

     

       296
       325
        
       	})

     

       297
       326
        
       

     

       298
       298
       -
       	r.Route("/settings", func(r chi.Router) {

     

       327
       327
       +
       	r.Group(func(r chi.Router) {

     

       299
       328
        
       		r.Use(AuthMiddleware(s))

     

       300
       300
       -
       		r.Put("/keys", s.Keys)

     

       329
       329
       +
       		r.Get("/settings", s.Settings)

     

       330
       330
       +
       		r.Put("/settings/keys", s.Keys)

     

       301
       331
        
       	})

     

       302
       332
        
       

     

       303
       333
        
       	return r