Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

setup cors for redirects under iap #688

Merged
merged 11 commits into from
Jul 20, 2018
Merged

setup cors for redirects under iap #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
284d376
setup cors for redirects under iap
Jun 20, 2018
2e876b4
/wip
Jun 20, 2018
f4f1b9a
added x-goog email header to backend and cors to frontend
Jun 23, 2018
b6c16a9
Merge remote-tracking branch 'upstream/master' into tfjobs_iap
Jun 24, 2018
2b97c74
add cors to tfjobs create so the credentials are included
Jun 24, 2018
9a50641
fix for myheaders.append
Jun 24, 2018
3f28012
double parans on addheaders
Jun 24, 2018
3a5b254
error on myheaders.append
Jun 24, 2018
1b33543
use set instead of append
Jun 24, 2018
e368628
use cors for all fetch calls
Jun 29, 2018
6f91650
Merge remote-tracking branch 'upstream/master' into tfjobs_iap
Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dashboard/backend/handler/api_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ func CreateHTTPAPIHandler(client client.ClientManager) (http.Handler, error) {
wsContainer.EnableContentEncoding(true)

cors := restful.CrossOriginResourceSharing{
ExposeHeaders: []string{"X-My-Header"},
ExposeHeaders: []string{"x-goog-authenticated-user-email"},
AllowedHeaders: []string{"Content-Type", "Accept"},
AllowedMethods: []string{"GET", "POST", "DELETE"},
CookiesAllowed: false,
CookiesAllowed: true,
Container: wsContainer,
}
wsContainer.Filter(cors.Filter)
Expand Down
46 changes: 42 additions & 4 deletions dashboard/frontend/src/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@ import { getHost } from "./utils";
const host = getHost();

export function getTFJobListService(namespace) {
return fetch(`${host}/api/tfjob/${namespace}`).then(r => r.json());
return fetch(`${host}/api/tfjob/${namespace}`, {
method: "GET",
mode: "cors",
headers: {
"Content-Type": "application/json"
},
credentials: "include",
redirect: "follow"
}).then(r => r.json());
}

export function createTFJobService(spec) {
let myHeaders = new Headers();
myHeaders.append("Content-Type", "application/json");
myHeaders.set("mode", "cors");
myHeaders.set("credentials", "include");
myHeaders.set("redirect", "follow");
const options = {
method: "POST",
headers: myHeaders,
Expand All @@ -19,12 +30,23 @@ export function createTFJobService(spec) {
}

export function getTFJobService(namespace, name) {
return fetch(`${host}/api/tfjob/${namespace}/${name}`).then(r => r.json());
return fetch(`${host}/api/tfjob/${namespace}/${name}`, {
method: "GET",
mode: "cors",
headers: {
"Content-Type": "application/json"
},
credentials: "include",
redirect: "follow"
}).then(r => r.json());
}

export function deleteTFJob(namespace, name) {
let myHeaders = new Headers();
myHeaders.append("Content-Type", "application/json");
myHeaders.set("mode", "cors");
myHeaders.set("credentials", "include");
myHeaders.set("redirect", "follow");
const options = {
method: "DELETE",
headers: myHeaders
Expand All @@ -36,9 +58,25 @@ export function deleteTFJob(namespace, name) {
}

export function getPodLogs(namespace, name) {
return fetch(`${host}/api/logs/${namespace}/${name}`).then(r => r.json());
return fetch(`${host}/api/logs/${namespace}/${name}`, {
method: "GET",
mode: "cors",
headers: {
"Content-Type": "application/json"
},
credentials: "include",
redirect: "follow"
}).then(r => r.json());
}

export function getNamespaces() {
return fetch(`${host}/api/namespace`).then(r => r.json());
return fetch(`${host}/api/namespace`, {
method: "GET",
mode: "cors",
headers: {
"Content-Type": "application/json"
},
credentials: "include",
redirect: "follow"
}).then(r => r.json());
}