Fixed session authentication & some other tests.
Change-Id: Ie863d53f0542d7a6964caab284bc038f1a1c82c6
diff --git a/src/test/resources/kustvakt-test.conf b/src/test/resources/kustvakt-test.conf
index dce2127..50afe37 100644
--- a/src/test/resources/kustvakt-test.conf
+++ b/src/test/resources/kustvakt-test.conf
@@ -1,5 +1,4 @@
## index dir
-#krill.indexDir = src/main/resources/index-goe-lucene5
krill.indexDir = src/test/resources/sample-index
krill.index.commit.count = 134217000
@@ -23,18 +22,6 @@
server.port=8089
server.host=localhost
-# init user
-kustvakt.init.user.id = 1000
-kustvakt.init.user.username = kustvakt
-kustvakt.init.user.password = kustvakt2015
-kustvakt.init.user.email = kustvakt@ids-mannheim.de
-kustvakt.init.user.country = Germany
-kustvakt.init.user.address = Mannheim
-kustvakt.init.user.firstname = Kustvakt
-kustvakt.init.user.lastname = KorAP
-kustvakt.init.user.institution = IDS Mannheim
-kustvakt.init.user.admin = true
-
# user configuration
# user.config = user.conf
@@ -47,8 +34,10 @@
security.tokenTTL = 9S
security.shortTokenTTL = 5S
+kustvakt.security.jwt.issuer=korap.ids-mannheim.de
+
## specifies the user data field that is used to salt user passwords
-security.passcode.salt=accountCreation
+security.passcode.salt=salt
security.idleTimeoutDuration = 25M
security.multipleLogIn = true
@@ -59,8 +48,6 @@
security.validation.stringLength = 150
security.validation.emailLength = 50
security.encryption.algo=BCRYPT
-security.sharedSecret=nHim5JB-YqkX7sS55jayGBnga8WmqgpkzieGe8UhojE
-security.adminToken=f61d02c04a0f18d60172f7b990955824
## applicable: rewrite, foundry, filter, deny
security.rewrite.strategies=filter, foundry, rewrite
\ No newline at end of file
diff --git a/src/test/resources/test-default-config.xml b/src/test/resources/test-default-config.xml
index 09d4822..abd03af 100644
--- a/src/test/resources/test-default-config.xml
+++ b/src/test/resources/test-default-config.xml
@@ -37,8 +37,8 @@
<value>classpath:test-jdbc.properties</value>
<value>classpath:hibernate.properties</value>
<!-- <value>file:./jdbc.properties</value> -->
- <value>file:./kustvakt.conf</value>
- <value>classpath:kustvakt.conf</value>
+ <!-- <value>file:./kustvakt-test.conf</value> -->
+ <value>classpath:kustvakt-test.conf</value>
</array>
</property>
</bean>