X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Faccounts%2Fsrc%2Faccount%2FaccountStore.js;h=dee59f23aee1ec9b812c67118b7427d543b6bea5;hb=12e305918188d2eb4f3b2eb33e325a02d3866405;hp=29a15e2afbb71aac83199c65e83b5b5a9e90361a;hpb=9a546bd5bcb6db7488f6a4059a356d8beb9b5b11;p=osm%2FUI.git diff --git a/skyquake/plugins/accounts/src/account/accountStore.js b/skyquake/plugins/accounts/src/account/accountStore.js index 29a15e2af..dee59f23a 100644 --- a/skyquake/plugins/accounts/src/account/accountStore.js +++ b/skyquake/plugins/accounts/src/account/accountStore.js @@ -18,7 +18,7 @@ import AccountActions from './accountActions.js'; import AccountSource from './accountSource.js'; - +var Utils = require('utils/utils.js'); var rw = require('utils/rw.js'); var altImage = rw.getSearchParams(window.location).alt_image; @@ -115,6 +115,14 @@ let AccountMeta = { }, { label: "Authentication URL", ref: 'auth_url' + },{ + label: "User Domain", + ref: 'user-domain', + optional: true + },{ + label: "Project Domain", + ref: 'project-domain', + optional: true }, { label: "Tenant", ref: 'tenant' @@ -252,7 +260,6 @@ export default class AccountStore { openAccountSocketSuccess = (connection) => { let self = this; let ws = window.multiplexer.channel(connection); - if (!connection) return; this.setState({ socket: ws.ws, @@ -261,6 +268,9 @@ export default class AccountStore { ws.onmessage = (socket) => { try { var data = JSON.parse(socket.data); + Utils.checkAuthentication(data.statusCode, function() { + self.closeSocket(); + }); let SdnOptions = [{ label: 'Select an SDN Account', value: false @@ -407,18 +417,3 @@ export default class AccountStore { } } - -/** - *Cloud - * - * {"name":"eng2","account-type":"openstack","openstack":{"key":"lmaultsb","secret":"mypasswd","auth_url":"http://engstack.eng.riftio.com:5000/v3/","tenant":"lmaultsb","mgmt-network":"private"}} -Name -Path - - -SDN - - - * - * - */