Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
oauth-play
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ASM
oauth-play
Commits
b689afb4
Commit
b689afb4
authored
Jan 03, 2018
by
Andreas Åkre Solberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set default clientid
parent
8c0769c8
Pipeline
#5351
passed with stages
in 7 minutes and 12 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
src/components/ServerConfigInput.jsx
src/components/ServerConfigInput.jsx
+5
-3
No files found.
src/components/ServerConfigInput.jsx
View file @
b689afb4
...
...
@@ -26,7 +26,7 @@ class Component extends PureComponent {
// console.log("currentURL", currentURL)
this
.
state
=
{
//
clientId: "6233aedf-f08a-4112-9a1b-f33c3cd9b396",
clientId
:
"
6233aedf-f08a-4112-9a1b-f33c3cd9b396
"
,
// clientSecret: "",
redirectURL
:
currentURL
,
// scopes: "",
...
...
@@ -37,7 +37,7 @@ class Component extends PureComponent {
authenticateStart
()
{
let
config
=
Object
.
assign
({},
this
.
props
.
serverConfig
,
this
.
state
)
// console.error("Authenticate", config, this.props.serverConfig, this.state)
this
.
props
.
authenticateStart
(
config
)
}
...
...
@@ -76,8 +76,10 @@ class Component extends PureComponent {
}
let
clientId
=
''
if
(
this
.
props
.
serverConfig
)
{
if
(
this
.
props
.
serverConfig
&&
this
.
props
.
serverConfig
.
client_id
)
{
clientId
=
this
.
props
.
serverConfig
.
client_id
}
else
if
(
this
.
state
&&
this
.
state
.
clientId
)
{
clientId
=
this
.
state
.
clientId
}
let
clientSecret
=
''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment