artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 13:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2233 from hongwei1/bugfix/addV510toResourceDocs

Browse Source 
bugfix/fixedBugs
This commit is contained in:
Simon Redfern 2023-06-16 12:30:57 +02:00 committed by GitHub
commit 8b522a560b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -58,6 +58,7 @@ import code.api.dynamic.entity.OBPAPIDynamicEntity
import code.api._
import code.api.dynamic.entity.helper.DynamicEntityHelper
import code.api.v5_0_0.OBPAPI5_0_0
import code.api.v5_1_0.OBPAPI5_1_0
import code.api.{DirectLogin, _}
import code.authtypevalidation.AuthenticationTypeValidationProvider
import code.bankconnectors.Connector
@ -4517,7 +4518,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
val allowedAnswerTransactionRequestChallengeAttempts = APIUtil.getPropsAsIntValue("answer_transactionRequest_challenge_allowed_attempts").openOr(3)
lazy val allStaticResourceDocs = (OBPAPI5_0_0.allResourceDocs
lazy val allStaticResourceDocs = (OBPAPI5_1_0.allResourceDocs
++ OBP_UKOpenBanking_200.allResourceDocs
++ OBP_UKOpenBanking_310.allResourceDocs
++ code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1.allResourceDocs

7
obp-api/src/main/scala/code/views/system/ViewDefinition.scala
View File

@ -1,7 +1,7 @@
package code.views.system
import code.api.util.APIUtil.{checkCustomViewIdOrName, checkSystemViewIdOrName}
import code.api.util.ErrorMessages.{InvalidCustomViewFormat, InvalidSystemViewFormat}
import code.api.util.ErrorMessages.{CreateSystemViewError, InvalidCustomViewFormat, InvalidSystemViewFormat}
import code.util.{AccountIdString, UUIDString}
import com.openbankproject.commons.model._
import net.liftweb.common.Box
@ -543,6 +543,11 @@ object ViewDefinition extends ViewDefinition with LongKeyedMetaMapper[ViewDefini
if (!t.isSystem && !checkCustomViewIdOrName(t.view_id.get)) {
throw new RuntimeException(InvalidCustomViewFormat+s"Current view_id (${t.view_id.get})")
}
//sanity checks
if (!t.isSystem && (t.bank_id ==null || t.account_id == null)) {
throw new RuntimeException(CreateSystemViewError+s"Current view.isSystem${t.isSystem}, bank_id${t.bank_id}, account_id${t.account_id}")
}
}
)