Implemented OAuth2 request token with resource owner password grant.
Change-Id: I516d5adf0091d711ff183470b3f0de8a6e502270
diff --git a/full/src/main/resources/db/insert/V3.5__insert_oauth2_clients.sql b/full/src/main/resources/db/insert/V3.5__insert_oauth2_clients.sql
index 8633a11..3cc2999 100644
--- a/full/src/main/resources/db/insert/V3.5__insert_oauth2_clients.sql
+++ b/full/src/main/resources/db/insert/V3.5__insert_oauth2_clients.sql
@@ -1,15 +1,22 @@
-- test clients
-- plain secret value is "secret"
-INSERT INTO oauth2_client(id,name,secret,type,url,url_hashcode,redirect_uri,
- registered_by)
+INSERT INTO oauth2_client(id,name,secret,type,native, url,url_hashcode,
+ redirect_uri,registered_by)
VALUES ("fCBbQkAyYzI4NzUxMg==","test confidential client",
"$2a$08$vi1FbuN3p6GcI1tSxMAoeuIYL8Yw3j6A8wJthaN8ZboVnrQaTwLPq",
- "CONFIDENTIAL","http://confidential.client.com", -1097645390,
- "https://confidential.client.com/redirect", "system");
+ "CONFIDENTIAL", 1, "http://korap.ids-mannheim.de/confidential", 2087150261,
+ "https://korap.ids-mannheim.de/confidential/redirect", "system");
-INSERT INTO oauth2_client(id,name,secret,type,url,url_hashcode,redirect_uri,
- registered_by)
-VALUES ("8bIDtZnH6NvRkW2Fq==","test public client",null,
- "PUBLIC","http://public.client.com", -1408041551,
- "https://public.client.com/redirect","system");
\ No newline at end of file
+INSERT INTO oauth2_client(id,name,secret,type,url,url_hashcode,
+ redirect_uri, registered_by)
+VALUES ("8bIDtZnH6NvRkW2Fq==","third party client",null,
+ "PUBLIC","http://third.party.client.com", -2137275617,
+ "https://third.party.client.com/redirect","system");
+
+INSERT INTO oauth2_client(id,name,secret,type,native,url,url_hashcode,
+ redirect_uri, registered_by)
+VALUES ("iBr3LsTCxOj7D2o0A5m","test public client",null,
+ "PUBLIC", 1, "http://korap.ids-mannheim.de/public", 1360724310,
+ "https://korap.ids-mannheim.de/public/redirect","system");
+
\ No newline at end of file
diff --git a/full/src/main/resources/db/new-mysql/V1.4__oauth2_tables.sql b/full/src/main/resources/db/new-mysql/V1.4__oauth2_tables.sql
index ad3af94..c55ef43 100644
--- a/full/src/main/resources/db/new-mysql/V1.4__oauth2_tables.sql
+++ b/full/src/main/resources/db/new-mysql/V1.4__oauth2_tables.sql
@@ -6,6 +6,7 @@
name VARCHAR(200) NOT NULL,
secret VARCHAR(200),
type VARCHAR(200) NOT NULL,
+ native BOOLEAN DEFAULT FALSE,
url TEXT NOT NULL,
url_hashcode UNIQUE INTEGER NOT NULL,
redirect_uri TEXT NOT NULL,
diff --git a/full/src/main/resources/db/new-sqlite/V1.4__oauth2_tables.sql b/full/src/main/resources/db/new-sqlite/V1.4__oauth2_tables.sql
index 835acd6..89014f2 100644
--- a/full/src/main/resources/db/new-sqlite/V1.4__oauth2_tables.sql
+++ b/full/src/main/resources/db/new-sqlite/V1.4__oauth2_tables.sql
@@ -6,6 +6,7 @@
name VARCHAR(200) NOT NULL,
secret VARCHAR(200),
type VARCHAR(200) NOT NULL,
+ native BOOLEAN DEFAULT FALSE,
url TEXT NOT NULL,
url_hashcode INTEGER NOT NULL,
redirect_uri TEXT NOT NULL,
diff --git a/full/src/main/resources/kustvakt.conf b/full/src/main/resources/kustvakt.conf
index 31d6f11..99e3b94 100644
--- a/full/src/main/resources/kustvakt.conf
+++ b/full/src/main/resources/kustvakt.conf
@@ -43,13 +43,19 @@
## options referring to the security module!
-## token expiration time in minutes!
+## OAuth
+### (see de.ids_mannheim.korap.constant.AuthenticationMethod for possible
+### oauth.password.authentication values)
+oauth.password.authentication = TEST
+
+# JWT
+security.jwt.issuer=korap.ids-mannheim.de
+
+## token expiration
security.longTokenTTL=150D
security.tokenTTL=72H
security.shortTokenTTL=45M
-security.jwt.issuer=korap.ids-mannheim.de
-
## specifies the user data field that is used to salt user passwords
security.passcode.salt=salt