diff --git a/src/main/resources/props/sample.props.template b/src/main/resources/props/sample.props.template index 5844229d6..85ea526b2 100644 --- a/src/main/resources/props/sample.props.template +++ b/src/main/resources/props/sample.props.template @@ -477,18 +477,13 @@ display_internal_errors=false # -------------------------------------- Display internal errors -- -# -- OAuth 2 -------------------------------------------------------------------- +# -- OAuth 2 --------------------------------------------------------------- # Enable/Disable OAuth 2 workflow at a server instance # In case isn't defined default value is false # allow_oauth2_login=false -# oauth2.token_secret=secret -# Enable SSL for JWT -# If set to true must set paths for the keystore locations -# In case isn't defined default value is false -# oauth2.jwt.use.ssl=false # URL of Public server JWK set used for validating bearer JWT access tokens # oauth2.jwk_set.url=http://localhost:8080/jwk.json -# ----------------------------------------------------------- OAuth 2 ----------- +# ----------------------------------------------------------- OAuth 2 ------ ## This property is used for documenting at Resource Doc. It may include the port also (but not /obp) ## (this needs to be a URL) diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala index c0704a401..c53f5985e 100644 --- a/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/src/main/scala/bootstrap/liftweb/Boot.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package bootstrap.liftweb import java.io.{File, FileInputStream} diff --git a/src/main/scala/code/api/ErrorMessageJsonAST.scala b/src/main/scala/code/api/ErrorMessageJsonAST.scala index 4896ab32b..65299e68b 100644 --- a/src/main/scala/code/api/ErrorMessageJsonAST.scala +++ b/src/main/scala/code/api/ErrorMessageJsonAST.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - * * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * * - * Email: contact@tesobe.com - * TESOBE Ltd - * Osloerstrasse 16/17 - * Berlin 13359, Germany - * * - * This product includes software developed at - * TESOBE (http://www.tesobe.com/) - * by - * Simon Redfern : simon AT tesobe DOT com - * Stefan Bethge : stefan AT tesobe DOT com - * Everett Sochowski : everett AT tesobe DOT com - * Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api diff --git a/src/main/scala/code/api/OAuth2.scala b/src/main/scala/code/api/OAuth2.scala index 8b85b03a2..6694e3464 100644 --- a/src/main/scala/code/api/OAuth2.scala +++ b/src/main/scala/code/api/OAuth2.scala @@ -56,81 +56,33 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { /* Method for Old Style Endpoints */ - def getUserFromOAuth2Header(sc: CallContext): (Box[User], Option[CallContext]) = { + def getUserFromOAuth2Header(cc: CallContext): (Box[User], Option[CallContext]) = { APIUtil.getPropsAsBoolValue("allow_oauth2_login", true) match { case true => - val value = getValueOfOAuh2HeaderField(sc) + val value = getValueOfOAuh2HeaderField(cc) if (Google.isIssuer(value)) { - Google.validateIdToken(value) match { - case Full(_) => - val user = Google.getOrCreateResourceUser(value) - (user, Some(sc)) - case ParamFailure(a, b, c, apiFailure : APIFailure) => - (ParamFailure(a, b, c, apiFailure : APIFailure), Some(sc)) - case Failure(msg, t, c) => - (Failure(msg, t, c), Some(sc)) - case _ => - (Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(sc)) - } + Google.applyRules(value, cc) } else { - MITREId.validateAccessToken(value) match { - case Full(_) => - val username = JwtUtil.getSubject(value).getOrElse("") - (Users.users.vend.getUserByUserName(username), Some(sc)) - case ParamFailure(a, b, c, apiFailure : APIFailure) => - (ParamFailure(a, b, c, apiFailure : APIFailure), Some(sc)) - case Failure(msg, t, c) => - (Failure(msg, t, c), Some(sc)) - case _ => - (Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(sc)) - } + MITREId.applyRules(value, cc) } - case false => - (Failure(ErrorMessages.Oauth2IsNotAllowed), Some(sc)) + (Failure(ErrorMessages.Oauth2IsNotAllowed), Some(cc)) } } /* Method for New Style Endpoints */ - def getUserFromOAuth2HeaderFuture(sc: CallContext): Future[(Box[User], Option[CallContext])] = { + def getUserFromOAuth2HeaderFuture(cc: CallContext): Future[(Box[User], Option[CallContext])] = { APIUtil.getPropsAsBoolValue("allow_oauth2_login", true) match { case true => - val value = getValueOfOAuh2HeaderField(sc) + val value = getValueOfOAuh2HeaderField(cc) if (Google.isIssuer(value)) { - Google.validateIdToken(value) match { - case Full(_) => - for { - user <- Google.getOrCreateResourceUserFuture(value) - } yield { - (user, Some(sc)) - } - case ParamFailure(a, b, c, apiFailure : APIFailure) => - Future((ParamFailure(a, b, c, apiFailure : APIFailure), Some(sc))) - case Failure(msg, t, c) => - Future((Failure(msg, t, c), Some(sc))) - case _ => - Future((Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(sc))) - } + Google.applyRulesFuture(value, cc) } else { - MITREId.validateAccessToken(value) match { - case Full(_) => - val username = JwtUtil.getSubject(value).getOrElse("") - for { - user <- Users.users.vend.getUserByUserNameFuture(username) - } yield { - (user, Some(sc)) - } - case ParamFailure(a, b, c, apiFailure : APIFailure) => - Future((ParamFailure(a, b, c, apiFailure : APIFailure), Some(sc))) - case Failure(msg, t, c) => - Future((Failure(msg, t, c), Some(sc))) - case _ => - Future((Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(sc))) - } + MITREId.applyRulesFuture(value, cc) } case false => - Future((Failure(ErrorMessages.Oauth2IsNotAllowed), Some(sc))) + Future((Failure(ErrorMessages.Oauth2IsNotAllowed), Some(cc))) } } @@ -148,9 +100,43 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { Failure(ErrorMessages.Oauth2ThereIsNoUrlOfJwkSet) } } + def applyRules(value: String, cc: CallContext): (Box[User], Some[CallContext]) = { + validateAccessToken(value) match { + case Full(_) => + val username = JwtUtil.getSubject(value).getOrElse("") + (Users.users.vend.getUserByUserName(username), Some(cc)) + case ParamFailure(a, b, c, apiFailure : APIFailure) => + (ParamFailure(a, b, c, apiFailure : APIFailure), Some(cc)) + case Failure(msg, t, c) => + (Failure(msg, t, c), Some(cc)) + case _ => + (Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(cc)) + } + } + def applyRulesFuture(value: String, cc: CallContext): Future[(Box[User], Some[CallContext])] = { + validateAccessToken(value) match { + case Full(_) => + val username = JwtUtil.getSubject(value).getOrElse("") + for { + user <- Users.users.vend.getUserByUserNameFuture(username) + } yield { + (user, Some(cc)) + } + case ParamFailure(a, b, c, apiFailure : APIFailure) => + Future((ParamFailure(a, b, c, apiFailure : APIFailure), Some(cc))) + case Failure(msg, t, c) => + Future((Failure(msg, t, c), Some(cc))) + case _ => + Future((Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(cc))) + } + } + } - object Google { + trait OAuth2Util { + + def urlOfJwkSets: Box[String] = APIUtil.getPropsValue(nameOfProperty = "oauth2.jwk_set.url") + private def getClaim(name: String, idToken: String): Option[String] = { val claim = JwtUtil.getClaim(name = name, jwtToken = idToken).asString() claim match { @@ -162,7 +148,7 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { JwtUtil.getIssuer(jwtToken).map(_.contains("accounts.google.com")).getOrElse(false) } def validateIdToken(idToken: String): Box[IDTokenClaimsSet] = { - APIUtil.getPropsValue("oauth2.jwk_set.url") match { + urlOfJwkSets match { case Full(url) => JwtUtil.validateIdToken(idToken, url) case ParamFailure(a, b, c, apiFailure : APIFailure) => @@ -178,7 +164,15 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { * It is mapped in next way: * iss => ResourceUser.provider_ * sub => ResourceUser.providerId - * @param idToken + * @param idToken Google's response example: + * { + * "access_token": "ya29.GluUBg5DflrJciFikW5hqeKEp9r1whWnU5x2JXCm9rKkRMs2WseXX8O5UugFMDsIKuKCZlE7tTm1fMII_YYpvcMX6quyR5DXNHH8Lbx5TrZN__fA92kszHJEVqPc", + * "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6IjA4ZDMyNDVjNjJmODZiNjM2MmFmY2JiZmZlMWQwNjk4MjZkZDFkYzEiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMTM5NjY4NTQyNDU3ODA4OTI5NTkiLCJlbWFpbCI6Im1hcmtvLm1pbGljLnNyYmlqYUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiYXRfaGFzaCI6Im5HS1JUb0tOblZBMjhINk1od1hCeHciLCJuYW1lIjoiTWFya28gTWlsacSHIiwicGljdHVyZSI6Imh0dHBzOi8vbGg1Lmdvb2dsZXVzZXJjb250ZW50LmNvbS8tWGQ0NGhuSjZURG8vQUFBQUFBQUFBQUkvQUFBQUFBQUFBQUEvQUt4cndjYWR3emhtNE40dFdrNUU4QXZ4aS1aSzZrczRxZy9zOTYtYy9waG90by5qcGciLCJnaXZlbl9uYW1lIjoiTWFya28iLCJmYW1pbHlfbmFtZSI6Ik1pbGnEhyIsImxvY2FsZSI6ImVuIiwiaWF0IjoxNTQ3NzA1NjkxLCJleHAiOjE1NDc3MDkyOTF9.iUxhF_SU2vi76zPuRqAKJvFOzpb_EeP3lc5u9FO9o5xoXzVq3QooXexTfK2f1YAcWEy9LSftA34PB0QTuCZpkQChZVM359n3a3hplf6oWWkBXZN2_IG10NwEH4g0VVBCsjWBDMp6lvepN_Zn15x8opUB7272m4-smAou_WmUPTeivXRF8yPcp4J55DigcY31YP59dMQr2X-6Rr1vCRnJ6niqqJ1UDldfsgt4L7dXmUCnkDdXHwEQAZwbKbR4dUoEha3QeylCiBErmLdpIyqfKECphC6piGXZB-rRRqLz41WNfuF-3fswQvGmIkzTJDR7lQaletMp7ivsfVw8N5jFxg", + * "expires_in": 3600, + * "token_type": "Bearer", + * "scope": "https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email", + * "refresh_token": "1/HkTtUahtUTdG7D6urpPNz6g-_qufF-Y1YppcBf0v3Cs" + * } * @return an existing or a new user */ def getOrCreateResourceUserFuture(idToken: String): Future[Box[User]] = { @@ -196,7 +190,15 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { * It is mapped in next way: * iss => ResourceUser.provider_ * sub => ResourceUser.providerId - * @param idToken + * @param idToken Google's response example: + * { + * "access_token": "ya29.GluUBg5DflrJciFikW5hqeKEp9r1whWnU5x2JXCm9rKkRMs2WseXX8O5UugFMDsIKuKCZlE7tTm1fMII_YYpvcMX6quyR5DXNHH8Lbx5TrZN__fA92kszHJEVqPc", + * "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6IjA4ZDMyNDVjNjJmODZiNjM2MmFmY2JiZmZlMWQwNjk4MjZkZDFkYzEiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI0MDc0MDg3MTgxOTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMTM5NjY4NTQyNDU3ODA4OTI5NTkiLCJlbWFpbCI6Im1hcmtvLm1pbGljLnNyYmlqYUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiYXRfaGFzaCI6Im5HS1JUb0tOblZBMjhINk1od1hCeHciLCJuYW1lIjoiTWFya28gTWlsacSHIiwicGljdHVyZSI6Imh0dHBzOi8vbGg1Lmdvb2dsZXVzZXJjb250ZW50LmNvbS8tWGQ0NGhuSjZURG8vQUFBQUFBQUFBQUkvQUFBQUFBQUFBQUEvQUt4cndjYWR3emhtNE40dFdrNUU4QXZ4aS1aSzZrczRxZy9zOTYtYy9waG90by5qcGciLCJnaXZlbl9uYW1lIjoiTWFya28iLCJmYW1pbHlfbmFtZSI6Ik1pbGnEhyIsImxvY2FsZSI6ImVuIiwiaWF0IjoxNTQ3NzA1NjkxLCJleHAiOjE1NDc3MDkyOTF9.iUxhF_SU2vi76zPuRqAKJvFOzpb_EeP3lc5u9FO9o5xoXzVq3QooXexTfK2f1YAcWEy9LSftA34PB0QTuCZpkQChZVM359n3a3hplf6oWWkBXZN2_IG10NwEH4g0VVBCsjWBDMp6lvepN_Zn15x8opUB7272m4-smAou_WmUPTeivXRF8yPcp4J55DigcY31YP59dMQr2X-6Rr1vCRnJ6niqqJ1UDldfsgt4L7dXmUCnkDdXHwEQAZwbKbR4dUoEha3QeylCiBErmLdpIyqfKECphC6piGXZB-rRRqLz41WNfuF-3fswQvGmIkzTJDR7lQaletMp7ivsfVw8N5jFxg", + * "expires_in": 3600, + * "token_type": "Bearer", + * "scope": "https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email", + * "refresh_token": "1/HkTtUahtUTdG7D6urpPNz6g-_qufF-Y1YppcBf0v3Cs" + * } * @return an existing or a new user */ def getOrCreateResourceUser(idToken: String): Box[User] = { @@ -212,8 +214,48 @@ object OAuth2Handshake extends RestHelper with MdcLoggable { ) } } + + def applyRules(value: String, cc: CallContext): (Box[User], Some[CallContext]) = { + validateIdToken(value) match { + case Full(_) => + val user = Google.getOrCreateResourceUser(value) + (user, Some(cc)) + case ParamFailure(a, b, c, apiFailure : APIFailure) => + (ParamFailure(a, b, c, apiFailure : APIFailure), Some(cc)) + case Failure(msg, t, c) => + (Failure(msg, t, c), Some(cc)) + case _ => + (Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(cc)) + } + } + def applyRulesFuture(value: String, cc: CallContext): Future[(Box[User], Some[CallContext])] = { + validateIdToken(value) match { + case Full(_) => + for { + user <- Google.getOrCreateResourceUserFuture(value) + } yield { + (user, Some(cc)) + } + case ParamFailure(a, b, c, apiFailure : APIFailure) => + Future((ParamFailure(a, b, c, apiFailure : APIFailure), Some(cc))) + case Failure(msg, t, c) => + Future((Failure(msg, t, c), Some(cc))) + case _ => + Future((Failure(ErrorMessages.Oauth2IJwtCannotBeVerified), Some(cc))) + } + } } + + object Google extends OAuth2Util { + override def urlOfJwkSets: Box[String] = { + val url = APIUtil.getPropsValue(nameOfProperty = "oauth2.jwk_set.url") + url.map(_.toLowerCase()).map(_.contains("google")).getOrElse(false) match { + case true => url + case false => Failure(ErrorMessages.Oauth2CannotMatchIssuerAndJwksUriException) + } + } + } + - } \ No newline at end of file diff --git a/src/main/scala/code/api/OBPRestHelper.scala b/src/main/scala/code/api/OBPRestHelper.scala index 76cb94679..2a4d78cf6 100644 --- a/src/main/scala/code/api/OBPRestHelper.scala +++ b/src/main/scala/code/api/OBPRestHelper.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,17 +16,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) */ diff --git a/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala b/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala index fa454d72e..852ac735b 100644 --- a/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala +++ b/src/main/scala/code/api/UKOpenBanking/v2_0_0/OBP_UKOpenBanking_200.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api.UKOpenBanking.v2_0_0 diff --git a/src/main/scala/code/api/berlin/group/v1/OBP_BERLIN_GROUP_1.scala b/src/main/scala/code/api/berlin/group/v1/OBP_BERLIN_GROUP_1.scala index b1a9e2273..eeb9bb92b 100644 --- a/src/main/scala/code/api/berlin/group/v1/OBP_BERLIN_GROUP_1.scala +++ b/src/main/scala/code/api/berlin/group/v1/OBP_BERLIN_GROUP_1.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api.berlin.group.v1 diff --git a/src/main/scala/code/api/util/APIUtil.scala b/src/main/scala/code/api/util/APIUtil.scala index f6669a695..f4a030e67 100644 --- a/src/main/scala/code/api/util/APIUtil.scala +++ b/src/main/scala/code/api/util/APIUtil.scala @@ -1,34 +1,29 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License -*along with this program. If not, see . - ** - *Email: contact@tesobe.com -*TESOBE Ltd -*Osloerstrasse 16/17 -*Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code.api.util diff --git a/src/main/scala/code/api/util/ErrorMessages.scala b/src/main/scala/code/api/util/ErrorMessages.scala index 4e59a0509..a6c309a0b 100644 --- a/src/main/scala/code/api/util/ErrorMessages.scala +++ b/src/main/scala/code/api/util/ErrorMessages.scala @@ -135,6 +135,7 @@ object ErrorMessages { val Oauth2ParseException = "OBP-20205: Parse error. " val Oauth2BadJOSEException = "OBP-20206: Bad JSON Object Signing and Encryption (JOSE) exception. " val Oauth2JOSEException = "OBP-20207: Javascript Object Signing and Encryption (JOSE) exception. " + val Oauth2CannotMatchIssuerAndJwksUriException = "OBP-20208: Cannot match the issuer and JWKS URI at this server instance. " val InvalidAmount = "OBP-20054: Invalid amount. Please specify a valid value for amount." val MissingQueryParams = "OBP-20055: These query parameters are missing: " diff --git a/src/main/scala/code/api/util/JwtUtil.scala b/src/main/scala/code/api/util/JwtUtil.scala index 9f6d68893..4e3bef463 100644 --- a/src/main/scala/code/api/util/JwtUtil.scala +++ b/src/main/scala/code/api/util/JwtUtil.scala @@ -66,9 +66,8 @@ object JwtUtil { * * @return True or False */ - def verifyHmacSignedJwt(jwtToken: String): Boolean = { + def verifyHmacSignedJwt(jwtToken: String, sharedSecret: String): Boolean = { val signedJWT = SignedJWT.parse(jwtToken) - val sharedSecret = APIUtil.getPropsValue("oauth2.token_secret", "") val verifier = new MACVerifier(sharedSecret) signedJWT.verify(verifier) } diff --git a/src/main/scala/code/api/v1_2/JSONFactory1.2.scala b/src/main/scala/code/api/v1_2/JSONFactory1.2.scala index d047d78a1..31031dfb1 100644 --- a/src/main/scala/code/api/v1_2/JSONFactory1.2.scala +++ b/src/main/scala/code/api/v1_2/JSONFactory1.2.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v1_2 import java.util.Date diff --git a/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala b/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala index d461985b0..28a516ae7 100644 --- a/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala +++ b/src/main/scala/code/api/v1_2_1/JSONFactory1.2.1.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v1_2_1 import java.util.Date diff --git a/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala b/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala index 660f0737c..55f48a034 100644 --- a/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala +++ b/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,17 +16,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) */ package code.api.v1_2_1 diff --git a/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala b/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala index 4a01a0613..c5107312c 100644 --- a/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala +++ b/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v2_0_0 import java.util.Date diff --git a/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala b/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala index 2162a48d0..e13429c19 100644 --- a/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala +++ b/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala @@ -1,34 +1,29 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License -*along with this program. If not, see . - ** - *Email: contact@tesobe.com -*TESOBE Ltd -*Osloerstrasse 16/17 -*Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code.api.v2_0_0 import code.api.OBPRestHelper diff --git a/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala b/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala index f475373c4..7737104a5 100644 --- a/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala +++ b/src/main/scala/code/api/v2_1_0/JSONFactory2.1.0.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v2_1_0 import java.lang diff --git a/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala b/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala index 6009a7b49..fe9aedae1 100644 --- a/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala +++ b/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api.v2_1_0 diff --git a/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala b/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala index 3d1a6f596..95a6e4dcc 100644 --- a/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala +++ b/src/main/scala/code/api/v2_2_0/JSONFactory2.2.0.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v2_2_0 //import code.api.v1_2_1.JSONFactory diff --git a/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala b/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala index fc6318c66..4c933d04d 100644 --- a/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala +++ b/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala @@ -1,34 +1,4 @@ -/** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ + package code.api.v2_2_0 import code.api.OBPRestHelper diff --git a/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala b/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala index 5ec95b82b..252626bd6 100644 --- a/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala +++ b/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api.v3_0_0 diff --git a/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala b/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala index b2f993821..f075dd0b1 100644 --- a/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala +++ b/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala @@ -1,33 +1,28 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License - *along with this program. If not, see . - ** - *Email: contact@tesobe.com - *TESOBE Ltd - *Osloerstrasse 16/17 - *Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + */ package code.api.v3_1_0 diff --git a/src/main/scala/code/bankconnectors/vMar2017/KafkaJsonFactory_vMar2017.scala b/src/main/scala/code/bankconnectors/vMar2017/KafkaJsonFactory_vMar2017.scala index 8aa38305f..b8d1f5be6 100644 --- a/src/main/scala/code/bankconnectors/vMar2017/KafkaJsonFactory_vMar2017.scala +++ b/src/main/scala/code/bankconnectors/vMar2017/KafkaJsonFactory_vMar2017.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.bankconnectors.vMar2017 import java.util.Date diff --git a/src/main/scala/code/metrics/MongoAPIMetric.scala b/src/main/scala/code/metrics/MongoAPIMetric.scala index 5bafd4ab8..4bd3b9ca3 100644 --- a/src/main/scala/code/metrics/MongoAPIMetric.scala +++ b/src/main/scala/code/metrics/MongoAPIMetric.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.metrics diff --git a/src/main/scala/code/model/BankingData.scala b/src/main/scala/code/model/BankingData.scala index 59501e101..730b2d78a 100644 --- a/src/main/scala/code/model/BankingData.scala +++ b/src/main/scala/code/model/BankingData.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model import java.util.Date diff --git a/src/main/scala/code/model/Metadata.scala b/src/main/scala/code/model/Metadata.scala index cc2140130..ee6bd8039 100644 --- a/src/main/scala/code/model/Metadata.scala +++ b/src/main/scala/code/model/Metadata.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model import java.util.Date diff --git a/src/main/scala/code/model/ModeratedBankingData.scala b/src/main/scala/code/model/ModeratedBankingData.scala index 682fbb937..05c0076a8 100644 --- a/src/main/scala/code/model/ModeratedBankingData.scala +++ b/src/main/scala/code/model/ModeratedBankingData.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model import java.util.Date diff --git a/src/main/scala/code/model/OAuth.scala b/src/main/scala/code/model/OAuth.scala index 61f054458..58aa85fbf 100644 --- a/src/main/scala/code/model/OAuth.scala +++ b/src/main/scala/code/model/OAuth.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model import java.util.{Date, UUID} diff --git a/src/main/scala/code/model/User.scala b/src/main/scala/code/model/User.scala index 43b256387..0916ce91e 100644 --- a/src/main/scala/code/model/User.scala +++ b/src/main/scala/code/model/User.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model diff --git a/src/main/scala/code/model/View.scala b/src/main/scala/code/model/View.scala index 640576ccc..f5ab08ec7 100644 --- a/src/main/scala/code/model/View.scala +++ b/src/main/scala/code/model/View.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model diff --git a/src/main/scala/code/model/dataAccess/Account.scala b/src/main/scala/code/model/dataAccess/Account.scala index 9b96c4316..c9b7bf332 100644 --- a/src/main/scala/code/model/dataAccess/Account.scala +++ b/src/main/scala/code/model/dataAccess/Account.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess diff --git a/src/main/scala/code/model/dataAccess/Admin.scala b/src/main/scala/code/model/dataAccess/Admin.scala index 0543ef38a..3c0480742 100644 --- a/src/main/scala/code/model/dataAccess/Admin.scala +++ b/src/main/scala/code/model/dataAccess/Admin.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess import net.liftweb.mapper._ diff --git a/src/main/scala/code/model/dataAccess/AuthUser.scala b/src/main/scala/code/model/dataAccess/AuthUser.scala index 0ef27ae59..786d98350 100644 --- a/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,17 +16,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) */ package code.model.dataAccess diff --git a/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala b/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala index 60a85e51b..dfd1f4ee6 100644 --- a/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala +++ b/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ /** diff --git a/src/main/scala/code/model/dataAccess/MappedView.scala b/src/main/scala/code/model/dataAccess/MappedView.scala index 23c2e1c0e..08ae0a575 100644 --- a/src/main/scala/code/model/dataAccess/MappedView.scala +++ b/src/main/scala/code/model/dataAccess/MappedView.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess diff --git a/src/main/scala/code/model/dataAccess/MongoConfig.scala b/src/main/scala/code/model/dataAccess/MongoConfig.scala index 9106c3237..9d9a862ed 100644 --- a/src/main/scala/code/model/dataAccess/MongoConfig.scala +++ b/src/main/scala/code/model/dataAccess/MongoConfig.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess import code.api.util.APIUtil diff --git a/src/main/scala/code/model/dataAccess/OBPTransaction.scala b/src/main/scala/code/model/dataAccess/OBPTransaction.scala index 383cb7945..cce095152 100644 --- a/src/main/scala/code/model/dataAccess/OBPTransaction.scala +++ b/src/main/scala/code/model/dataAccess/OBPTransaction.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess import code.util.Helper diff --git a/src/main/scala/code/model/dataAccess/ResourceUser.scala b/src/main/scala/code/model/dataAccess/ResourceUser.scala index d68b8fed4..ccfbb89d6 100644 --- a/src/main/scala/code/model/dataAccess/ResourceUser.scala +++ b/src/main/scala/code/model/dataAccess/ResourceUser.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.model.dataAccess import code.api.util.APIUtil diff --git a/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala b/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala index 2fa879be5..d5c55abbb 100644 --- a/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala +++ b/src/main/scala/code/model/dataAccess/UpdatesRequestSender.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ /** diff --git a/src/main/scala/code/snippet/ConsumerRegistration.scala b/src/main/scala/code/snippet/ConsumerRegistration.scala index 70f7ac57c..ac2ac1444 100644 --- a/src/main/scala/code/snippet/ConsumerRegistration.scala +++ b/src/main/scala/code/snippet/ConsumerRegistration.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.snippet import code.api.util.{APIUtil, ErrorMessages} diff --git a/src/main/scala/code/snippet/GetHtmlFromUrl.scala b/src/main/scala/code/snippet/GetHtmlFromUrl.scala index a6fca978a..4a86a9830 100644 --- a/src/main/scala/code/snippet/GetHtmlFromUrl.scala +++ b/src/main/scala/code/snippet/GetHtmlFromUrl.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) -*/ + */ package code.snippet diff --git a/src/main/scala/code/snippet/Login.scala b/src/main/scala/code/snippet/Login.scala index 03caf17cf..24da2c5b4 100644 --- a/src/main/scala/code/snippet/Login.scala +++ b/src/main/scala/code/snippet/Login.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) -*/ + */ package code.snippet diff --git a/src/main/scala/code/snippet/Nav.scala b/src/main/scala/code/snippet/Nav.scala index 3fea45a85..3b57b95d8 100644 --- a/src/main/scala/code/snippet/Nav.scala +++ b/src/main/scala/code/snippet/Nav.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.snippet import net.liftweb.http.S diff --git a/src/main/scala/code/snippet/OAuthAuthorisation.scala b/src/main/scala/code/snippet/OAuthAuthorisation.scala index 789785e42..1ab703086 100644 --- a/src/main/scala/code/snippet/OAuthAuthorisation.scala +++ b/src/main/scala/code/snippet/OAuthAuthorisation.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -15,21 +15,15 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + This product includes software developed at TESOBE (http://www.tesobe.com/) -by -Simon Redfern : simon AT tesobe DOT com -Stefan Bethge : stefan AT tesobe DOT com -Everett Sochowski : everett AT tesobe DOT com -Ayoub Benali: ayoub AT tesobe DOT com - -TESOBE Ltd. -Osloer Str. 16/17 -Berlin 13359, Germany -Email: contact@tesobe.com - -*/ + */ package code.snippet diff --git a/src/test/scala/RunWebApp.scala b/src/test/scala/RunWebApp.scala index 6f18f65d0..020ccf914 100644 --- a/src/test/scala/RunWebApp.scala +++ b/src/test/scala/RunWebApp.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,18 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com -*/ +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ import code.api.util.APIUtil import net.liftweb.util.Props diff --git a/src/test/scala/code/AppTest.scala b/src/test/scala/code/AppTest.scala index f2ca1ddb7..9aeaf82a4 100644 --- a/src/test/scala/code/AppTest.scala +++ b/src/test/scala/code/AppTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,18 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com - */ +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code import java.io.File diff --git a/src/test/scala/code/api/oauthTest.scala b/src/test/scala/code/api/oauthTest.scala index d02998ef4..27e0b3f7a 100644 --- a/src/test/scala/code/api/oauthTest.scala +++ b/src/test/scala/code/api/oauthTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api diff --git a/src/test/scala/code/api/v1_2_1/API1_2_1Test.scala b/src/test/scala/code/api/v1_2_1/API1_2_1Test.scala index fad6e2cf2..1fe6f1064 100644 --- a/src/test/scala/code/api/v1_2_1/API1_2_1Test.scala +++ b/src/test/scala/code/api/v1_2_1/API1_2_1Test.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v1_2_1 import _root_.net.liftweb.json.Serialization.write diff --git a/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala index e175a77dc..1ba17d8f6 100644 --- a/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala +++ b/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.api.v2_2_0 diff --git a/src/test/scala/code/api/v3_0_0/ViewsTests.scala b/src/test/scala/code/api/v3_0_0/ViewsTests.scala index 0627a66cb..f9c11fa85 100644 --- a/src/test/scala/code/api/v3_0_0/ViewsTests.scala +++ b/src/test/scala/code/api/v3_0_0/ViewsTests.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,17 +16,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) */ package code.api.v3_0_0 diff --git a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala index 6a95a2543..9dbf5e9bc 100644 --- a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala +++ b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,17 +16,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) */ package code.sandbox diff --git a/src/test/scala/code/setup/SendServerRequests.scala b/src/test/scala/code/setup/SendServerRequests.scala index 74fb11294..8bc186e4d 100644 --- a/src/test/scala/code/setup/SendServerRequests.scala +++ b/src/test/scala/code/setup/SendServerRequests.scala @@ -1,34 +1,29 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License -*along with this program. If not, see . - ** - *Email: contact@tesobe.com -*TESOBE Ltd -*Osloerstrasse 16/17 -*Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code.setup import java.nio.charset.{Charset, StandardCharsets} diff --git a/src/test/scala/code/setup/ServerSetup.scala b/src/test/scala/code/setup/ServerSetup.scala index 681d67343..b6c6f10f0 100644 --- a/src/test/scala/code/setup/ServerSetup.scala +++ b/src/test/scala/code/setup/ServerSetup.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.setup diff --git a/src/test/scala/code/setup/ServerSetupAsync.scala b/src/test/scala/code/setup/ServerSetupAsync.scala index 89b5fbdc8..30459904b 100644 --- a/src/test/scala/code/setup/ServerSetupAsync.scala +++ b/src/test/scala/code/setup/ServerSetupAsync.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.setup diff --git a/src/test/scala/code/util/APIUtilTest.scala b/src/test/scala/code/util/APIUtilTest.scala index f21e1f584..7eb5f8a35 100644 --- a/src/test/scala/code/util/APIUtilTest.scala +++ b/src/test/scala/code/util/APIUtilTest.scala @@ -1,34 +1,29 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License -*along with this program. If not, see . - ** - *Email: contact@tesobe.com -*TESOBE Ltd -*Osloerstrasse 16/17 -*Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code.util diff --git a/src/test/scala/code/util/ApiSessionTest.scala b/src/test/scala/code/util/ApiSessionTest.scala index af1fc7f68..042b6635b 100644 --- a/src/test/scala/code/util/ApiSessionTest.scala +++ b/src/test/scala/code/util/ApiSessionTest.scala @@ -1,34 +1,29 @@ /** - * Open Bank Project - API - * Copyright (C) 2011-2018, TESOBE Ltd - ** - *This program is free software: you can redistribute it and/or modify - *it under the terms of the GNU Affero General Public License as published by - *the Free Software Foundation, either version 3 of the License, or - *(at your option) any later version. - ** - *This program is distributed in the hope that it will be useful, - *but WITHOUT ANY WARRANTY; without even the implied warranty of - *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *GNU Affero General Public License for more details. - ** - *You should have received a copy of the GNU Affero General Public License -*along with this program. If not, see . - ** - *Email: contact@tesobe.com -*TESOBE Ltd -*Osloerstrasse 16/17 -*Berlin 13359, Germany - ** - *This product includes software developed at - *TESOBE (http://www.tesobe.com/) - * by - *Simon Redfern : simon AT tesobe DOT com - *Stefan Bethge : stefan AT tesobe DOT com - *Everett Sochowski : everett AT tesobe DOT com - *Ayoub Benali: ayoub AT tesobe DOT com - * - */ +Open Bank Project - API +Copyright (C) 2011-2018, TESOBE Ltd. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE Ltd. +Osloer Strasse 16/17 +Berlin 13359, Germany + +This product includes software developed at +TESOBE (http://www.tesobe.com/) + + */ package code.util diff --git a/src/test/scala/code/util/OAuthClient.scala b/src/test/scala/code/util/OAuthClient.scala index f3640d343..360f3ef41 100644 --- a/src/test/scala/code/util/OAuthClient.scala +++ b/src/test/scala/code/util/OAuthClient.scala @@ -1,6 +1,6 @@ /** Open Bank Project - API -Copyright (C) 2011-2018, TESOBE Ltd +Copyright (C) 2011-2018, TESOBE Ltd. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,19 +16,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Email: contact@tesobe.com -TESOBE Ltd -Osloerstrasse 16/17 +TESOBE Ltd. +Osloer Strasse 16/17 Berlin 13359, Germany - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com - Ayoub Benali: ayoub AT tesobe DOT com +This product includes software developed at +TESOBE (http://www.tesobe.com/) - */ + */ package code.util