Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
go-sso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
id
go-sso
Commits
d602e3ad
Commit
d602e3ad
authored
7 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Use the right URL for /sso_logout in the logout JS code
parent
c49e8adf
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
server/bindata.go
+4
-5
4 additions, 5 deletions
server/bindata.go
server/static/js/logout.js
+1
-2
1 addition, 2 deletions
server/static/js/logout.js
server/templates/page.html
+1
-1
1 addition, 1 deletion
server/templates/page.html
with
6 additions
and
8 deletions
server/bindata.go
+
4
−
5
View file @
d602e3ad
...
...
@@ -202,11 +202,10 @@ idlogout.get_services = function() {
};
idlogout.logout_service = function(idx, service) {
var logout_url = service.url + 'sso_logout';
console.log('logging out of ' + service.name);
$.ajax({
type: 'GET',
url:
logout_
url,
url:
service.
url,
contentType: 'text/plain',
xhrFields: {
withCredentials: true
...
...
@@ -245,7 +244,7 @@ func staticJsLogoutJs() (*asset, error) {
return
nil
,
err
}
info
:=
bindataFileInfo
{
name
:
"static/js/logout.js"
,
size
:
105
3
,
mode
:
os
.
FileMode
(
436
),
modTime
:
time
.
Unix
(
151896
3941
,
0
)}
info
:=
bindataFileInfo
{
name
:
"static/js/logout.js"
,
size
:
10
0
5
,
mode
:
os
.
FileMode
(
436
),
modTime
:
time
.
Unix
(
151896
4676
,
0
)}
a
:=
&
asset
{
bytes
:
bytes
,
info
:
info
}
return
a
,
nil
}
...
...
@@ -1351,7 +1350,7 @@ var _templatesPageHtml = []byte(`{{define "header"}}<!DOCTYPE html>
<script type="text/javascript" src="/static/js/u2f.js" integrity="sha384-vd6lytRvVm189G5gr34wlOvN672vVBceTZqV+lTSeec0DBLc0GlWLyKDHc6mrIZS"></script>
{{end}}
{{if .IncludeLogoutScripts}}
<script type="text/javascript" src="/static/js/logout.js" integrity="sha384-l
FECzouyNyktRdo1mjFpvlIWeKfD3FMASOF5o3AnPqFY1Bmiwpx7qfTSLCmNL8Aj
"></script>
<script type="text/javascript" src="/static/js/logout.js" integrity="sha384-l
ChVngGLNFXetIJTSxc+scDpi1vsBL+7Xa4r2uZpQFP/6Y2z9eCDXe/Y4IUdklRD
"></script>
{{end}}
</body>
</html>
...
...
@@ -1368,7 +1367,7 @@ func templatesPageHtml() (*asset, error) {
return
nil
,
err
}
info
:=
bindataFileInfo
{
name
:
"templates/page.html"
,
size
:
1686
,
mode
:
os
.
FileMode
(
436
),
modTime
:
time
.
Unix
(
151896
39
80
,
0
)}
info
:=
bindataFileInfo
{
name
:
"templates/page.html"
,
size
:
1686
,
mode
:
os
.
FileMode
(
436
),
modTime
:
time
.
Unix
(
151896
46
80
,
0
)}
a
:=
&
asset
{
bytes
:
bytes
,
info
:
info
}
return
a
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
server/static/js/logout.js
+
1
−
2
View file @
d602e3ad
...
...
@@ -5,11 +5,10 @@ idlogout.get_services = function() {
};
idlogout
.
logout_service
=
function
(
idx
,
service
)
{
var
logout_url
=
service
.
url
+
'
sso_logout
'
;
console
.
log
(
'
logging out of
'
+
service
.
name
);
$
.
ajax
({
type
:
'
GET
'
,
url
:
logout_
url
,
url
:
service
.
url
,
contentType
:
'
text/plain
'
,
xhrFields
:
{
withCredentials
:
true
...
...
This diff is collapsed.
Click to expand it.
server/templates/page.html
+
1
−
1
View file @
d602e3ad
...
...
@@ -24,7 +24,7 @@
<script
type=
"text/javascript"
src=
"/static/js/u2f.js"
integrity=
"sha384-vd6lytRvVm189G5gr34wlOvN672vVBceTZqV+lTSeec0DBLc0GlWLyKDHc6mrIZS"
></script>
{{end}}
{{if .IncludeLogoutScripts}}
<script
type=
"text/javascript"
src=
"/static/js/logout.js"
integrity=
"sha384-l
FECzouyNyktRdo1mjFpvlIWeKfD3FMASOF5o3AnPqFY1Bmiwpx7qfTSLCmNL8Aj
"
></script>
<script
type=
"text/javascript"
src=
"/static/js/logout.js"
integrity=
"sha384-l
ChVngGLNFXetIJTSxc+scDpi1vsBL+7Xa4r2uZpQFP/6Y2z9eCDXe/Y4IUdklRD
"
></script>
{{end}}
</body>
</html>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment