patch of draft: appview: service layer · round #3 · pull #800 · tangled.org/core

+2 -2

appview/oauth/handler.go

···

       24
       24
        
       

     

       25
       25
        
       	r.Get("/oauth/client-metadata.json", o.clientMetadata)

     

       26
       26
        
       	r.Get("/oauth/jwks.json", o.jwks)

     

       27
       27
       -
       	r.Get("/oauth/callback", o.callback)

     

       27
       27
       +
       	r.Get("/oauth/callback", o.Callback)

     

       28
       28
        
       	return r

     

       29
       29
        
       }

     

       30
       30
        
       

     
···

       50
       50
        
       	}

     

       51
       51
        
       }

     

       52
       52
        
       

     

       53
       53
       -
       func (o *OAuth) callback(w http.ResponseWriter, r *http.Request) {

     

       53
       53
       +
       func (o *OAuth) Callback(w http.ResponseWriter, r *http.Request) {

     

       54
       54
        
       	ctx := r.Context()

     

       55
       55
        
       	l := o.Logger.With("query", r.URL.Query())

     

       56
       56

+10

appview/oauth/session.go

···

       1
       1
       +
       package oauth

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func (o *OAuth) SaveSession2(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) {

     

       10
       10
       +
       }

+271

appview/service/issue/issue.go

···

       1
       1
       +
       package issue

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"errors"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/api/atproto"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       11
       11
       +
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       12
       12
       +
       	"tangled.org/core/api/tangled"

     

       13
       13
       +
       	"tangled.org/core/appview/config"

     

       14
       14
       +
       	"tangled.org/core/appview/db"

     

       15
       15
       +
       	issues_indexer "tangled.org/core/appview/indexer/issues"

     

       16
       16
       +
       	"tangled.org/core/appview/models"

     

       17
       17
       +
       	"tangled.org/core/appview/notify"

     

       18
       18
       +
       	"tangled.org/core/appview/pages/markup"

     

       19
       19
       +
       	"tangled.org/core/appview/session"

     

       20
       20
       +
       	"tangled.org/core/appview/validator"

     

       21
       21
       +
       	"tangled.org/core/idresolver"

     

       22
       22
       +
       	"tangled.org/core/tid"

     

       23
       23
       +
       )

     

       24
       24
       +
       

     

       25
       25
       +
       type Service struct {

     

       26
       26
       +
       	config     *config.Config

     

       27
       27
       +
       	db         *db.DB

     

       28
       28
       +
       	indexer    *issues_indexer.Indexer

     

       29
       29
       +
       	logger     *slog.Logger

     

       30
       30
       +
       	notifier   notify.Notifier

     

       31
       31
       +
       	idResolver *idresolver.Resolver

     

       32
       32
       +
       	validator  *validator.Validator

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func NewService(

     

       36
       36
       +
       	logger *slog.Logger,

     

       37
       37
       +
       	config *config.Config,

     

       38
       38
       +
       	db *db.DB,

     

       39
       39
       +
       	notifier notify.Notifier,

     

       40
       40
       +
       	idResolver *idresolver.Resolver,

     

       41
       41
       +
       	indexer *issues_indexer.Indexer,

     

       42
       42
       +
       	validator *validator.Validator,

     

       43
       43
       +
       ) Service {

     

       44
       44
       +
       	return Service{

     

       45
       45
       +
       		config,

     

       46
       46
       +
       		db,

     

       47
       47
       +
       		indexer,

     

       48
       48
       +
       		logger,

     

       49
       49
       +
       		notifier,

     

       50
       50
       +
       		idResolver,

     

       51
       51
       +
       		validator,

     

       52
       52
       +
       	}

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       var (

     

       56
       56
       +
       	ErrUnAuthorized   = errors.New("unauthorized operation")

     

       57
       57
       +
       	ErrDatabaseFail   = errors.New("db op fail")

     

       58
       58
       +
       	ErrPDSFail        = errors.New("pds op fail")

     

       59
       59
       +
       	ErrValidationFail = errors.New("issue validation fail")

     

       60
       60
       +
       )

     

       61
       61
       +
       

     

       62
       62
       +
       func (s *Service) NewIssue(ctx context.Context, repo *models.Repo, title, body string) (*models.Issue, error) {

     

       63
       63
       +
       	l := s.logger.With("method", "NewIssue")

     

       64
       64
       +
       	sess := session.FromContext(ctx)

     

       65
       65
       +
       	if sess == nil {

     

       66
       66
       +
       		l.Error("user session is missing in context")

     

       67
       67
       +
       		return nil, ErrUnAuthorized

     

       68
       68
       +
       	}

     

       69
       69
       +
       	authorDid := sess.Data.AccountDID

     

       70
       70
       +
       	l = l.With("did", authorDid)

     

       71
       71
       +
       

     

       72
       72
       +
       	// mentions, references := s.refResolver.Resolve(ctx, body)

     

       73
       73
       +
       	mentions := func() []syntax.DID {

     

       74
       74
       +
       		rawMentions := markup.FindUserMentions(body)

     

       75
       75
       +
       		idents := s.idResolver.ResolveIdents(ctx, rawMentions)

     

       76
       76
       +
       		l.Debug("parsed mentions", "raw", rawMentions, "idents", idents)

     

       77
       77
       +
       		var mentions []syntax.DID

     

       78
       78
       +
       		for _, ident := range idents {

     

       79
       79
       +
       			if ident != nil && !ident.Handle.IsInvalidHandle() {

     

       80
       80
       +
       				mentions = append(mentions, ident.DID)

     

       81
       81
       +
       			}

     

       82
       82
       +
       		}

     

       83
       83
       +
       		return mentions

     

       84
       84
       +
       	}()

     

       85
       85
       +
       

     

       86
       86
       +
       	issue := models.Issue{

     

       87
       87
       +
       		RepoAt:  repo.RepoAt(),

     

       88
       88
       +
       		Rkey:    tid.TID(),

     

       89
       89
       +
       		Title:   title,

     

       90
       90
       +
       		Body:    body,

     

       91
       91
       +
       		Open:    true,

     

       92
       92
       +
       		Did:     authorDid.String(),

     

       93
       93
       +
       		Created: time.Now(),

     

       94
       94
       +
       		Repo:    repo,

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	if err := s.validator.ValidateIssue(&issue); err != nil {

     

       98
       98
       +
       		l.Error("validation error", "err", err)

     

       99
       99
       +
       		return nil, ErrValidationFail

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	tx, err := s.db.BeginTx(ctx, nil)

     

       103
       103
       +
       	if err != nil {

     

       104
       104
       +
       		l.Error("db.BeginTx failed", "err", err)

     

       105
       105
       +
       		return nil, ErrDatabaseFail

     

       106
       106
       +
       	}

     

       107
       107
       +
       	defer tx.Rollback()

     

       108
       108
       +
       

     

       109
       109
       +
       	if err := db.PutIssue(tx, &issue); err != nil {

     

       110
       110
       +
       		l.Error("db.PutIssue failed", "err", err)

     

       111
       111
       +
       		return nil, ErrDatabaseFail

     

       112
       112
       +
       	}

     

       113
       113
       +
       

     

       114
       114
       +
       	atpclient := sess.APIClient()

     

       115
       115
       +
       	record := issue.AsRecord()

     

       116
       116
       +
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       117
       117
       +
       		Repo:       authorDid.String(),

     

       118
       118
       +
       		Collection: tangled.RepoIssueNSID,

     

       119
       119
       +
       		Rkey:       issue.Rkey,

     

       120
       120
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       121
       121
       +
       			Val: &record,

     

       122
       122
       +
       		},

     

       123
       123
       +
       	})

     

       124
       124
       +
       	if err != nil {

     

       125
       125
       +
       		l.Error("atproto.RepoPutRecord failed", "err", err)

     

       126
       126
       +
       		return nil, ErrPDSFail

     

       127
       127
       +
       	}

     

       128
       128
       +
       	if err = tx.Commit(); err != nil {

     

       129
       129
       +
       		l.Error("tx.Commit failed", "err", err)

     

       130
       130
       +
       		return nil, ErrDatabaseFail

     

       131
       131
       +
       	}

     

       132
       132
       +
       

     

       133
       133
       +
       	s.notifier.NewIssue(ctx, &issue, mentions)

     

       134
       134
       +
       	return &issue, nil

     

       135
       135
       +
       }

     

       136
       136
       +
       

     

       137
       137
       +
       func (s *Service) GetIssues(ctx context.Context, repo *models.Repo, searchOpts models.IssueSearchOptions) ([]models.Issue, error) {

     

       138
       138
       +
       	l := s.logger.With("method", "EditIssue")

     

       139
       139
       +
       

     

       140
       140
       +
       	var issues []models.Issue

     

       141
       141
       +
       	var err error

     

       142
       142
       +
       	if searchOpts.Keyword != "" {

     

       143
       143
       +
       		res, err := s.indexer.Search(ctx, searchOpts)

     

       144
       144
       +
       		if err != nil {

     

       145
       145
       +
       			l.Error("failed to search for issues", "err", err)

     

       146
       146
       +
       			return nil, err

     

       147
       147
       +
       		}

     

       148
       148
       +
       		l.Debug("searched issues with indexer", "count", len(res.Hits))

     

       149
       149
       +
       		issues, err = db.GetIssues(s.db, db.FilterIn("id", res.Hits))

     

       150
       150
       +
       		if err != nil {

     

       151
       151
       +
       			l.Error("failed to get issues", "err", err)

     

       152
       152
       +
       			return nil, err

     

       153
       153
       +
       		}

     

       154
       154
       +
       	} else {

     

       155
       155
       +
       		openInt := 0

     

       156
       156
       +
       		if searchOpts.IsOpen {

     

       157
       157
       +
       			openInt = 1

     

       158
       158
       +
       		}

     

       159
       159
       +
       		issues, err = db.GetIssuesPaginated(

     

       160
       160
       +
       			s.db,

     

       161
       161
       +
       			searchOpts.Page,

     

       162
       162
       +
       			db.FilterEq("repo_at", repo.RepoAt()),

     

       163
       163
       +
       			db.FilterEq("open", openInt),

     

       164
       164
       +
       		)

     

       165
       165
       +
       		if err != nil {

     

       166
       166
       +
       			l.Error("failed to get issues", "err", err)

     

       167
       167
       +
       			return nil, err

     

       168
       168
       +
       		}

     

       169
       169
       +
       	}

     

       170
       170
       +
       

     

       171
       171
       +
       	return issues, nil

     

       172
       172
       +
       }

     

       173
       173
       +
       

     

       174
       174
       +
       func (s *Service) EditIssue(ctx context.Context, issue *models.Issue) error {

     

       175
       175
       +
       	l := s.logger.With("method", "EditIssue")

     

       176
       176
       +
       	sess := session.FromContext(ctx)

     

       177
       177
       +
       	if sess == nil {

     

       178
       178
       +
       		l.Error("user session is missing in context")

     

       179
       179
       +
       		return ErrUnAuthorized

     

       180
       180
       +
       	}

     

       181
       181
       +
       	authorDid := sess.Data.AccountDID

     

       182
       182
       +
       	l = l.With("did", authorDid)

     

       183
       183
       +
       

     

       184
       184
       +
       	if err := s.validator.ValidateIssue(issue); err != nil {

     

       185
       185
       +
       		l.Error("validation error", "err", err)

     

       186
       186
       +
       		return ErrValidationFail

     

       187
       187
       +
       	}

     

       188
       188
       +
       

     

       189
       189
       +
       	tx, err := s.db.BeginTx(ctx, nil)

     

       190
       190
       +
       	if err != nil {

     

       191
       191
       +
       		l.Error("db.BeginTx failed", "err", err)

     

       192
       192
       +
       		return ErrDatabaseFail

     

       193
       193
       +
       	}

     

       194
       194
       +
       	defer tx.Rollback()

     

       195
       195
       +
       

     

       196
       196
       +
       	if err := db.PutIssue(tx, issue); err != nil {

     

       197
       197
       +
       		l.Error("db.PutIssue failed", "err", err)

     

       198
       198
       +
       		return ErrDatabaseFail

     

       199
       199
       +
       	}

     

       200
       200
       +
       

     

       201
       201
       +
       	atpclient := sess.APIClient()

     

       202
       202
       +
       	record := issue.AsRecord()

     

       203
       203
       +
       

     

       204
       204
       +
       	ex, err := atproto.RepoGetRecord(ctx, atpclient, "", tangled.RepoIssueNSID, issue.Did, issue.Rkey)

     

       205
       205
       +
       	if err != nil {

     

       206
       206
       +
       		l.Error("atproto.RepoGetRecord failed", "err", err)

     

       207
       207
       +
       		return ErrPDSFail

     

       208
       208
       +
       	}

     

       209
       209
       +
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       210
       210
       +
       		Collection: tangled.RepoIssueNSID,

     

       211
       211
       +
       		SwapRecord: ex.Cid,

     

       212
       212
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       213
       213
       +
       			Val: &record,

     

       214
       214
       +
       		},

     

       215
       215
       +
       	})

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		l.Error("atproto.RepoPutRecord failed", "err", err)

     

       218
       218
       +
       		return ErrPDSFail

     

       219
       219
       +
       	}

     

       220
       220
       +
       

     

       221
       221
       +
       	if err = tx.Commit(); err != nil {

     

       222
       222
       +
       		l.Error("tx.Commit failed", "err", err)

     

       223
       223
       +
       		return ErrDatabaseFail

     

       224
       224
       +
       	}

     

       225
       225
       +
       

     

       226
       226
       +
       	// TODO: notify PutIssue

     

       227
       227
       +
       

     

       228
       228
       +
       	return nil

     

       229
       229
       +
       }

     

       230
       230
       +
       

     

       231
       231
       +
       func (s *Service) DeleteIssue(ctx context.Context, issue *models.Issue) error {

     

       232
       232
       +
       	l := s.logger.With("method", "DeleteIssue")

     

       233
       233
       +
       	sess := session.FromContext(ctx)

     

       234
       234
       +
       	if sess == nil {

     

       235
       235
       +
       		l.Error("user session is missing in context")

     

       236
       236
       +
       		return ErrUnAuthorized

     

       237
       237
       +
       	}

     

       238
       238
       +
       	authorDid := sess.Data.AccountDID

     

       239
       239
       +
       	l = l.With("did", authorDid)

     

       240
       240
       +
       

     

       241
       241
       +
       	tx, err := s.db.BeginTx(ctx, nil)

     

       242
       242
       +
       	if err != nil {

     

       243
       243
       +
       		l.Error("db.BeginTx failed", "err", err)

     

       244
       244
       +
       		return ErrDatabaseFail

     

       245
       245
       +
       	}

     

       246
       246
       +
       	defer tx.Rollback()

     

       247
       247
       +
       

     

       248
       248
       +
       	if err := db.DeleteIssues(tx, db.FilterEq("id", issue.Id)); err != nil {

     

       249
       249
       +
       		l.Error("db.DeleteIssues failed", "err", err)

     

       250
       250
       +
       		return ErrDatabaseFail

     

       251
       251
       +
       	}

     

       252
       252
       +
       

     

       253
       253
       +
       	atpclient := sess.APIClient()

     

       254
       254
       +
       	_, err = atproto.RepoDeleteRecord(ctx, atpclient, &atproto.RepoDeleteRecord_Input{

     

       255
       255
       +
       		Collection: tangled.RepoIssueNSID,

     

       256
       256
       +
       		Repo:       issue.Did,

     

       257
       257
       +
       		Rkey:       issue.Rkey,

     

       258
       258
       +
       	})

     

       259
       259
       +
       	if err != nil {

     

       260
       260
       +
       		l.Error("atproto.RepoDeleteRecord failed", "err", err)

     

       261
       261
       +
       		return ErrPDSFail

     

       262
       262
       +
       	}

     

       263
       263
       +
       

     

       264
       264
       +
       	if err := tx.Commit(); err != nil {

     

       265
       265
       +
       		l.Error("tx.Commit failed", "err", err)

     

       266
       266
       +
       		return ErrDatabaseFail

     

       267
       267
       +
       	}

     

       268
       268
       +
       

     

       269
       269
       +
       	s.notifier.DeleteIssue(ctx, issue)

     

       270
       270
       +
       	return nil

     

       271
       271
       +
       }

+15

appview/service/issue/state.go

···

       1
       1
       +
       package issue

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/models"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func (s *Service) CloseIssue(ctx context.Context, iusse *models.Issue) error {

     

       10
       10
       +
       	panic("unimplemented")

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       func (s *Service) ReopenIssue(ctx context.Context, iusse *models.Issue) error {

     

       14
       14
       +
       	panic("unimplemented")

     

       15
       15
       +
       }

+83

appview/service/repo/repo.go

···

       1
       1
       +
       package repo

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/api/atproto"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       11
       11
       +
       	"tangled.org/core/api/tangled"

     

       12
       12
       +
       	"tangled.org/core/appview/config"

     

       13
       13
       +
       	"tangled.org/core/appview/db"

     

       14
       14
       +
       	"tangled.org/core/appview/models"

     

       15
       15
       +
       	"tangled.org/core/rbac"

     

       16
       16
       +
       	"tangled.org/core/tid"

     

       17
       17
       +
       )

     

       18
       18
       +
       

     

       19
       19
       +
       type Service struct {

     

       20
       20
       +
       	logger   *slog.Logger

     

       21
       21
       +
       	config   *config.Config

     

       22
       22
       +
       	db       *db.DB

     

       23
       23
       +
       	enforcer *rbac.Enforcer

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func NewService(

     

       27
       27
       +
       	logger *slog.Logger,

     

       28
       28
       +
       	config *config.Config,

     

       29
       29
       +
       	db *db.DB,

     

       30
       30
       +
       	enforcer *rbac.Enforcer,

     

       31
       31
       +
       ) Service {

     

       32
       32
       +
       	return Service{

     

       33
       33
       +
       		logger,

     

       34
       34
       +
       		config,

     

       35
       35
       +
       		db,

     

       36
       36
       +
       		enforcer,

     

       37
       37
       +
       	}

     

       38
       38
       +
       }

     

       39
       39
       +
       

     

       40
       40
       +
       // NewRepo creates a repository

     

       41
       41
       +
       // It expects atproto session to be passed in `ctx`

     

       42
       42
       +
       func (s *Service) NewRepo(ctx context.Context, name, description, knot string) error {

     

       43
       43
       +
       	l := s.logger.With("method", "NewRepo")

     

       44
       44
       +
       	sess := fromContext(ctx)

     

       45
       45
       +
       

     

       46
       46
       +
       	ownerDid := sess.Data.AccountDID

     

       47
       47
       +
       	l = l.With("did", ownerDid)

     

       48
       48
       +
       

     

       49
       49
       +
       	repo := models.Repo{

     

       50
       50
       +
       		Did:         ownerDid.String(),

     

       51
       51
       +
       		Name:        name,

     

       52
       52
       +
       		Knot:        knot,

     

       53
       53
       +
       		Rkey:        tid.TID(),

     

       54
       54
       +
       		Description: description,

     

       55
       55
       +
       		Created:     time.Now(),

     

       56
       56
       +
       		Labels:      s.config.Label.DefaultLabelDefs,

     

       57
       57
       +
       	}

     

       58
       58
       +
       	l = l.With("aturi", repo.RepoAt())

     

       59
       59
       +
       

     

       60
       60
       +
       	tx, err := s.db.BeginTx(ctx, nil)

     

       61
       61
       +
       	if err != nil {

     

       62
       62
       +
       		return fmt.Errorf("db.BeginTx: %w", err)

     

       63
       63
       +
       	}

     

       64
       64
       +
       	defer tx.Rollback()

     

       65
       65
       +
       

     

       66
       66
       +
       	atpclient := sess.APIClient()

     

       67
       67
       +
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       68
       68
       +
       		Collection: tangled.RepoNSID,

     

       69
       69
       +
       		Repo:       repo.Did,

     

       70
       70
       +
       	})

     

       71
       71
       +
       	if err != nil {

     

       72
       72
       +
       		return fmt.Errorf("atproto.RepoPutRecord: %w", err)

     

       73
       73
       +
       	}

     

       74
       74
       +
       	l.Info("wrote to PDS")

     

       75
       75
       +
       

     

       76
       76
       +
       	// knotclient, err := s.oauth.ServiceClient(

     

       77
       77
       +
       	// )

     

       78
       78
       +
       	panic("unimplemented")

     

       79
       79
       +
       }

     

       80
       80
       +
       

     

       81
       81
       +
       func fromContext(ctx context.Context) oauth.ClientSession {

     

       82
       82
       +
       	panic("todo")

     

       83
       83
       +
       }

+81

appview/service/repo/repoinfo.go

···

       1
       1
       +
       package repo

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/db"

     

       7
       7
       +
       	"tangled.org/core/appview/models"

     

       8
       8
       +
       	"tangled.org/core/appview/oauth"

     

       9
       9
       +
       	"tangled.org/core/appview/pages/repoinfo"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       // GetRepoInfo converts given `Repo` to `RepoInfo` object.

     

       13
       13
       +
       // The `user` can be nil.

     

       14
       14
       +
       func (s *Service) GetRepoInfo(ctx context.Context, baseRepo *models.Repo, user *oauth.User) (*repoinfo.RepoInfo, error) {

     

       15
       15
       +
       	var (

     

       16
       16
       +
       		repoAt    = baseRepo.RepoAt()

     

       17
       17
       +
       		isStarred = false

     

       18
       18
       +
       		roles     = repoinfo.RolesInRepo{}

     

       19
       19
       +
       	)

     

       20
       20
       +
       	if user != nil {

     

       21
       21
       +
       		isStarred = db.GetStarStatus(s.db, user.Did, repoAt)

     

       22
       22
       +
       		roles.Roles = s.enforcer.GetPermissionsInRepo(user.Did, baseRepo.Knot, baseRepo.DidSlashRepo())

     

       23
       23
       +
       	}

     

       24
       24
       +
       

     

       25
       25
       +
       	stats := baseRepo.RepoStats

     

       26
       26
       +
       	if stats == nil {

     

       27
       27
       +
       		starCount, err := db.GetStarCount(s.db, repoAt)

     

       28
       28
       +
       		if err != nil {

     

       29
       29
       +
       			return nil, err

     

       30
       30
       +
       		}

     

       31
       31
       +
       		issueCount, err := db.GetIssueCount(s.db, repoAt)

     

       32
       32
       +
       		if err != nil {

     

       33
       33
       +
       			return nil, err

     

       34
       34
       +
       		}

     

       35
       35
       +
       		pullCount, err := db.GetPullCount(s.db, repoAt)

     

       36
       36
       +
       		if err != nil {

     

       37
       37
       +
       			return nil, err

     

       38
       38
       +
       		}

     

       39
       39
       +
       		stats = &models.RepoStats{

     

       40
       40
       +
       			StarCount:  starCount,

     

       41
       41
       +
       			IssueCount: issueCount,

     

       42
       42
       +
       			PullCount:  pullCount,

     

       43
       43
       +
       		}

     

       44
       44
       +
       	}

     

       45
       45
       +
       

     

       46
       46
       +
       	var sourceRepo *models.Repo

     

       47
       47
       +
       	var err error

     

       48
       48
       +
       	if baseRepo.Source != "" {

     

       49
       49
       +
       		sourceRepo, err = db.GetRepoByAtUri(s.db, baseRepo.Source)

     

       50
       50
       +
       		if err != nil {

     

       51
       51
       +
       			return nil, err

     

       52
       52
       +
       		}

     

       53
       53
       +
       	}

     

       54
       54
       +
       

     

       55
       55
       +
       	repoInfo := &repoinfo.RepoInfo{

     

       56
       56
       +
       		// ok this is basically a models.Repo

     

       57
       57
       +
       		OwnerDid:    baseRepo.Did,

     

       58
       58
       +
       		OwnerHandle: "", // TODO: shouldn't use

     

       59
       59
       +
       		Name:        baseRepo.Name,

     

       60
       60
       +
       		Rkey:        baseRepo.Rkey,

     

       61
       61
       +
       		Description: baseRepo.Description,

     

       62
       62
       +
       		Website:     baseRepo.Website,

     

       63
       63
       +
       		Topics:      baseRepo.Topics,

     

       64
       64
       +
       		Knot:        baseRepo.Knot,

     

       65
       65
       +
       		Spindle:     baseRepo.Spindle,

     

       66
       66
       +
       		Stats:       *stats,

     

       67
       67
       +
       

     

       68
       68
       +
       		// fork repo upstream

     

       69
       69
       +
       		Source: sourceRepo,

     

       70
       70
       +
       

     

       71
       71
       +
       		// repo path (context)

     

       72
       72
       +
       		CurrentDir: "",

     

       73
       73
       +
       		Ref:        "",

     

       74
       74
       +
       

     

       75
       75
       +
       		// info related to the session

     

       76
       76
       +
       		IsStarred: isStarred,

     

       77
       77
       +
       		Roles:     roles,

     

       78
       78
       +
       	}

     

       79
       79
       +
       

     

       80
       80
       +
       	return repoInfo, nil

     

       81
       81
       +
       }

+29

appview/session/context.go

···

       1
       1
       +
       package session

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       

     

       6
       6
       +
       	toauth "tangled.org/core/appview/oauth"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type ctxKey struct{}

     

       10
       10
       +
       

     

       11
       11
       +
       func IntoContext(ctx context.Context, sess Session) context.Context {

     

       12
       12
       +
       	return context.WithValue(ctx, ctxKey{}, &sess)

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       func FromContext(ctx context.Context) *Session {

     

       16
       16
       +
       	sess, ok := ctx.Value(ctxKey{}).(*Session)

     

       17
       17
       +
       	if !ok {

     

       18
       18
       +
       		return nil

     

       19
       19
       +
       	}

     

       20
       20
       +
       	return sess

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       func UserFromContext(ctx context.Context) *toauth.User {

     

       24
       24
       +
       	sess := FromContext(ctx)

     

       25
       25
       +
       	if sess == nil {

     

       26
       26
       +
       		return nil

     

       27
       27
       +
       	}

     

       28
       28
       +
       	return sess.User()

     

       29
       29
       +
       }

+24

appview/session/session.go

···

       1
       1
       +
       package session

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       5
       5
       +
       	toauth "tangled.org/core/appview/oauth"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       // Session is a lightweight wrapper over indigo-oauth ClientSession

     

       9
       9
       +
       type Session struct {

     

       10
       10
       +
       	*oauth.ClientSession

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       func New(atSess *oauth.ClientSession) Session {

     

       14
       14
       +
       	return Session{

     

       15
       15
       +
       		atSess,

     

       16
       16
       +
       	}

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       func (s *Session) User() *toauth.User {

     

       20
       20
       +
       	return &toauth.User{

     

       21
       21
       +
       		Did: string(s.Data.AccountDID),

     

       22
       22
       +
       		Pds: s.Data.HostURL,

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

+62

appview/state/legacy_bridge.go

···

       1
       1
       +
       package state

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log/slog"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/config"

     

       7
       7
       +
       	"tangled.org/core/appview/db"

     

       8
       8
       +
       	"tangled.org/core/appview/indexer"

     

       9
       9
       +
       	"tangled.org/core/appview/issues"

     

       10
       10
       +
       	"tangled.org/core/appview/middleware"

     

       11
       11
       +
       	"tangled.org/core/appview/notify"

     

       12
       12
       +
       	"tangled.org/core/appview/oauth"

     

       13
       13
       +
       	"tangled.org/core/appview/pages"

     

       14
       14
       +
       	"tangled.org/core/appview/validator"

     

       15
       15
       +
       	"tangled.org/core/idresolver"

     

       16
       16
       +
       	"tangled.org/core/log"

     

       17
       17
       +
       	"tangled.org/core/rbac"

     

       18
       18
       +
       )

     

       19
       19
       +
       

     

       20
       20
       +
       // Expose exposes private fields in `State`. This is used to bridge between

     

       21
       21
       +
       // legacy web routers and new architecture

     

       22
       22
       +
       func (s *State) Expose() (

     

       23
       23
       +
       	*config.Config,

     

       24
       24
       +
       	*db.DB,

     

       25
       25
       +
       	*rbac.Enforcer,

     

       26
       26
       +
       	*idresolver.Resolver,

     

       27
       27
       +
       	*indexer.Indexer,

     

       28
       28
       +
       	*slog.Logger,

     

       29
       29
       +
       	notify.Notifier,

     

       30
       30
       +
       	*oauth.OAuth,

     

       31
       31
       +
       	*pages.Pages,

     

       32
       32
       +
       	*validator.Validator,

     

       33
       33
       +
       ) {

     

       34
       34
       +
       	return s.config, s.db, s.enforcer, s.idResolver, s.indexer, s.logger, s.notifier, s.oauth, s.pages, s.validator

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       func (s *State) ExposeIssue() *issues.Issues {

     

       38
       38
       +
       	return issues.New(

     

       39
       39
       +
       		s.oauth,

     

       40
       40
       +
       		s.repoResolver,

     

       41
       41
       +
       		s.pages,

     

       42
       42
       +
       		s.idResolver,

     

       43
       43
       +
       		s.db,

     

       44
       44
       +
       		s.config,

     

       45
       45
       +
       		s.notifier,

     

       46
       46
       +
       		s.validator,

     

       47
       47
       +
       		s.indexer.Issues,

     

       48
       48
       +
       		log.SubLogger(s.logger, "issues"),

     

       49
       49
       +
       	)

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       func (s *State) Middleware() *middleware.Middleware {

     

       53
       53
       +
       	mw := middleware.New(

     

       54
       54
       +
       		s.oauth,

     

       55
       55
       +
       		s.db,

     

       56
       56
       +
       		s.enforcer,

     

       57
       57
       +
       		s.repoResolver,

     

       58
       58
       +
       		s.idResolver,

     

       59
       59
       +
       		s.pages,

     

       60
       60
       +
       	)

     

       61
       61
       +
       	return &mw

     

       62
       62
       +
       }

+23

appview/web/handler/oauth_client_metadata.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/appview/oauth"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func OauthClientMetadata(o *oauth.OAuth) http.HandlerFunc {

     

       11
       11
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       12
       12
       +
       		doc := o.ClientApp.Config.ClientMetadata()

     

       13
       13
       +
       		doc.JWKSURI = &o.JwksUri

     

       14
       14
       +
       		doc.ClientName = &o.ClientName

     

       15
       15
       +
       		doc.ClientURI = &o.ClientUri

     

       16
       16
       +
       

     

       17
       17
       +
       		w.Header().Set("Content-Type", "application/json")

     

       18
       18
       +
       		if err := json.NewEncoder(w).Encode(doc); err != nil {

     

       19
       19
       +
       			http.Error(w, err.Error(), http.StatusInternalServerError)

     

       20
       20
       +
       			return

     

       21
       21
       +
       		}

     

       22
       22
       +
       	}

     

       23
       23
       +
       }

+19

appview/web/handler/oauth_jwks.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/appview/oauth"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func OauthJwks(o *oauth.OAuth) http.HandlerFunc {

     

       11
       11
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       12
       12
       +
       		w.Header().Set("Content-Type", "application/json")

     

       13
       13
       +
       		body := o.ClientApp.Config.PublicJWKS()

     

       14
       14
       +
       		if err := json.NewEncoder(w).Encode(body); err != nil {

     

       15
       15
       +
       			http.Error(w, err.Error(), http.StatusInternalServerError)

     

       16
       16
       +
       			return

     

       17
       17
       +
       		}

     

       18
       18
       +
       	}

     

       19
       19
       +
       }

+80

appview/web/handler/user_repo_issues.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/api/tangled"

     

       7
       7
       +
       	"tangled.org/core/appview/db"

     

       8
       8
       +
       	"tangled.org/core/appview/models"

     

       9
       9
       +
       	"tangled.org/core/appview/pages"

     

       10
       10
       +
       	"tangled.org/core/appview/pagination"

     

       11
       11
       +
       	isvc "tangled.org/core/appview/service/issue"

     

       12
       12
       +
       	rsvc "tangled.org/core/appview/service/repo"

     

       13
       13
       +
       	"tangled.org/core/appview/session"

     

       14
       14
       +
       	"tangled.org/core/appview/web/request"

     

       15
       15
       +
       	"tangled.org/core/log"

     

       16
       16
       +
       )

     

       17
       17
       +
       

     

       18
       18
       +
       func RepoIssues(is isvc.Service, rs rsvc.Service, p *pages.Pages, d *db.DB) http.HandlerFunc {

     

       19
       19
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       20
       20
       +
       		ctx := r.Context()

     

       21
       21
       +
       		l := log.FromContext(ctx).With("handler", "RepoIssues")

     

       22
       22
       +
       		repo, ok := request.RepoFromContext(ctx)

     

       23
       23
       +
       		if !ok {

     

       24
       24
       +
       			l.Error("malformed request")

     

       25
       25
       +
       			p.Error503(w)

     

       26
       26
       +
       			return

     

       27
       27
       +
       		}

     

       28
       28
       +
       

     

       29
       29
       +
       		query := r.URL.Query()

     

       30
       30
       +
       		searchOpts := models.IssueSearchOptions{

     

       31
       31
       +
       			RepoAt:  repo.RepoAt().String(),

     

       32
       32
       +
       			Keyword: query.Get("q"),

     

       33
       33
       +
       			IsOpen:  query.Get("state") != "closed",

     

       34
       34
       +
       			Page:    pagination.FromContext(ctx),

     

       35
       35
       +
       		}

     

       36
       36
       +
       

     

       37
       37
       +
       		issues, err := is.GetIssues(ctx, repo, searchOpts)

     

       38
       38
       +
       		if err != nil {

     

       39
       39
       +
       			l.Error("failed to get issues")

     

       40
       40
       +
       			p.Error503(w)

     

       41
       41
       +
       			return

     

       42
       42
       +
       		}

     

       43
       43
       +
       

     

       44
       44
       +
       		// render page

     

       45
       45
       +
       		err = func() error {

     

       46
       46
       +
       			user := session.UserFromContext(ctx)

     

       47
       47
       +
       			repoinfo, err := rs.GetRepoInfo(ctx, repo, user)

     

       48
       48
       +
       			if err != nil {

     

       49
       49
       +
       				return err

     

       50
       50
       +
       			}

     

       51
       51
       +
       			labelDefs, err := db.GetLabelDefinitions(

     

       52
       52
       +
       				d,

     

       53
       53
       +
       				db.FilterIn("at_uri", repo.Labels),

     

       54
       54
       +
       				db.FilterContains("scope", tangled.RepoIssueNSID),

     

       55
       55
       +
       			)

     

       56
       56
       +
       			if err != nil {

     

       57
       57
       +
       				return err

     

       58
       58
       +
       			}

     

       59
       59
       +
       			defs := make(map[string]*models.LabelDefinition)

     

       60
       60
       +
       			for _, l := range labelDefs {

     

       61
       61
       +
       				defs[l.AtUri().String()] = &l

     

       62
       62
       +
       			}

     

       63
       63
       +
       			return p.RepoIssues(w, pages.RepoIssuesParams{

     

       64
       64
       +
       				LoggedInUser: user,

     

       65
       65
       +
       				RepoInfo:     *repoinfo,

     

       66
       66
       +
       

     

       67
       67
       +
       				Issues:          issues,

     

       68
       68
       +
       				LabelDefs:       defs,

     

       69
       69
       +
       				FilteringByOpen: searchOpts.IsOpen,

     

       70
       70
       +
       				FilterQuery:     searchOpts.Keyword,

     

       71
       71
       +
       				Page:            searchOpts.Page,

     

       72
       72
       +
       			})

     

       73
       73
       +
       		}()

     

       74
       74
       +
       		if err != nil {

     

       75
       75
       +
       			l.Error("failed to render", "err", err)

     

       76
       76
       +
       			p.Error503(w)

     

       77
       77
       +
       			return

     

       78
       78
       +
       		}

     

       79
       79
       +
       	}

     

       80
       80
       +
       }

+65

appview/web/handler/user_repo_issues_issue.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/pages"

     

       7
       7
       +
       	isvc "tangled.org/core/appview/service/issue"

     

       8
       8
       +
       	rsvc "tangled.org/core/appview/service/repo"

     

       9
       9
       +
       	"tangled.org/core/appview/session"

     

       10
       10
       +
       	"tangled.org/core/appview/web/request"

     

       11
       11
       +
       	"tangled.org/core/log"

     

       12
       12
       +
       )

     

       13
       13
       +
       

     

       14
       14
       +
       func Issue(s isvc.Service, rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       15
       15
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       16
       16
       +
       		ctx := r.Context()

     

       17
       17
       +
       		l := log.FromContext(ctx).With("handler", "Issue")

     

       18
       18
       +
       		issue, ok := request.IssueFromContext(ctx)

     

       19
       19
       +
       		if !ok {

     

       20
       20
       +
       			l.Error("malformed request, failed to get issue")

     

       21
       21
       +
       			p.Error503(w)

     

       22
       22
       +
       			return

     

       23
       23
       +
       		}

     

       24
       24
       +
       

     

       25
       25
       +
       		// render

     

       26
       26
       +
       		err := func() error {

     

       27
       27
       +
       			user := session.UserFromContext(ctx)

     

       28
       28
       +
       			repoinfo, err := rs.GetRepoInfo(ctx, issue.Repo, user)

     

       29
       29
       +
       			if err != nil {

     

       30
       30
       +
       				return err

     

       31
       31
       +
       			}

     

       32
       32
       +
       			return p.RepoSingleIssue(w, pages.RepoSingleIssueParams{

     

       33
       33
       +
       				LoggedInUser: user,

     

       34
       34
       +
       				RepoInfo:     *repoinfo,

     

       35
       35
       +
       				Issue:        issue,

     

       36
       36
       +
       			})

     

       37
       37
       +
       		}()

     

       38
       38
       +
       		if err != nil {

     

       39
       39
       +
       			l.Error("failed to render", "err", err)

     

       40
       40
       +
       			p.Error503(w)

     

       41
       41
       +
       			return

     

       42
       42
       +
       		}

     

       43
       43
       +
       	}

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       func IssueDelete(s isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       47
       47
       +
       	noticeId := "issue-actions-error"

     

       48
       48
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       49
       49
       +
       		ctx := r.Context()

     

       50
       50
       +
       		l := log.FromContext(ctx).With("handler", "IssueDelete")

     

       51
       51
       +
       		issue, ok := request.IssueFromContext(ctx)

     

       52
       52
       +
       		if !ok {

     

       53
       53
       +
       			l.Error("failed to get issue")

     

       54
       54
       +
       			// TODO: 503 error with more detailed messages

     

       55
       55
       +
       			p.Error503(w)

     

       56
       56
       +
       			return

     

       57
       57
       +
       		}

     

       58
       58
       +
       		err := s.DeleteIssue(ctx, issue)

     

       59
       59
       +
       		if err != nil {

     

       60
       60
       +
       			p.Notice(w, noticeId, "failed to delete issue")

     

       61
       61
       +
       			return

     

       62
       62
       +
       		}

     

       63
       63
       +
       		p.HxLocation(w, "/")

     

       64
       64
       +
       	}

     

       65
       65
       +
       }

+13

appview/web/handler/user_repo_issues_issue_close.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func CloseIssue(s issue.Service) http.HandlerFunc {

     

       10
       10
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       +
       		panic("unimplemented")

     

       12
       12
       +
       	}

     

       13
       13
       +
       }

+77

appview/web/handler/user_repo_issues_issue_edit.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"errors"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/appview/pages"

     

       8
       8
       +
       	isvc "tangled.org/core/appview/service/issue"

     

       9
       9
       +
       	rsvc "tangled.org/core/appview/service/repo"

     

       10
       10
       +
       	"tangled.org/core/appview/session"

     

       11
       11
       +
       	"tangled.org/core/appview/web/request"

     

       12
       12
       +
       	"tangled.org/core/log"

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       func IssueEdit(is isvc.Service, rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       16
       16
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       17
       17
       +
       		ctx := r.Context()

     

       18
       18
       +
       		l := log.FromContext(ctx).With("handler", "IssueEdit")

     

       19
       19
       +
       		issue, ok := request.IssueFromContext(ctx)

     

       20
       20
       +
       		if !ok {

     

       21
       21
       +
       			l.Error("malformed request, failed to get issue")

     

       22
       22
       +
       			p.Error503(w)

     

       23
       23
       +
       			return

     

       24
       24
       +
       		}

     

       25
       25
       +
       

     

       26
       26
       +
       		// render

     

       27
       27
       +
       		err := func() error {

     

       28
       28
       +
       			user := session.UserFromContext(ctx)

     

       29
       29
       +
       			repoinfo, err := rs.GetRepoInfo(ctx, issue.Repo, user)

     

       30
       30
       +
       			if err != nil {

     

       31
       31
       +
       				return err

     

       32
       32
       +
       			}

     

       33
       33
       +
       			return p.EditIssueFragment(w, pages.EditIssueParams{

     

       34
       34
       +
       				LoggedInUser: user,

     

       35
       35
       +
       				RepoInfo:     *repoinfo,

     

       36
       36
       +
       

     

       37
       37
       +
       				Issue: issue,

     

       38
       38
       +
       			})

     

       39
       39
       +
       		}()

     

       40
       40
       +
       		if err != nil {

     

       41
       41
       +
       			l.Error("failed to render", "err", err)

     

       42
       42
       +
       			p.Error503(w)

     

       43
       43
       +
       			return

     

       44
       44
       +
       		}

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       func IssueEditPost(is isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       49
       49
       +
       	noticeId := "issues"

     

       50
       50
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       51
       51
       +
       		ctx := r.Context()

     

       52
       52
       +
       		l := log.FromContext(ctx).With("handler", "IssueEdit")

     

       53
       53
       +
       		issue, ok := request.IssueFromContext(ctx)

     

       54
       54
       +
       		if !ok {

     

       55
       55
       +
       			l.Error("malformed request, failed to get issue")

     

       56
       56
       +
       			p.Error503(w)

     

       57
       57
       +
       			return

     

       58
       58
       +
       		}

     

       59
       59
       +
       

     

       60
       60
       +
       		newIssue := *issue

     

       61
       61
       +
       		newIssue.Title = r.FormValue("title")

     

       62
       62
       +
       		newIssue.Body = r.FormValue("body")

     

       63
       63
       +
       

     

       64
       64
       +
       		err := is.EditIssue(ctx, &newIssue)

     

       65
       65
       +
       		if err != nil {

     

       66
       66
       +
       			if errors.Is(err, isvc.ErrDatabaseFail) {

     

       67
       67
       +
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       68
       68
       +
       			} else if errors.Is(err, isvc.ErrPDSFail) {

     

       69
       69
       +
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       70
       70
       +
       			} else {

     

       71
       71
       +
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       72
       72
       +
       			}

     

       73
       73
       +
       		}

     

       74
       74
       +
       

     

       75
       75
       +
       		p.HxRefresh(w)

     

       76
       76
       +
       	}

     

       77
       77
       +
       }

+13

appview/web/handler/user_repo_issues_issue_opengraph.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func IssueOpenGraph(s issue.Service) http.HandlerFunc {

     

       10
       10
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       +
       		panic("unimplemented")

     

       12
       12
       +
       	}

     

       13
       13
       +
       }

+13

appview/web/handler/user_repo_issues_issue_reopen.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func ReopenIssue(s issue.Service) http.HandlerFunc {

     

       10
       10
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       +
       		panic("unimplemented")

     

       12
       12
       +
       	}

     

       13
       13
       +
       }

+74

appview/web/handler/user_repo_issues_new.go

···

       1
       1
       +
       package handler

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"errors"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"net/http"

     

       7
       7
       +
       

     

       8
       8
       +
       	"tangled.org/core/appview/pages"

     

       9
       9
       +
       	isvc "tangled.org/core/appview/service/issue"

     

       10
       10
       +
       	rsvc "tangled.org/core/appview/service/repo"

     

       11
       11
       +
       	"tangled.org/core/appview/session"

     

       12
       12
       +
       	"tangled.org/core/appview/web/request"

     

       13
       13
       +
       	"tangled.org/core/log"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       func NewIssue(rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       17
       17
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       18
       18
       +
       		ctx := r.Context()

     

       19
       19
       +
       		l := log.FromContext(ctx).With("handler", "NewIssue")

     

       20
       20
       +
       

     

       21
       21
       +
       		// render

     

       22
       22
       +
       		err := func() error {

     

       23
       23
       +
       			user := session.UserFromContext(ctx)

     

       24
       24
       +
       			repo, ok := request.RepoFromContext(ctx)

     

       25
       25
       +
       			if !ok {

     

       26
       26
       +
       				return fmt.Errorf("malformed request")

     

       27
       27
       +
       			}

     

       28
       28
       +
       			repoinfo, err := rs.GetRepoInfo(ctx, repo, user)

     

       29
       29
       +
       			if err != nil {

     

       30
       30
       +
       				return err

     

       31
       31
       +
       			}

     

       32
       32
       +
       			return p.RepoNewIssue(w, pages.RepoNewIssueParams{

     

       33
       33
       +
       				LoggedInUser: user,

     

       34
       34
       +
       				RepoInfo:     *repoinfo,

     

       35
       35
       +
       			})

     

       36
       36
       +
       		}()

     

       37
       37
       +
       		if err != nil {

     

       38
       38
       +
       			l.Error("failed to render", "err", err)

     

       39
       39
       +
       			p.Error503(w)

     

       40
       40
       +
       			return

     

       41
       41
       +
       		}

     

       42
       42
       +
       	}

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       func NewIssuePost(is isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       46
       46
       +
       	noticeId := "issues"

     

       47
       47
       +
       	return func(w http.ResponseWriter, r *http.Request) {

     

       48
       48
       +
       		ctx := r.Context()

     

       49
       49
       +
       		l := log.FromContext(ctx).With("handler", "NewIssuePost")

     

       50
       50
       +
       		repo, ok := request.RepoFromContext(ctx)

     

       51
       51
       +
       		if !ok {

     

       52
       52
       +
       			l.Error("malformed request, failed to get repo")

     

       53
       53
       +
       			// TODO: 503 error with more detailed messages

     

       54
       54
       +
       			p.Error503(w)

     

       55
       55
       +
       			return

     

       56
       56
       +
       		}

     

       57
       57
       +
       		var (

     

       58
       58
       +
       			title = r.FormValue("title")

     

       59
       59
       +
       			body  = r.FormValue("body")

     

       60
       60
       +
       		)

     

       61
       61
       +
       

     

       62
       62
       +
       		_, err := is.NewIssue(ctx, repo, title, body)

     

       63
       63
       +
       		if err != nil {

     

       64
       64
       +
       			if errors.Is(err, isvc.ErrDatabaseFail) {

     

       65
       65
       +
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       66
       66
       +
       			} else if errors.Is(err, isvc.ErrPDSFail) {

     

       67
       67
       +
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       68
       68
       +
       			} else {

     

       69
       69
       +
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       70
       70
       +
       			}

     

       71
       71
       +
       		}

     

       72
       72
       +
       		p.HxLocation(w, "/")

     

       73
       73
       +
       	}

     

       74
       74
       +
       }

+67

appview/web/middleware/auth.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       	"net/url"

     

       7
       7
       +
       

     

       8
       8
       +
       	"tangled.org/core/appview/oauth"

     

       9
       9
       +
       	"tangled.org/core/appview/session"

     

       10
       10
       +
       	"tangled.org/core/log"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       // WithSession resumes atp session from cookie, ensure it's not malformed and

     

       14
       14
       +
       // pass the session through context

     

       15
       15
       +
       func WithSession(o *oauth.OAuth) middlewareFunc {

     

       16
       16
       +
       	return func(next http.Handler) http.Handler {

     

       17
       17
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       18
       18
       +
       			atSess, err := o.ResumeSession(r)

     

       19
       19
       +
       			if err != nil {

     

       20
       20
       +
       				next.ServeHTTP(w, r)

     

       21
       21
       +
       				return

     

       22
       22
       +
       			}

     

       23
       23
       +
       

     

       24
       24
       +
       			sess := session.New(atSess)

     

       25
       25
       +
       

     

       26
       26
       +
       			ctx := session.IntoContext(r.Context(), sess)

     

       27
       27
       +
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       28
       28
       +
       		})

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // AuthMiddleware ensures the request is authorized and redirect to login page

     

       33
       33
       +
       // when unauthorized

     

       34
       34
       +
       func AuthMiddleware() middlewareFunc {

     

       35
       35
       +
       	return func(next http.Handler) http.Handler {

     

       36
       36
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       37
       37
       +
       			ctx := r.Context()

     

       38
       38
       +
       			l := log.FromContext(ctx)

     

       39
       39
       +
       

     

       40
       40
       +
       			returnURL := "/"

     

       41
       41
       +
       			if u, err := url.Parse(r.Header.Get("Referer")); err == nil {

     

       42
       42
       +
       				returnURL = u.RequestURI()

     

       43
       43
       +
       			}

     

       44
       44
       +
       

     

       45
       45
       +
       			loginURL := fmt.Sprintf("/login?return_url=%s", url.QueryEscape(returnURL))

     

       46
       46
       +
       

     

       47
       47
       +
       			redirectFunc := func(w http.ResponseWriter, r *http.Request) {

     

       48
       48
       +
       				http.Redirect(w, r, loginURL, http.StatusTemporaryRedirect)

     

       49
       49
       +
       			}

     

       50
       50
       +
       			if r.Header.Get("HX-Request") == "true" {

     

       51
       51
       +
       				redirectFunc = func(w http.ResponseWriter, _ *http.Request) {

     

       52
       52
       +
       					w.Header().Set("HX-Redirect", loginURL)

     

       53
       53
       +
       					w.WriteHeader(http.StatusOK)

     

       54
       54
       +
       				}

     

       55
       55
       +
       			}

     

       56
       56
       +
       

     

       57
       57
       +
       			sess := session.FromContext(ctx)

     

       58
       58
       +
       			if sess == nil {

     

       59
       59
       +
       				l.Debug("no session, redirecting...")

     

       60
       60
       +
       				redirectFunc(w, r)

     

       61
       61
       +
       				return

     

       62
       62
       +
       			}

     

       63
       63
       +
       

     

       64
       64
       +
       			next.ServeHTTP(w, r)

     

       65
       65
       +
       		})

     

       66
       66
       +
       	}

     

       67
       67
       +
       }

+30

appview/web/middleware/ensuredidorhandle.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/go-chi/chi/v5"

     

       7
       7
       +
       	"tangled.org/core/appview/pages"

     

       8
       8
       +
       	"tangled.org/core/appview/state/userutil"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // EnsureDidOrHandle ensures the "user" url param is valid did/handle format.

     

       12
       12
       +
       // If not, respond with 404

     

       13
       13
       +
       func EnsureDidOrHandle(p *pages.Pages) middlewareFunc {

     

       14
       14
       +
       	return func(next http.Handler) http.Handler {

     

       15
       15
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       16
       16
       +
       			user := chi.URLParam(r, "user")

     

       17
       17
       +
       

     

       18
       18
       +
       			// if using a DID or handle, just continue as per usual

     

       19
       19
       +
       			if userutil.IsDid(user) || userutil.IsHandle(user) {

     

       20
       20
       +
       				next.ServeHTTP(w, r)

     

       21
       21
       +
       				return

     

       22
       22
       +
       			}

     

       23
       23
       +
       

     

       24
       24
       +
       			// TODO: run Normalize middleware from here

     

       25
       25
       +
       

     

       26
       26
       +
       			p.Error404(w)

     

       27
       27
       +
       			return

     

       28
       28
       +
       		})

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

+18

appview/web/middleware/log.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log/slog"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/log"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func WithLogger(l *slog.Logger) middlewareFunc {

     

       11
       11
       +
       	return func(next http.Handler) http.Handler {

     

       12
       12
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       13
       13
       +
       			// NOTE: can add some metadata here

     

       14
       14
       +
       			ctx := log.IntoContext(r.Context(), l)

     

       15
       15
       +
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       16
       16
       +
       		})

     

       17
       17
       +
       	}

     

       18
       18
       +
       }

appview/web/middleware/middleware.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       type middlewareFunc func(http.Handler) http.Handler

+50

appview/web/middleware/normalize.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"net/http"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/go-chi/chi/v5"

     

       8
       8
       +
       	"tangled.org/core/appview/state/userutil"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func Normalize() middlewareFunc {

     

       12
       12
       +
       	return func(next http.Handler) http.Handler {

     

       13
       13
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       14
       14
       +
       			pat := chi.URLParam(r, "*")

     

       15
       15
       +
       			pathParts := strings.SplitN(pat, "/", 2)

     

       16
       16
       +
       			if len(pathParts) == 0 {

     

       17
       17
       +
       				next.ServeHTTP(w, r)

     

       18
       18
       +
       				return

     

       19
       19
       +
       			}

     

       20
       20
       +
       

     

       21
       21
       +
       			firstPart := pathParts[0]

     

       22
       22
       +
       

     

       23
       23
       +
       			// if using a flattened DID (like you would in go modules), unflatten

     

       24
       24
       +
       			if userutil.IsFlattenedDid(firstPart) {

     

       25
       25
       +
       				unflattenedDid := userutil.UnflattenDid(firstPart)

     

       26
       26
       +
       				redirectPath := strings.Join(append([]string{unflattenedDid}, pathParts[1:]...), "/")

     

       27
       27
       +
       

     

       28
       28
       +
       				redirectURL := *r.URL

     

       29
       29
       +
       				redirectURL.Path = "/" + redirectPath

     

       30
       30
       +
       

     

       31
       31
       +
       				http.Redirect(w, r, redirectURL.String(), http.StatusFound)

     

       32
       32
       +
       				return

     

       33
       33
       +
       			}

     

       34
       34
       +
       

     

       35
       35
       +
       			// if using a handle with @, rewrite to work without @

     

       36
       36
       +
       			if normalized := strings.TrimPrefix(firstPart, "@"); userutil.IsHandle(normalized) {

     

       37
       37
       +
       				redirectPath := strings.Join(append([]string{normalized}, pathParts[1:]...), "/")

     

       38
       38
       +
       

     

       39
       39
       +
       				redirectURL := *r.URL

     

       40
       40
       +
       				redirectURL.Path = "/" + redirectPath

     

       41
       41
       +
       

     

       42
       42
       +
       				http.Redirect(w, r, redirectURL.String(), http.StatusFound)

     

       43
       43
       +
       				return

     

       44
       44
       +
       			}

     

       45
       45
       +
       

     

       46
       46
       +
       			next.ServeHTTP(w, r)

     

       47
       47
       +
       			return

     

       48
       48
       +
       		})

     

       49
       49
       +
       	}

     

       50
       50
       +
       }

+38

appview/web/middleware/paginate.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       	"strconv"

     

       7
       7
       +
       

     

       8
       8
       +
       	"tangled.org/core/appview/pagination"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func Paginate(next http.Handler) http.Handler {

     

       12
       12
       +
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       13
       13
       +
       		page := pagination.FirstPage()

     

       14
       14
       +
       

     

       15
       15
       +
       		offsetVal := r.URL.Query().Get("offset")

     

       16
       16
       +
       		if offsetVal != "" {

     

       17
       17
       +
       			offset, err := strconv.Atoi(offsetVal)

     

       18
       18
       +
       			if err != nil {

     

       19
       19
       +
       				log.Println("invalid offset")

     

       20
       20
       +
       			} else {

     

       21
       21
       +
       				page.Offset = offset

     

       22
       22
       +
       			}

     

       23
       23
       +
       		}

     

       24
       24
       +
       

     

       25
       25
       +
       		limitVal := r.URL.Query().Get("limit")

     

       26
       26
       +
       		if limitVal != "" {

     

       27
       27
       +
       			limit, err := strconv.Atoi(limitVal)

     

       28
       28
       +
       			if err != nil {

     

       29
       29
       +
       				log.Println("invalid limit")

     

       30
       30
       +
       			} else {

     

       31
       31
       +
       				page.Limit = limit

     

       32
       32
       +
       			}

     

       33
       33
       +
       		}

     

       34
       34
       +
       

     

       35
       35
       +
       		ctx := pagination.IntoContext(r.Context(), page)

     

       36
       36
       +
       		next.ServeHTTP(w, r.WithContext(ctx))

     

       37
       37
       +
       	})

     

       38
       38
       +
       }

+120

