appview/oauth: handle failed login with error code #717

···

       
4
       
 
       
	"bytes"

     

       
5
       
 
       
	"context"

     

       
6
       
 
       
	"encoding/json"

     

       
0
       
 
       

     

       
7
       
 
       
	"fmt"

     

       
8
       
 
       
	"net/http"

     

       
9
       
 
       
	"slices"

     

       
10
       
 
       
	"time"

     

       
11
       
 
       


     

       
0
       
 
       

     

       
12
       
 
       
	"github.com/go-chi/chi/v5"

     

       
13
       
 
       
	"github.com/lestrrat-go/jwx/v2/jwk"

     

       
14
       
 
       
	"github.com/posthog/posthog-go"

     
···

       
58
       
 
       


     

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

     

       
60
       
 
       
	ctx := r.Context()

     

       
0
       
 
       

     

       
61
       
 
       


     

       
62
       
 
       
	sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query())

     

       
63
       
 
       
	if err != nil {

     

       
64
       
-
       
		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
65
       
 
       
		return

     

       
66
       
 
       
	}

     

       
67
       
 
       


     

       
68
       
 
       
	if err := o.SaveSession(w, r, sessData); err != nil {

     

       
69
       
-
       
		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       
0
       
 
       

     

       
70
       
 
       
		return

     

       
71
       
 
       
	}

     

       
72
       
 
       


     

···

       
4
       
 
       
	"bytes"

     

       
5
       
 
       
	"context"

     

       
6
       
 
       
	"encoding/json"

     

       
7
       
+
       
	"errors"

     

       
8
       
 
       
	"fmt"

     

       
9
       
 
       
	"net/http"

     

       
10
       
 
       
	"slices"

     

       
11
       
 
       
	"time"

     

       
12
       
 
       


     

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

     

       
14
       
 
       
	"github.com/go-chi/chi/v5"

     

       
15
       
 
       
	"github.com/lestrrat-go/jwx/v2/jwk"

     

       
16
       
 
       
	"github.com/posthog/posthog-go"

     
···

       
60
       
 
       


     

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

     

       
62
       
 
       
	ctx := r.Context()

     

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

     

       
64
       
 
       


     

       
65
       
 
       
	sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query())

     

       
66
       
 
       
	if err != nil {

     

       
67
       
+
       
		var callbackErr *oauth.AuthRequestCallbackError

     

       
68
       
+
       
		if errors.As(err, &callbackErr) {

     

       
69
       
+
       
			l.Debug("callback error", "err", callbackErr)

     

       
70
       
+
       
			http.Redirect(w, r, fmt.Sprintf("/login?error=%s", callbackErr.ErrorCode), http.StatusFound)

     

       
71
       
+
       
			return

     

       
72
       
+
       
		}

     

       
73
       
+
       
		l.Error("failed to process callback", "err", err)

     

       
74
       
+
       
		http.Redirect(w, r, "/login?error=oauth", http.StatusFound)

     

       
75
       
 
       
		return

     

       
76
       
 
       
	}

     

       
77
       
 
       


     

       
78
       
 
       
	if err := o.SaveSession(w, r, sessData); err != nil {

     

       
79
       
+
       
		l.Error("failed to save session", "data", sessData, "err", err)

     

       
80
       
+
       
		http.Redirect(w, r, "/login?error=session", http.StatusFound)

     

       
81
       
 
       
		return

     

       
82
       
 
       
	}

     

       
83
       
 
       


     

···

       
220
       
 
       
}

     

       
221
       
 
       


     

       
222
       
 
       
type LoginParams struct {

     

       
223
       
-
       
	ReturnUrl string

     

       
0
       
 
       

     

       
224
       
 
       
}

     

       
225
       
 
       


     

       
226
       
 
       
func (p *Pages) Login(w io.Writer, params LoginParams) error {

     

···

       
220
       
 
       
}

     

       
221
       
 
       


     

       
222
       
 
       
type LoginParams struct {

     

       
223
       
+
       
	ReturnUrl  string

     

       
224
       
+
       
	ErrorCode  string

     

       
225
       
 
       
}

     

       
226
       
 
       


     

       
227
       
 
       
