fix(OpenIDConnect): Stop storing tokens in sessionStorage. Prefix OIDC routes automatically. Add logout button (#698)

This commit is contained in:
Erik Ziegler authored and GitHub committed 2019-07-21 16:43:42 +02:00
1 parent ac347849d0
commit f547fdf832
21 files changed
+143 -74

No files matched your search

+1 -3
View File
@@ -5,11 +5,9 @@ const isActive = a => a.active === true;
const mapStateToProps = state => {
const activeServer = state.servers.servers.find(isActive);
const { authority, client_id } = window.config.oidc[0];
const oidcStorageKey = `oidc.user:${authority}:${client_id}`;
return {
oidcStorageKey,
user: state.oidc && state.oidc.user,
url: activeServer && activeServer.qidoRoot,
};
};
+2 -2
View File
@@ -15,11 +15,11 @@ export default class DatasetPicker extends Component {
project: PropTypes.object,
location: PropTypes.object,
onSelect: PropTypes.func,
oidcKey: PropTypes.string,
accessToken: PropTypes.string,
};
async componentDidMount() {
api.setOidcStorageKey(this.props.oidcKey);
api.setAccessToken(this.props.accessToken);
const response = await api.loadDatasets(
this.props.project.projectId,
+7 -5
View File
@@ -19,7 +19,7 @@ class DatasetSelector extends Component {
static propTypes = {
id: PropTypes.string,
event: PropTypes.string,
oidcKey: PropTypes.string,
user: PropTypes.object,
canClose: PropTypes.string,
setServers: PropTypes.func.isRequired,
};
@@ -79,6 +79,8 @@ class DatasetSelector extends Component {
};
render() {
const accessToken = this.props.user.access_token;
const { project, location, dataset } = this.state;
const {
onProjectClick,
@@ -121,21 +123,21 @@ class DatasetSelector extends Component {
{projectBreadcrumbs}
{!project && (
<ProjectPicker
oidcKey={this.props.oidcKey}
accessToken={accessToken}
onSelect={onProjectSelect}
/>
)}
{project && !location && (
<LocationPicker
oidcKey={this.props.oidcKey}
accessToken={accessToken}
project={project}
onSelect={onLocationSelect}
/>
)}
{project && location && !dataset && (
<DatasetPicker
oidcKey={this.props.oidcKey}
accessToken={accessToken}
project={project}
location={location}
onSelect={onDatasetSelect}
@@ -143,7 +145,7 @@ class DatasetSelector extends Component {
)}
{project && location && dataset && (
<DicomStorePicker
oidcKey={this.props.oidcKey}
accessToken={accessToken}
dataset={dataset}
onSelect={onDicomStoreSelect}
/>
+3 -3
View File
@@ -15,12 +15,12 @@ export default class DicomStorePicker extends Component {
static propTypes = {
dataset: PropTypes.object,
onSelect: PropTypes.func,
accessToken: PropTypes.string.isRequired
};
async componentDidMount() {
const { authority, client_id } = window.config.oidc[0];
const oidcStorageKey = `oidc.user:${authority}:${client_id}`;
api.setOidcStorageKey(oidcStorageKey);
api.setAccessToken(this.props.accessToken);
const response = await api.loadDicomStores(this.props.dataset.name);
if (response.isError) {
+2 -2
View File
@@ -8,7 +8,7 @@ import { withTranslation } from 'react-i18next';
class DicomStorePickerModal extends Component {
static propTypes = {
url: PropTypes.string,
oidcStorageKey: PropTypes.string.isRequired,
user: PropTypes.object.isRequired,
setServers: PropTypes.func.isRequired,
isOpen: PropTypes.bool.isRequired,
onClose: PropTypes.func,
@@ -55,7 +55,7 @@ class DicomStorePickerModal extends Component {
<Modal.Body>
<DatasetSelector
setServers={this.handleEvent}
oidcKey={this.props.oidcStorageKey}
user={this.props.user}
url={this.props.url}
/>
</Modal.Body>
+2 -2
View File
@@ -14,11 +14,11 @@ export default class LocationPicker extends Component {
static propTypes = {
project: PropTypes.object,
onSelect: PropTypes.func,
oidcKey: PropTypes.string,
accessToken: PropTypes.string,
};
async componentDidMount() {
api.setOidcStorageKey(this.props.oidcKey);
api.setAccessToken(this.props.accessToken);
const response = await api.loadLocations(this.props.project.projectId);
+2 -2
View File
@@ -13,11 +13,11 @@ export default class ProjectPicker extends Component {
static propTypes = {
onSelect: PropTypes.func,
oidcKey: PropTypes.string,
accessToken: PropTypes.string,
};
async componentDidMount() {
api.setOidcStorageKey(this.props.oidcKey);
api.setAccessToken(this.props.accessToken);
const response = await api.loadProjects();
if (response.isError) {
+5 -9
View File
@@ -1,19 +1,15 @@
import { getOidcToken } from '../utils/helpers';
class GoogleCloudApi {
setOidcStorageKey(oidcStorageKey) {
if (!oidcStorageKey) console.error('OIDC storage key is empty');
this.oidcStorageKey = oidcStorageKey;
setAccessToken(accessToken) {
if (!accessToken) console.error('Access token is empty');
this.accessToken = accessToken;
}
get fetchConfig() {
if (!this.oidcStorageKey) throw new Error('OIDC storage key is not set');
const accessToken = getOidcToken(this.oidcStorageKey);
if (!accessToken) throw new Error('OIDC access_token is not set');
if (!this.accessToken) throw new Error('OIDC access_token is not set');
return {
method: 'GET',
headers: {
Authorization: 'Bearer ' + accessToken,
Authorization: 'Bearer ' + this.accessToken,
},
};
}