You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2018/07/27 13:32:08 UTC

[sling-whiteboard] branch master updated: compute auth header in one go

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 83049ff  compute auth header in one go
83049ff is described below

commit 83049ff6787e1971f542ad1906773ecf395c7e29
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jul 27 15:31:57 2018 +0200

    compute auth header in one go
---
 .../test/java/sling/postservlet/createcontent/basic-auth-header.js  | 5 +++++
 .../src/test/java/sling/postservlet/createcontent/basic-auth.js     | 6 ------
 .../test/java/sling/postservlet/createcontent/createContent.feature | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth-header.js b/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth-header.js
new file mode 100644
index 0000000..a1b93f6
--- /dev/null
+++ b/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth-header.js
@@ -0,0 +1,5 @@
+function(creds) {
+  var temp = creds.username + ':' + creds.password;
+  var encoded = Java.type('java.util.Base64').getEncoder().encodeToString(temp.bytes);
+  return { 'Authorization' : 'Basic ' + encoded }
+}
diff --git a/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth.js b/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth.js
deleted file mode 100644
index 271725a..0000000
--- a/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/basic-auth.js
+++ /dev/null
@@ -1,6 +0,0 @@
-function(creds) {
-  var temp = creds.username + ':' + creds.password;
-  var Base64 = Java.type('java.util.Base64');
-  var encoded = Base64.getEncoder().encodeToString(temp.bytes);
-  return 'Basic ' + encoded;
-}
diff --git a/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/createContent.feature b/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/createContent.feature
index 6fe89a6..97bb063 100644
--- a/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/createContent.feature
+++ b/literate-http-testing/karate/src/test/java/sling/postservlet/createcontent/createContent.feature
@@ -9,8 +9,7 @@ Background:
 * url baseURL
 
 # Use admin credentials for all requests
-* def encodedAuth = call read('basic-auth.js') { username: 'admin', password: 'admin' }
-* configure headers = { 'Authorization' : #(encodedAuth) }
+* configure headers = call read('basic-auth-header.js') { username: 'admin', password: 'admin' }
 
 * def testID = '' + java.util.UUID.randomUUID()