Skip to content
Snippets Groups Projects
Commit 2ae0266a authored by vkovtun's avatar vkovtun
Browse files

SSDM-13579: Reusing session token instead of doing login.

parent bf75accd
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -77,14 +77,16 @@ class DatabaseComponent extends React.PureComponent { ...@@ -77,14 +77,16 @@ class DatabaseComponent extends React.PureComponent {
logger.log(logger.DEBUG, 'DatabaseComponent.render') logger.log(logger.DEBUG, 'DatabaseComponent.render')
const { object } = this.props const { object } = this.props
return ( return this.state.showDataBrowser ? (
this.state.showDataBrowser <DataBrowser
? id={object.id}
<DataBrowser id={object.id} viewType='list'/> viewType='list'
: sessionTokenProvider={() => AppController.getInstance().getSessionToken()}
<Container> />
<pre>{JSON.stringify(this.state.json || {}, null, 2)}</pre> ) : (
</Container> <Container>
<pre>{JSON.stringify(this.state.json || {}, null, 2)}</pre>
</Container>
) )
} }
} }
......
...@@ -91,26 +91,25 @@ class DataBrowser extends React.Component { ...@@ -91,26 +91,25 @@ class DataBrowser extends React.Component {
super(props, context) super(props, context)
autoBind(this) autoBind(this)
this.controller = this.props.controller || new DataBrowserController() const { sessionTokenProvider, controller } = this.props
this.controller = controller || new DataBrowserController()
this.controller.attach(this) this.controller.attach(this)
this.datastoreServer = new DataStoreServer( this.datastoreServer = new DataStoreServer(
'http://localhost:8085', 'http://localhost:8085',
HTTP_SERVER_URI HTTP_SERVER_URI
) )
this.controller.useSessionToken(sessionTokenProvider)
this.state = { this.state = {
viewType: null, viewType: props.viewType,
files: [], files: [],
selectedFile: null, selectedFile: null,
multiselectedFiles: new Set([]), multiselectedFiles: new Set([]),
showInfo: false, showInfo: false,
path: '/' path: '/'
} }
// Login for all subsequent requests
this.controller.login().then(() => {
this.setState({ viewType: props.viewType })
})
} }
handleViewTypeChange(viewType) { handleViewTypeChange(viewType) {
this.setState({ viewType }) this.setState({ viewType })
......
...@@ -41,6 +41,10 @@ export default class DataBrowserController extends ComponentController { ...@@ -41,6 +41,10 @@ export default class DataBrowserController extends ComponentController {
}) })
} }
useSessionToken(sessionTokenProvider) {
this.component.datastoreServer.useSession(sessionTokenProvider())
}
async listFiles() { async listFiles() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.component.datastoreServer.list(this.owner, this.path, true, (data) => { this.component.datastoreServer.list(this.owner, this.path, true, (data) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment