LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Fix status code for options requests (#1290)

Browse Source
This commit is contained in:
Yarmo Mackenbach 2021-08-03 19:23:20 +00:00 committed by GitHub
parent a791d9c910
commit cab963f21c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
router/middleware/auth.go
View File

@ -28,9 +28,9 @@ func RequireAdminAuth(handler http.HandlerFunc) http.HandlerFunc {
w.Header().Set("Access-Control-Allow-Credentials", "true") w.Header().Set("Access-Control-Allow-Credentials", "true")
w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization") w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization")
// For request needing CORS, send a 200. // For request needing CORS, send a 204.
if r.Method == "OPTIONS" { if r.Method == "OPTIONS" {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusNoContent)
return return
} }
@ -60,7 +60,7 @@ func RequireExternalAPIAccessToken(scope string, handler ExternalAccessTokenHand
if r.Method == "OPTIONS" { if r.Method == "OPTIONS" {
// All OPTIONS requests should have a wildcard CORS header. // All OPTIONS requests should have a wildcard CORS header.
w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Allow-Origin", "*")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusNoContent)
return return
} }

2
test/automated/integrations.test.js
View File

@ -142,7 +142,7 @@ test('test fetch chat history OPTIONS request', async (done) => {
const res = await request const res = await request
.options('/api/integrations/chat') .options('/api/integrations/chat')
.set('Authorization', 'Bearer ' + accessToken) .set('Authorization', 'Bearer ' + accessToken)
.expect(200); .expect(204);
done(); done();
}); });