serendipty01.dev / tangled-core
forked from tangled.org/core
Monorepo for Tangled — https://tangled.org
fork atom

appview: add logged in user in 404 error pages

Signed-off-by: Shalabh Agarwal <me@serendipty01.dev>

serendipty01.dev 8a433608 ff49c365

verified
+52 -21
+30 -10
appview/issues/issues.go
··· 78 78 issue, ok := r.Context().Value("issue").(*models.Issue) 79 79 if !ok { 80 80 l.Error("failed to get issue") 81 - rp.pages.Error404(w) 81 + rp.pages.Error404(w, pages.ErrorPageParams{ 82 + LoggedInUser: user, 83 + }) 82 84 return 83 85 } 84 86 ··· 132 134 issue, ok := r.Context().Value("issue").(*models.Issue) 133 135 if !ok { 134 136 l.Error("failed to get issue") 135 - rp.pages.Error404(w) 137 + rp.pages.Error404(w, pages.ErrorPageParams{ 138 + LoggedInUser: user, 139 + }) 136 140 return 137 141 } 138 142 ··· 275 279 issue, ok := r.Context().Value("issue").(*models.Issue) 276 280 if !ok { 277 281 l.Error("failed to get issue") 278 - rp.pages.Error404(w) 282 + rp.pages.Error404(w, pages.ErrorPageParams{ 283 + LoggedInUser: user, 284 + }) 279 285 return 280 286 } 281 287 ··· 324 330 issue, ok := r.Context().Value("issue").(*models.Issue) 325 331 if !ok { 326 332 l.Error("failed to get issue") 327 - rp.pages.Error404(w) 333 + rp.pages.Error404(w, pages.ErrorPageParams{ 334 + LoggedInUser: user, 335 + }) 328 336 return 329 337 } 330 338 ··· 368 376 issue, ok := r.Context().Value("issue").(*models.Issue) 369 377 if !ok { 370 378 l.Error("failed to get issue") 371 - rp.pages.Error404(w) 379 + rp.pages.Error404(w, pages.ErrorPageParams{ 380 + LoggedInUser: user, 381 + }) 372 382 return 373 383 } 374 384 ··· 456 466 issue, ok := r.Context().Value("issue").(*models.Issue) 457 467 if !ok { 458 468 l.Error("failed to get issue") 459 - rp.pages.Error404(w) 469 + rp.pages.Error404(w, pages.ErrorPageParams{ 470 + LoggedInUser: user, 471 + }) 460 472 return 461 473 } 462 474 ··· 497 509 issue, ok := r.Context().Value("issue").(*models.Issue) 498 510 if !ok { 499 511 l.Error("failed to get issue") 500 - rp.pages.Error404(w) 512 + rp.pages.Error404(w, pages.ErrorPageParams{ 513 + LoggedInUser: user, 514 + }) 501 515 return 502 516 } 503 517 ··· 601 615 issue, ok := r.Context().Value("issue").(*models.Issue) 602 616 if !ok { 603 617 l.Error("failed to get issue") 604 - rp.pages.Error404(w) 618 + rp.pages.Error404(w, pages.ErrorPageParams{ 619 + LoggedInUser: user, 620 + }) 605 621 return 606 622 } 607 623 ··· 642 658 issue, ok := r.Context().Value("issue").(*models.Issue) 643 659 if !ok { 644 660 l.Error("failed to get issue") 645 - rp.pages.Error404(w) 661 + rp.pages.Error404(w, pages.ErrorPageParams{ 662 + LoggedInUser: user, 663 + }) 646 664 return 647 665 } 648 666 ··· 683 701 issue, ok := r.Context().Value("issue").(*models.Issue) 684 702 if !ok { 685 703 l.Error("failed to get issue") 686 - rp.pages.Error404(w) 704 + rp.pages.Error404(w, pages.ErrorPageParams{ 705 + LoggedInUser: user, 706 + }) 687 707 return 688 708 } 689 709
+1 -1
appview/middleware/middleware.go
··· 191 191 if err != nil { 192 192 // invalid did or handle 193 193 log.Printf("failed to resolve did/handle '%s': %s\n", didOrHandle, err) 194 - mw.pages.Error404(w) 194 + mw.pages.Error404(w, pages.ErrorPageParams{}) 195 195 return 196 196 } 197 197
+2 -2
appview/pages/pages.go
··· 1526 1526 return p.execute("errors/500", w, params) 1527 1527 } 1528 1528 1529 - func (p *Pages) Error404(w io.Writer) error { 1530 - return p.execute("errors/404", w, nil) 1529 + func (p *Pages) Error404(w io.Writer, params ErrorPageParams) error { 1530 + return p.execute("errors/404", w, params) 1531 1531 } 1532 1532 1533 1533 func (p *Pages) ErrorKnot404(w io.Writer) error {
+7 -3
appview/repo/repo.go
··· 353 353 354 354 func (rp *Repo) RepoCommit(w http.ResponseWriter, r *http.Request) { 355 355 l := rp.logger.With("handler", "RepoCommit") 356 + user := rp.oauth.GetUser(r) 356 357 357 358 f, err := rp.repoResolver.Resolve(r) 358 359 if err != nil { ··· 368 369 } 369 370 370 371 if !plumbing.IsHash(ref) { 371 - rp.pages.Error404(w) 372 + rp.pages.Error404(w, pages.ErrorPageParams{ 373 + LoggedInUser: user, 374 + }) 372 375 return 373 376 } 374 377 ··· 406 409 l.Error("failed to GetVerifiedCommits", "err", err) 407 410 } 408 411 409 - user := rp.oauth.GetUser(r) 410 412 repoInfo := f.RepoInfo(user) 411 413 pipelines, err := getPipelineStatuses(rp.db, repoInfo, []string{result.Diff.Commit.This}) 412 414 if err != nil { ··· 2512 2514 2513 2515 if base == "" || head == "" { 2514 2516 l.Error("invalid comparison") 2515 - rp.pages.Error404(w) 2517 + rp.pages.Error404(w, pages.ErrorPageParams{ 2518 + LoggedInUser: user, 2519 + }) 2516 2520 return 2517 2521 } 2518 2522
+5 -2
appview/state/profile.go
··· 398 398 399 399 func (s *State) AtomFeedPage(w http.ResponseWriter, r *http.Request) { 400 400 ident, ok := r.Context().Value("resolvedId").(identity.Identity) 401 + user := s.oauth.GetUser(r) 402 + 401 403 if !ok { 402 - s.pages.Error404(w) 404 + s.pages.Error404(w, pages.ErrorPageParams{ 405 + LoggedInUser: user, 406 + }) 403 407 return 404 408 } 405 - user := s.oauth.GetUser(r) 406 409 407 410 feed, err := s.getProfileFeed(r.Context(), &ident) 408 411 if err != nil {
+3 -2
appview/state/router.go
··· 10 10 "tangled.org/core/appview/labels" 11 11 "tangled.org/core/appview/middleware" 12 12 "tangled.org/core/appview/notifications" 13 + "tangled.org/core/appview/pages" 13 14 "tangled.org/core/appview/pipelines" 14 15 "tangled.org/core/appview/pulls" 15 16 "tangled.org/core/appview/repo" ··· 103 104 }) 104 105 105 106 r.NotFound(func(w http.ResponseWriter, r *http.Request) { 106 - s.pages.Error404(w) 107 + s.pages.Error404(w, pages.ErrorPageParams{}) 107 108 }) 108 109 109 110 return r ··· 174 175 r.Get("/brand", s.Brand) 175 176 176 177 r.NotFound(func(w http.ResponseWriter, r *http.Request) { 177 - s.pages.Error404(w) 178 + s.pages.Error404(w, pages.ErrorPageParams{}) 178 179 }) 179 180 return r 180 181 }
+4 -1
appview/strings/strings.go
··· 88 88 89 89 func (s *Strings) contents(w http.ResponseWriter, r *http.Request) { 90 90 l := s.Logger.With("handler", "contents") 91 + user := s.OAuth.GetUser(r) 91 92 92 93 id, ok := r.Context().Value("resolvedId").(identity.Identity) 93 94 if !ok { ··· 118 119 } 119 120 if len(strings) < 1 { 120 121 l.Error("string not found") 121 - s.Pages.Error404(w) 122 + s.Pages.Error404(w, pages.ErrorPageParams{ 123 + LoggedInUser: user, 124 + }) 122 125 return 123 126 } 124 127 if len(strings) != 1 {