External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 02:19:58 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1343 from jakemcdermott/oauth_n_session

Browse Source 
ui tooling fixes / updates for oauth changes
This commit is contained in:
Jake McDermott 2018-02-26 10:42:04 -05:00 committed by GitHub
commit 350f25c6e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/build/webpack.watch.js
View File

@ -52,7 +52,7 @@ const watch = {
publicPath: '/static/',
host: '127.0.0.1',
port: 3000,
https: true
https: true,
proxy: {
'/': {
target: TARGET,

33
awx/ui/test/e2e/api.js
View File

@ -8,15 +8,17 @@ import {
AWX_E2E_PASSWORD
} from './settings';
let authenticated;
const session = axios.create({
baseURL: AWX_E2E_URL,
xsrfHeaderName: 'X-CSRFToken',
xsrfCookieName: 'csrftoken',
httpsAgent: new https.Agent({
rejectUnauthorized: false
})
}),
auth: {
username: AWX_E2E_USERNAME,
password: AWX_E2E_PASSWORD
}
});
const getEndpoint = location => {
@ -27,36 +29,15 @@ const getEndpoint = location => {
return `${AWX_E2E_URL}/api/v2${location}`;
};
const authenticate = () => {
if (authenticated) {
return Promise.resolve();
}
const uri = getEndpoint('/authtoken/');
const credentials = {
username: AWX_E2E_USERNAME,
password: AWX_E2E_PASSWORD
};
return session.post(uri, credentials).then(res => {
session.defaults.headers.Authorization = `Token ${res.data.token}`;
authenticated = true;
return res;
});
};
const request = (method, location, data) => {
const uri = getEndpoint(location);
const action = session[method.toLowerCase()];
return authenticate()
.then(() => action(uri, data))
return action(uri, data)
.then(res => {
console.log([ // eslint-disable-line no-console
res.config.method.toUpperCase(),
uri,
res.config.url,
res.status,
res.statusText
].join(' '));