appview/web/middleware/resolve.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       	"strconv"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       

     

       9
       9
       +
       	"github.com/go-chi/chi/v5"

     

       10
       10
       +
       	"tangled.org/core/appview/db"

     

       11
       11
       +
       	"tangled.org/core/appview/pages"

     

       12
       12
       +
       	"tangled.org/core/appview/web/request"

     

       13
       13
       +
       	"tangled.org/core/idresolver"

     

       14
       14
       +
       	"tangled.org/core/log"

     

       15
       15
       +
       )

     

       16
       16
       +
       

     

       17
       17
       +
       func ResolveIdent(

     

       18
       18
       +
       	idResolver *idresolver.Resolver,

     

       19
       19
       +
       	pages *pages.Pages,

     

       20
       20
       +
       ) middlewareFunc {

     

       21
       21
       +
       	return func(next http.Handler) http.Handler {

     

       22
       22
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       23
       23
       +
       			ctx := r.Context()

     

       24
       24
       +
       			l := log.FromContext(ctx)

     

       25
       25
       +
       			didOrHandle := chi.URLParam(r, "user")

     

       26
       26
       +
       			didOrHandle = strings.TrimPrefix(didOrHandle, "@")

     

       27
       27
       +
       

     

       28
       28
       +
       			id, err := idResolver.ResolveIdent(ctx, didOrHandle)

     

       29
       29
       +
       			if err != nil {

     

       30
       30
       +
       				// invalid did or handle

     

       31
       31
       +
       				l.Warn("failed to resolve did/handle", "handle", didOrHandle, "err", err)

     

       32
       32
       +
       				pages.Error404(w)

     

       33
       33
       +
       				return

     

       34
       34
       +
       			}

     

       35
       35
       +
       

     

       36
       36
       +
       			ctx = request.WithOwner(ctx, id)

     

       37
       37
       +
       			// TODO: reomove this later

     

       38
       38
       +
       			ctx = context.WithValue(ctx, "resolvedId", *id)

     

       39
       39
       +
       

     

       40
       40
       +
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       41
       41
       +
       		})

     

       42
       42
       +
       	}

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       func ResolveRepo(

     

       46
       46
       +
       	e *db.DB,

     

       47
       47
       +
       	pages *pages.Pages,

     

       48
       48
       +
       ) middlewareFunc {

     

       49
       49
       +
       	return func(next http.Handler) http.Handler {

     

       50
       50
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       51
       51
       +
       			ctx := r.Context()

     

       52
       52
       +
       			l := log.FromContext(ctx)

     

       53
       53
       +
       			repoName := chi.URLParam(r, "repo")

     

       54
       54
       +
       			repoOwner, ok := request.OwnerFromContext(ctx)

     

       55
       55
       +
       			if !ok {

     

       56
       56
       +
       				l.Error("malformed middleware")

     

       57
       57
       +
       				w.WriteHeader(http.StatusInternalServerError)

     

       58
       58
       +
       				return

     

       59
       59
       +
       			}

     

       60
       60
       +
       

     

       61
       61
       +
       			repo, err := db.GetRepo(

     

       62
       62
       +
       				e,

     

       63
       63
       +
       				db.FilterEq("did", repoOwner.DID.String()),

     

       64
       64
       +
       				db.FilterEq("name", repoName),

     

       65
       65
       +
       			)

     

       66
       66
       +
       			if err != nil {

     

       67
       67
       +
       				l.Warn("failed to resolve repo", "err", err)

     

       68
       68
       +
       				pages.ErrorKnot404(w)

     

       69
       69
       +
       				return

     

       70
       70
       +
       			}

     

       71
       71
       +
       

     

       72
       72
       +
       			// TODO: pass owner id into repository object

     

       73
       73
       +
       

     

       74
       74
       +
       			ctx = request.WithRepo(ctx, repo)

     

       75
       75
       +
       			// TODO: reomove this later

     

       76
       76
       +
       			ctx = context.WithValue(ctx, "repo", repo)

     

       77
       77
       +
       

     

       78
       78
       +
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       79
       79
       +
       		})

     

       80
       80
       +
       	}

     

       81
       81
       +
       }

     

       82
       82
       +
       

     

       83
       83
       +
       func ResolveIssue(

     

       84
       84
       +
       	e *db.DB,

     

       85
       85
       +
       	pages *pages.Pages,

     

       86
       86
       +
       ) middlewareFunc {

     

       87
       87
       +
       	return func(next http.Handler) http.Handler {

     

       88
       88
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       89
       89
       +
       			ctx := r.Context()

     

       90
       90
       +
       			l := log.FromContext(ctx)

     

       91
       91
       +
       			issueIdStr := chi.URLParam(r, "issue")

     

       92
       92
       +
       			issueId, err := strconv.Atoi(issueIdStr)

     

       93
       93
       +
       			if err != nil {

     

       94
       94
       +
       				l.Warn("failed to fully resolve issue ID", "err", err)

     

       95
       95
       +
       				pages.Error404(w)

     

       96
       96
       +
       				return

     

       97
       97
       +
       			}

     

       98
       98
       +
       			repo, ok := request.RepoFromContext(ctx)

     

       99
       99
       +
       			if !ok {

     

       100
       100
       +
       				l.Error("malformed middleware")

     

       101
       101
       +
       				w.WriteHeader(http.StatusInternalServerError)

     

       102
       102
       +
       				return

     

       103
       103
       +
       			}

     

       104
       104
       +
       

     

       105
       105
       +
       			issue, err := db.GetIssue(e, repo.RepoAt(), issueId)

     

       106
       106
       +
       			if err != nil {

     

       107
       107
       +
       				l.Warn("failed to resolve issue", "err", err)

     

       108
       108
       +
       				pages.ErrorKnot404(w)

     

       109
       109
       +
       				return

     

       110
       110
       +
       			}

     

       111
       111
       +
       			issue.Repo = repo

     

       112
       112
       +
       

     

       113
       113
       +
       			ctx = request.WithIssue(ctx, issue)

     

       114
       114
       +
       			// TODO: reomove this later

     

       115
       115
       +
       			ctx = context.WithValue(ctx, "issue", issue)

     

       116
       116
       +
       

     

       117
       117
       +
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       118
       118
       +
       		})

     

       119
       119
       +
       	}

     

       120
       120
       +
       }

+39

appview/web/request/context.go