func (p *Pages) Login(w io.Writer, params LoginParams) error {

     

···

       
13
       
 
       
            <title>login &middot; tangled</title>

     

       
14
       
 
       
        </head>

     

       
15
       
 
       
        <body class="flex items-center justify-center min-h-screen">

     

       
16
       
-
       
            <main class="max-w-md px-6 -mt-4">

     

       
17
       
 
       
                <h1 class="flex place-content-center text-3xl font-semibold italic dark:text-white" >

     

       
18
       
 
       
                  {{ template "fragments/logotype" }}

     

       
19
       
 
       
                </h1>

     
···

       
21
       
 
       
                    tightly-knit social coding.

     

       
22
       
 
       
                </h2>

     

       
23
       
 
       
                <form

     

       
24
       
-
       
                    class="mt-4 max-w-sm mx-auto"

     

       
25
       
 
       
                    hx-post="/login"

     

       
26
       
 
       
                    hx-swap="none"

     

       
27
       
 
       
                    hx-disabled-elt="#login-button"

     
···

       
56
       
 
       
                        <span>login</span>

     

       
57
       
 
       
                    </button>

     

       
58
       
 
       
                </form>

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
59
       
 
       
                <p class="text-sm text-gray-500">

     

       
60
       
 
       
                  Don't have an account? <a href="/signup" class="underline">Create an account</a> on Tangled now!

     

       
61
       
 
       
                </p>

     

···

       
13
       
 
       
            <title>login &middot; tangled</title>

     

       
14
       
 
       
        </head>

     

       
15
       
 
       
        <body class="flex items-center justify-center min-h-screen">

     

       
16
       
+
       
            <main class="max-w-md px-7 mt-4">

     

       
17
       
 
       
                <h1 class="flex place-content-center text-3xl font-semibold italic dark:text-white" >

     

       
18
       
 
       
                  {{ template "fragments/logotype" }}

     

       
19
       
 
       
                </h1>

     
···

       
21
       
 
       
                    tightly-knit social coding.

     

       
22
       
 
       
                </h2>

     

       
23
       
 
       
                <form

     

       
24
       
+
       
                    class="mt-4"

     

       
25
       
 
       
                    hx-post="/login"

     

       
26
       
 
       
                    hx-swap="none"

     

       
27
       
 
       
                    hx-disabled-elt="#login-button"

     
···

       
56
       
 
       
                        <span>login</span>

     

       
57
       
 
       
                    </button>

     

       
58
       
 
       
                </form>

     

       
59
       
+
       
                {{ if .ErrorCode }}

     

       
60
       
+
       
                <div class="flex gap-2 my-2 bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-3 py-2 text-red-500 dark:text-red-300">

     

       
61
       
+
       
                    <span class="py-1">{{ i "circle-alert" "w-4 h-4" }}</span>

     

       
62
       
+
       
                    <div>

     

       
63
       
+
       
                        <h5 class="font-medium">Login error</h5>

     

       
64
       
+
       
                        <p class="text-sm">

     

       
65
       
+
       
                        {{ if eq .ErrorCode "access_denied" }}

     

       
66
       
+
       
                        You have not authorized the app. Please try again

     

       
67
       
+
       
                        {{ else if eq .ErrorCode "session" }}

     

       
68
       
+
       
                        Server failed to create user session. Please try again

     

       
69
       
+
       
                        {{ else }}

     

       
70
       
+
       
                        Internal Server error. Please try again

     

       
71
       
+
       
                        </p>

     

       
72
       
+
       
                        {{ end }}

     

       
73
       
+
       
                    </div>

     

       
74
       
+
       
                </div>

     

       
75
       
+
       
                {{ end }}

     

       
76
       
 
       
                <p class="text-sm text-gray-500">

     

       
77
       
 
       
                  Don't have an account? <a href="/signup" class="underline">Create an account</a> on Tangled now!

     

       
78
       
 
       
                </p>

     

···

       
14
       
 
       
	switch r.Method {

     

       
15
       
 
       
	case http.MethodGet:

     

       
16
       
 
       
		returnURL := r.URL.Query().Get("return_url")

     

       
0
       
 
       

     

       
17
       
 
       
		s.pages.Login(w, pages.LoginParams{

     

       
18
       
 
       
			ReturnUrl: returnURL,

     

       
0
       
 
       

     

       
19
       
 
       
		})

     

       
20
       
 
       
	case http.MethodPost:

     

       
21
       
 
       
		handle := r.FormValue("handle")

     

···

       
14
       
 
       
	switch r.Method {

     

       
15
       
 
       
	case http.MethodGet:

     

       
16
       
 
       
		returnURL := r.URL.Query().Get("return_url")

     

       
17
       
+
       
		errorCode := r.URL.Query().Get("error")

     

       
18
       
 
       
		s.pages.Login(w, pages.LoginParams{

     

       
19
       
 
       
			ReturnUrl: returnURL,

     

       
20
       
+
       
			ErrorCode: errorCode,

     

       
21
       
 
       
		})

     

       
22
       
 
       
	case http.MethodPost:

     

       
23
       
 
       
		handle := r.FormValue("handle")