Take control over your live stream video by running it yourself. Streaming + chat out of the box.
HTML activitypubbroadcastingchatdecentralizedfederationfediversegolanghacktoberfesthlslivelivestreamowncastrtmpself-hostedstreaming-videovideo
Let a pending fediverse auth request recover instead of erroring (#4972)
Gabe Kangas5ec96dc8fd9f
diff --git a/webserver/handlers/auth/fediverse/fediverse.go b/webserver/handlers/auth/fediverse/fediverse.goindex 64f0d455dc..7fcd2b2b4a 100644--- a/webserver/handlers/auth/fediverse/fediverse.go+++ b/webserver/handlers/auth/fediverse/fediverse.go@@ -69,8 +69,11 @@ func (h *Handler) RegisterFediverseOTPRequest(u models.User, w http.ResponseWritreturn}+ // A false success with no error means a valid code is already pending for+ // this account. Don't send a second message, but let the user proceed to+ // enter the code they already received instead of dead-ending them.if !success {- webutils.WriteSimpleResponse(w, false, "Could not register auth request. One may already be pending. Try again later.")+ webutils.WriteSimpleResponse(w, true, "")return}diff --git a/webserver/handlers/auth/fediverse/fediverse_test.go b/webserver/handlers/auth/fediverse/fediverse_test.gonew file mode 100644index 0000000000..f11c18ef5d--- /dev/null+++ b/webserver/handlers/auth/fediverse/fediverse_test.go@@ -0,0 +1,53 @@+package fediverse++import (+ "encoding/json"+ "net/http"+ "net/http/httptest"+ "strings"+ "testing"++ fediverseauth "github.com/owncast/owncast/auth/fediverse"+ "github.com/owncast/owncast/models"+)++// When a code is already pending for the same account, RegisterFediverseOTP+// returns success=false with no error (so we don't send a second message).+// The handler must treat that as success and let the client continue to the+// code entry step, rather than dead-ending the user with an error.+func TestRegisterFallsThroughWhenCodeAlreadyPending(t *testing.T) {+ const accessToken = "test-access-token"+ const account = "[email protected]"++ svc := fediverseauth.New()++ // Seed a pending request directly on the service so the handler's own+ // register call hits the duplicate path. Going through the service here+ // (rather than the handler) avoids sending the first OTP message, which+ // the duplicate path under test never reaches anyway.+ if _, ok, err := svc.RegisterFediverseOTP(accessToken, "uid", "display name", account); err != nil || !ok {+ t.Fatalf("seeding a pending request failed: ok=%v err=%v", ok, err)+ }++ // Only FediverseAuth is needed; the duplicate path returns before touching+ // activitypub, chat, or the config repository.+ h := New(Deps{FediverseAuth: svc})++ body := strings.NewReader(`{"account":"` + account + `"}`)+ req := httptest.NewRequest(http.MethodPost, "/api/auth/fediverse?accessToken="+accessToken, body)+ rec := httptest.NewRecorder()++ h.RegisterFediverseOTPRequest(models.User{}, rec, req)++ var resp struct {+ Success bool `json:"success"`+ Message string `json:"message"`+ }+ if err := json.NewDecoder(rec.Body).Decode(&resp); err != nil {+ t.Fatalf("decoding response: %v", err)+ }++ if !resp.Success {+ t.Fatalf("expected success when a code is already pending, got success=false (message=%q)", resp.Message)+ }+}