···

       1
       1
       +
       package request

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       7
       7
       +
       	"tangled.org/core/appview/models"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       type ctxKeyOwner struct{}

     

       11
       11
       +
       type ctxKeyRepo struct{}

     

       12
       12
       +
       type ctxKeyIssue struct{}

     

       13
       13
       +
       

     

       14
       14
       +
       func WithOwner(ctx context.Context, owner *identity.Identity) context.Context {

     

       15
       15
       +
       	return context.WithValue(ctx, ctxKeyOwner{}, owner)

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       func OwnerFromContext(ctx context.Context) (*identity.Identity, bool) {

     

       19
       19
       +
       	owner, ok := ctx.Value(ctxKeyOwner{}).(*identity.Identity)

     

       20
       20
       +
       	return owner, ok

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       func WithRepo(ctx context.Context, repo *models.Repo) context.Context {

     

       24
       24
       +
       	return context.WithValue(ctx, ctxKeyRepo{}, repo)

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       func RepoFromContext(ctx context.Context) (*models.Repo, bool) {

     

       28
       28
       +
       	repo, ok := ctx.Value(ctxKeyRepo{}).(*models.Repo)

     

       29
       29
       +
       	return repo, ok

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       func WithIssue(ctx context.Context, issue *models.Issue) context.Context {

     

       33
       33
       +
       	return context.WithValue(ctx, ctxKeyIssue{}, issue)

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       func IssueFromContext(ctx context.Context) (*models.Issue, bool) {

     

       37
       37
       +
       	issue, ok := ctx.Value(ctxKeyIssue{}).(*models.Issue)

     

       38
       38
       +
       	return issue, ok

     

       39
       39
       +
       }

+213

appview/web/routes.go

···

       1
       1
       +
       package web

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log/slog"

     

       5
       5
       +
       	"net/http"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/go-chi/chi/v5"

     

       8
       8
       +
       	"tangled.org/core/appview/config"

     

       9
       9
       +
       	"tangled.org/core/appview/db"

     

       10
       10
       +
       	"tangled.org/core/appview/indexer"

     

       11
       11
       +
       	"tangled.org/core/appview/notify"

     

       12
       12
       +
       	"tangled.org/core/appview/oauth"

     

       13
       13
       +
       	"tangled.org/core/appview/pages"

     

       14
       14
       +
       	isvc "tangled.org/core/appview/service/issue"

     

       15
       15
       +
       	rsvc "tangled.org/core/appview/service/repo"

     

       16
       16
       +
       	"tangled.org/core/appview/state"

     

       17
       17
       +
       	"tangled.org/core/appview/validator"

     

       18
       18
       +
       	"tangled.org/core/appview/web/handler"

     

       19
       19
       +
       	"tangled.org/core/appview/web/middleware"

     

       20
       20
       +
       	"tangled.org/core/idresolver"

     

       21
       21
       +
       	"tangled.org/core/rbac"

     

       22
       22
       +
       )

     

       23
       23
       +
       

     

       24
       24
       +
       // Rules

     

       25
       25
       +
       // - Use single function for each endpoints (unless it doesn't make sense.)

     

       26
       26
       +
       // - Name handler files following the related path (ancestor paths can be

     

       27
       27
       +
       //   trimmed.)

     

       28
       28
       +
       // - Pass dependencies to each handlers, don't create structs with shared

     

       29
       29
       +
       //   dependencies unless it serves some domain-specific roles like

     

       30
       30
       +
       //   service/issue. Same rule goes to middlewares.

     

       31
       31
       +
       

     

       32
       32
       +
       // RouterFromState creates a web router from `state.State`. This exist to

     

       33
       33
       +
       // bridge between legacy web routers under `State` and new architecture

     

       34
       34
       +
       func RouterFromState(s *state.State) http.Handler {

     

       35
       35
       +
       	config, db, enforcer, idResolver, indexer, logger, notifier, oauth, pages, validator := s.Expose()

     

       36
       36
       +
       

     

       37
       37
       +
       	return Router(

     

       38
       38
       +
       		logger,

     

       39
       39
       +
       		config,

     

       40
       40
       +
       		db,

     

       41
       41
       +
       		enforcer,

     

       42
       42
       +
       		idResolver,

     

       43
       43
       +
       		indexer,

     

       44
       44
       +
       		notifier,

     

       45
       45
       +
       		oauth,

     

       46
       46
       +
       		pages,

     

       47
       47
       +
       		validator,

     

       48
       48
       +
       		s,

     

       49
       49
       +
       	)

     

       50
       50
       +
       }

     

       51
       51
       +
       

     

       52
       52
       +
       func Router(

     

       53
       53
       +
       	// NOTE: put base dependencies (db, idResolver, oauth etc)

     

       54
       54
       +
       	logger *slog.Logger,

     

       55
       55
       +
       	config *config.Config,

     

       56
       56
       +
       	db *db.DB,

     

       57
       57
       +
       	enforcer *rbac.Enforcer,

     

       58
       58
       +
       	idResolver *idresolver.Resolver,

     

       59
       59
       +
       	indexer *indexer.Indexer,

     

       60
       60
       +
       	notifier notify.Notifier,

     

       61
       61
       +
       	oauth *oauth.OAuth,

     

       62
       62
       +
       	pages *pages.Pages,

     

       63
       63
       +
       	validator *validator.Validator,

     

       64
       64
       +
       	// to use legacy web handlers. will be removed later

     

       65
       65
       +
       	s *state.State,

     

       66
       66
       +
       ) http.Handler {

     

       67
       67
       +
       	repo := rsvc.NewService(

     

       68
       68
       +
       		logger,

     

       69
       69
       +
       		config,

     

       70
       70
       +
       		db,

     

       71
       71
       +
       		enforcer,

     

       72
       72
       +
       	)

     

       73
       73
       +
       	issue := isvc.NewService(

     

       74
       74
       +
       		logger,

     

       75
       75
       +
       		config,

     

       76
       76
       +
       		db,

     

       77
       77
       +
       		notifier,

     

       78
       78
       +
       		idResolver,

     

       79
       79
       +
       		indexer.Issues,

     

       80
       80
       +
       		validator,

     

       81
       81
       +
       	)

     

       82
       82
       +
       

     

       83
       83
       +
       	i := s.ExposeIssue()

     

       84
       84
       +
       

     

       85
       85
       +
       	r := chi.NewRouter()

     

       86
       86
       +
       

     

       87
       87
       +
       	mw := s.Middleware()

     

       88
       88
       +
       	auth := middleware.AuthMiddleware()

     

       89
       89
       +
       

     

       90
       90
       +
       	r.Use(middleware.WithLogger(logger))

     

       91
       91
       +
       	r.Use(middleware.WithSession(oauth))

     

       92
       92
       +
       

     

       93
       93
       +
       	r.Use(middleware.Normalize())

     

       94
       94
       +
       

     

       95
       95
       +
       	r.Get("/favicon.svg", s.Favicon)

     

       96
       96
       +
       	r.Get("/favicon.ico", s.Favicon)

     

       97
       97
       +
       	r.Get("/pwa-manifest.json", s.PWAManifest)

     

       98
       98
       +
       	r.Get("/robots.txt", s.RobotsTxt)

     

       99
       99
       +
       

     

       100
       100
       +
       	r.Handle("/static/*", pages.Static())

     

       101
       101
       +
       

     

       102
       102
       +
       	r.Get("/", s.HomeOrTimeline)

     

       103
       103
       +
       	r.Get("/timeline", s.Timeline)

     

       104
       104
       +
       	r.Get("/upgradeBanner", s.UpgradeBanner)

     

       105
       105
       +
       

     

       106
       106
       +
       	r.Get("/terms", s.TermsOfService)

     

       107
       107
       +
       	r.Get("/privacy", s.PrivacyPolicy)

     

       108
       108
       +
       	r.Get("/brand", s.Brand)

     

       109
       109
       +
       	// special-case handler for serving tangled.org/core

     

       110
       110
       +
       	r.Get("/core", s.Core())

     

       111
       111
       +
       

     

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

     

       113
       113
       +
       	r.Post("/login", s.Login)

     

       114
       114
       +
       	r.Post("/logout", s.Logout)

     

       115
       115
       +
       

     

       116
       116
       +
       	r.Get("/goodfirstissues", s.GoodFirstIssues)

     

       117
       117
       +
       

     

       118
       118
       +
       	r.With(auth).Get("/repo/new", s.NewRepo)

     

       119
       119
       +
       	r.With(auth).Post("/repo/new", s.NewRepo)

     

       120
       120
       +
       

     

       121
       121
       +
       	r.With(auth).Post("/follow", s.Follow)

     

       122
       122
       +
       	r.With(auth).Delete("/follow", s.Follow)

     

       123
       123
       +
       

     

       124
       124
       +
       	r.With(auth).Post("/star", s.Star)

     

       125
       125
       +
       	r.With(auth).Delete("/star", s.Star)

     

       126
       126
       +
       

     

       127
       127
       +
       	r.With(auth).Post("/react", s.React)

     

       128
       128
       +
       	r.With(auth).Delete("/react", s.React)

     

       129
       129
       +
       

     

       130
       130
       +
       	r.With(auth).Get("/profile/edit-bio", s.EditBioFragment)

     

       131
       131
       +
       	r.With(auth).Get("/profile/edit-pins", s.EditPinsFragment)

     

       132
       132
       +
       	r.With(auth).Post("/profile/bio", s.UpdateProfileBio)

     

       133
       133
       +
       	r.With(auth).Post("/profile/pins", s.UpdateProfilePins)

     

       134
       134
       +
       

     

       135
       135
       +
       	r.Mount("/settings", s.SettingsRouter())

     

       136
       136
       +
       	r.Mount("/strings", s.StringsRouter(mw))

     

       137
       137
       +
       	r.Mount("/knots", s.KnotsRouter())

     

       138
       138
       +
       	r.Mount("/spindles", s.SpindlesRouter())

     

       139
       139
       +
       	r.Mount("/notifications", s.NotificationsRouter(mw))

     

       140
       140
       +
       

     

       141
       141
       +
       	r.Mount("/signup", s.SignupRouter())

     

       142
       142
       +
       	r.Get("/oauth/client-metadata.json", handler.OauthClientMetadata(oauth))

     

       143
       143
       +
       	r.Get("/oauth/jwks.json", handler.OauthJwks(oauth))

     

       144
       144
       +
       	r.Get("/oauth/callback", oauth.Callback)

     

       145
       145
       +
       

     

       146
       146
       +
       	// special-case handler. should replace with xrpc later

     

       147
       147
       +
       	r.Get("/keys/{user}", s.Keys)

     

       148
       148
       +
       

     

       149
       149
       +
       	r.HandleFunc("/@*", func(w http.ResponseWriter, r *http.Request) {

     

       150
       150
       +
       		http.Redirect(w, r, "/"+chi.URLParam(r, "*"), http.StatusFound)

     

       151
       151
       +
       	})

     

       152
       152
       +
       

     

       153
       153
       +
       	r.Route("/{user}", func(r chi.Router) {

     

       154
       154
       +
       		r.Use(middleware.EnsureDidOrHandle(pages))

     

       155
       155
       +
       		r.Use(middleware.ResolveIdent(idResolver, pages))

     

       156
       156
       +
       

     

       157
       157
       +
       		r.Get("/", s.Profile)

     

       158
       158
       +
       		r.Get("/feed.atom", s.AtomFeedPage)

     

       159
       159
       +
       

     

       160
       160
       +
       		r.Route("/{repo}", func(r chi.Router) {

     

       161
       161
       +
       			r.Use(middleware.ResolveRepo(db, pages))

     

       162
       162
       +
       

     

       163
       163
       +
       			r.Mount("/", s.RepoRouter(mw))

     

       164
       164
       +
       

     

       165
       165
       +
       			// /{user}/{repo}/issues/*

     

       166
       166
       +
       			r.With(middleware.Paginate).Get("/issues", handler.RepoIssues(issue, repo, pages, db))

     

       167
       167
       +
       			r.With(auth).Get("/issues/new", handler.NewIssue(repo, pages))

     

       168
       168
       +
       			r.With(auth).Post("/issues/new", handler.NewIssuePost(issue, pages))

     

       169
       169
       +
       			r.Route("/issues/{issue}", func(r chi.Router) {

     

       170
       170
       +
       				r.Use(middleware.ResolveIssue(db, pages))

     

       171
       171
       +
       

     

       172
       172
       +
       				r.Get("/", handler.Issue(issue, repo, pages))

     

       173
       173
       +
       				r.Get("/opengraph", i.IssueOpenGraphSummary)

     

       174
       174
       +
       

     

       175
       175
       +
       				r.With(auth).Delete("/", handler.IssueDelete(issue, pages))

     

       176
       176
       +
       

     

       177
       177
       +
       				r.With(auth).Get("/edit", handler.IssueEdit(issue, repo, pages))

     

       178
       178
       +
       				r.With(auth).Post("/edit", handler.IssueEditPost(issue, pages))

     

       179
       179
       +
       

     

       180
       180
       +
       				// r.With(auth).Post("/close", handler.CloseIssue(issue))

     

       181
       181
       +
       				// r.With(auth).Post("/reopen", handler.ReopenIssue(issue))

     

       182
       182
       +
       

     

       183
       183
       +
       				r.With(auth).Post("/close", i.CloseIssue)

     

       184
       184
       +
       				r.With(auth).Post("/reopen", i.ReopenIssue)

     

       185
       185
       +
       

     

       186
       186
       +
       				r.With(auth).Post("/comment", i.NewIssueComment)

     

       187
       187
       +
       				r.With(auth).Route("/comment/{commentId}/", func(r chi.Router) {

     

       188
       188
       +
       					r.Get("/", i.IssueComment)

     

       189
       189
       +
       					r.Delete("/", i.DeleteIssueComment)

     

       190
       190
       +
       					r.Get("/edit", i.EditIssueComment)

     

       191
       191
       +
       					r.Post("/edit", i.EditIssueComment)

     

       192
       192
       +
       					r.Get("/reply", i.ReplyIssueComment)

     

       193
       193
       +
       					r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder)

     

       194
       194
       +
       				})

     

       195
       195
       +
       			})

     

       196
       196
       +
       

     

       197
       197
       +
       			r.Mount("/pulls", s.PullsRouter(mw))

     

       198
       198
       +
       			r.Mount("/pipelines", s.PipelinesRouter())

     

       199
       199
       +
       			r.Mount("/labels", s.LabelsRouter())

     

       200
       200
       +
       

     

       201
       201
       +
       			// These routes get proxied to the knot

     

       202
       202
       +
       			r.Get("/info/refs", s.InfoRefs)

     

       203
       203
       +
       			r.Post("/git-upload-pack", s.UploadPack)

     

       204
       204
       +
       			r.Post("/git-receive-pack", s.ReceivePack)

     

       205
       205
       +
       		})

     

       206
       206
       +
       	})

     

       207
       207
       +
       

     

       208
       208
       +
       	r.NotFound(func(w http.ResponseWriter, r *http.Request) {

     

       209
       209
       +
       		pages.Error404(w)

     

       210
       210
       +
       	})

     

       211
       211
       +
       

     

       212
       212
       +
       	return r

     

       213
       213
       +
       }

+2 -1

cmd/appview/main.go

···

       7
       7
        
       

     

       8
       8
        
       	"tangled.org/core/appview/config"

     

       9
       9
        
       	"tangled.org/core/appview/state"

     

       10
       10
       +
       	"tangled.org/core/appview/web"

     

       10
       11
        
       	tlog "tangled.org/core/log"

     

       11
       12
        
       )

     

       12
       13
        
       

     
···

       35
       36
        
       

     

       36
       37
        
       	logger.Info("starting server", "address", c.Core.ListenAddr)

     

       37
       38
        
       

     

       38
       38
       -
       	if err := http.ListenAndServe(c.Core.ListenAddr, state.Router()); err != nil {

     

       39
       39
       +
       	if err := http.ListenAndServe(c.Core.ListenAddr, web.RouterFromState(state)); err != nil {

     

       39
       40
        
       		logger.Error("failed to start appview", "err", err)

     

       40
       41
        
       	}

     

       41
       42
        
       }