Browse Source

Fix status code for options requests (#1290)

pull/1307/head
Yarmo Mackenbach 4 years ago committed by GitHub
parent
commit
cab963f21c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      router/middleware/auth.go
  2. 2
      test/automated/integrations.test.js

6
router/middleware/auth.go

@ -28,9 +28,9 @@ func RequireAdminAuth(handler http.HandlerFunc) http.HandlerFunc { @@ -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-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" {
w.WriteHeader(http.StatusOK)
w.WriteHeader(http.StatusNoContent)
return
}
@ -60,7 +60,7 @@ func RequireExternalAPIAccessToken(scope string, handler ExternalAccessTokenHand @@ -60,7 +60,7 @@ func RequireExternalAPIAccessToken(scope string, handler ExternalAccessTokenHand
if r.Method == "OPTIONS" {
// All OPTIONS requests should have a wildcard CORS header.
w.Header().Set("Access-Control-Allow-Origin", "*")
w.WriteHeader(http.StatusOK)
w.WriteHeader(http.StatusNoContent)
return
}

2
test/automated/integrations.test.js

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

Loading…
Cancel
Save