Skip to content

Commit c654558

Browse files
Configure end_session_endpoint
1 parent 5dd4109 commit c654558

File tree

6 files changed

+24
-9
lines changed

6 files changed

+24
-9
lines changed

selenium/bin/suite_template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ wait_for_url_docker() {
240240
url=$1
241241
max_retry=10
242242
counter=0
243-
until (docker run --net ${DOCKER_NETWORK} --rm curlimages/curl:7.85.0 -L -f -v $url >/dev/null 2>&1)
243+
until (docker run --net ${DOCKER_NETWORK} --rm curlimages/curl:7.85.0 -k -L -f -v $url >/dev/null 2>&1)
244244
do
245245
print "Waiting for $url to start (docker)"
246246
sleep 5

selenium/fakeportal/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ app.get('/', function(req, res){
3434
app.get('/favicon.ico', (req, res) => res.status(204));
3535

3636
app.get('/logout', function(req, res) {
37+
console.debug("Received /logout request")
3738
res.redirect( uaa_url + '/logout.do?redirect=' + req.protocol + '://' + req.get('host') + "/");
3839
})
3940

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
management.oauth_provider_url = ${FAKEPORTAL_URL}
2+
3+
auth_oauth2.end_session_endpoint = ${FAKEPORTAL_URL}/logout

selenium/test/oauth/uaa/uaa.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ oauth:
125125
id: admin
126126
secret: adminsecret
127127
authorized-grant-types: client_credentials
128-
scope: none
129-
authorities: uaa.admin,clients.admin,clients.read,clients.write,clients.secret,scim.write,scim.read,uaa.resource
128+
scope: uaa.admin,clients.admin,clients.read,clients.write,clients.secret,scim.write,scim.read,uaa.resource,tokens.list
129+
authorities: uaa.admin,clients.admin,clients.read,clients.write,clients.secret,scim.write,scim.read,uaa.resource,tokens.list
130+
allowpublic: true
130131
mgt_api_client:
131132
id: mgt_api_client
132133
secret: mgt_api_client

selenium/test/oauth/with-idp-initiated/logout.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const { By, Key, until, Builder } = require('selenium-webdriver')
22
require('chromedriver')
3-
const assert = require('assert')
4-
const { buildDriver, goToLogin, tokenFor, captureScreensFor, teardown } = require('../../utils')
3+
const { buildDriver, captureScreensFor, teardown } = require('../../utils')
54

65
const OverviewPage = require('../../pageobjects/OverviewPage')
76
const FakePortalPage = require('../../pageobjects/FakePortalPage')
@@ -27,7 +26,7 @@ describe('When a logged in user', function () {
2726

2827
it('logs out', async function () {
2928
await overview.logout()
30-
await fakePortal.isLoaded()
29+
await fakePortal.isLoaded()
3130
})
3231

3332
after(async function () {

selenium/test/utils.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,20 @@ module.exports = {
128128
req.send()
129129
if (req.status == 200) return JSON.parse(req.responseText)
130130
else {
131-
console.error(req.responseText)
131+
console.error(JSON.stringify(req.statusText) + ", " + req.responseText)
132+
throw new Error(req.responseText)
133+
}
134+
},
135+
136+
rest_get: (url, access_token) => {
137+
const req = new XMLHttpRequest()
138+
req.open('GET', url, false)
139+
req.setRequestHeader('Accept', 'application/json')
140+
req.setRequestHeader('Authorization', 'Bearer ' + access_token)
141+
req.send()
142+
if (req.status == 200) return JSON.parse(req.responseText)
143+
else {
144+
console.error(JSON.stringify(req.statusText) + ", " + req.responseText)
132145
throw new Error(req.responseText)
133146
}
134147
},
@@ -140,14 +153,13 @@ module.exports = {
140153
'&grant_type=client_credentials' +
141154
'&token_format=jwt' +
142155
'&response_type=token'
143-
144156
req.open('POST', url, false)
145157
req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded')
146158
req.setRequestHeader('Accept', 'application/json')
147159
req.send(params)
148160
if (req.status == 200) return JSON.parse(req.responseText).access_token
149161
else {
150-
console.error(req.responseText)
162+
console.error(JSON.stringify(req.statusText) + ", " + req.responseText)
151163
throw new Error(req.responseText)
152164
}
153165
},

0 commit comments

Comments
 (0)