Implemented authorization code request, simplified client
authentication, and added tests.
Change-Id: Id6695cacc6da75da64588499ea3a7c7b1ad64591
diff --git a/core/pom.xml b/core/pom.xml
index cc807bb..032b2b1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -318,12 +318,6 @@
<!-- <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> </dependency> -->
- <dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
- <version>1.0.0</version>
- </dependency>
-
<!-- end copy -->
<dependency>
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
index 10556e2..4595d06 100644
--- a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
+++ b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
@@ -123,6 +123,7 @@
public static final int CLIENT_AUTHENTICATION_FAILED = 1803;
public static final int CLIENT_AUTHORIZATION_FAILED = 1804;
public static final int CLIENT_NOT_FOUND = 1805;
+ public static final int INVALID_REDIRECT_URI = 1806;
public static final int UNSUPPORTED_GRANT_TYPE = 1810;
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/ShibUser.java b/core/src/main/java/de/ids_mannheim/korap/user/ShibUser.java
deleted file mode 100644
index d994721..0000000
--- a/core/src/main/java/de/ids_mannheim/korap/user/ShibUser.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package de.ids_mannheim.korap.user;
-
-import lombok.Data;
-
-/**
- * User: hanl
- * Date: 10/16/13
- * Time: 2:02 PM
- */
-@Data
-public class ShibUser extends User {
-
- private String mail;
- private String affiliation;
- private String cn;
-
-
- protected ShibUser () {
- super(1);
- }
-
-
- private ShibUser (String eduPersonID, String mail, String cn,
- String affiliation) {
- this(eduPersonID);
- this.setUsername(eduPersonID);
- this.mail = mail;
- this.affiliation = affiliation;
- this.cn = cn;
- }
-
-
- public ShibUser (String username) {
- super(username, 1);
-
- }
-
-
- @Override
- public String toString () {
- final StringBuffer sb = new StringBuffer("ShibUser{");
- sb.append(", mail='").append(mail).append('\'');
- sb.append(", affiliation='").append(affiliation).append('\'');
- sb.append(", cn='").append(cn).append('\'');
- sb.append('}');
- return sb.toString();
- }
-
-
- @Override
- protected User clone () {
- return new ShibUser(this.getUsername(), this.getMail(), this.getCn(),
- this.getAffiliation());
- }
-}
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/User.java b/core/src/main/java/de/ids_mannheim/korap/user/User.java
index 871beb8..5decd6a 100644
--- a/core/src/main/java/de/ids_mannheim/korap/user/User.java
+++ b/core/src/main/java/de/ids_mannheim/korap/user/User.java
@@ -238,15 +238,15 @@
}
- public static ShibUser getShibInstance (String eduPersonID,
- String mail, String cn) {
- ShibUser u = new ShibUser(eduPersonID);
- u.setAffiliation("");
- u.setMail(mail);
- u.setUsername(eduPersonID);
- u.setCn(cn);
- return u;
- }
+// public static ShibUser getShibInstance (String eduPersonID,
+// String mail, String cn) {
+// ShibUser u = new ShibUser(eduPersonID);
+// u.setAffiliation("");
+// u.setMail(mail);
+// u.setUsername(eduPersonID);
+// u.setCn(cn);
+// return u;
+// }
public static KorAPUser toKorAPUser (Map<String, Object> map) {
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
index 4cd3ee7..12c7825 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/utils/FormRequestWrapper.java
@@ -37,8 +37,9 @@
@Override
public String getParameter (String name) {
String value = super.getParameter(name);
- if (value == null)
- value = String.valueOf(form.getFirst(name));
+ if (value == null){
+ value = form.getFirst(name);
+ }
return value;
}