Commit b689afb4 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg

Set default clientid

parent 8c0769c8
Pipeline #5351 passed with stages
in 7 minutes and 12 seconds
...@@ -26,7 +26,7 @@ class Component extends PureComponent { ...@@ -26,7 +26,7 @@ class Component extends PureComponent {
// console.log("currentURL", currentURL) // console.log("currentURL", currentURL)
this.state = { this.state = {
// clientId: "6233aedf-f08a-4112-9a1b-f33c3cd9b396", clientId: "6233aedf-f08a-4112-9a1b-f33c3cd9b396",
// clientSecret: "", // clientSecret: "",
redirectURL: currentURL, redirectURL: currentURL,
// scopes: "", // scopes: "",
...@@ -37,7 +37,7 @@ class Component extends PureComponent { ...@@ -37,7 +37,7 @@ class Component extends PureComponent {
authenticateStart() { authenticateStart() {
let config = Object.assign({}, this.props.serverConfig, this.state) let config = Object.assign({}, this.props.serverConfig, this.state)
// console.error("Authenticate", config, this.props.serverConfig, this.state)
this.props.authenticateStart(config) this.props.authenticateStart(config)
} }
...@@ -76,8 +76,10 @@ class Component extends PureComponent { ...@@ -76,8 +76,10 @@ class Component extends PureComponent {
} }
let clientId = '' let clientId = ''
if (this.props.serverConfig) { if (this.props.serverConfig && this.props.serverConfig.client_id) {
clientId = this.props.serverConfig.client_id clientId = this.props.serverConfig.client_id
} else if (this.state && this.state.clientId) {
clientId = this.state.clientId
} }
let clientSecret = '' let clientSecret = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment