added authInfo and in/out bound case classes

This commit is contained in:
hongwei 2019-04-01 10:06:18 +02:00
parent dc62ae2c2f
commit 854ea20219
4 changed files with 62 additions and 39 deletions

View File

@ -8,7 +8,7 @@ import code.api.oauth1a.OauthParams._
import code.api.util.APIUtil.{ResourceDoc, useISO20022Spelling, useOBPSpelling}
import code.model.Consumer
import com.openbankproject.commons.dto.CallContextAkka
import com.openbankproject.commons.model.User
import com.openbankproject.commons.model.{AuthInfoBasic, User}
import net.liftweb.common.{Box, Empty}
import net.liftweb.http.provider.HTTPParam
import net.liftweb.json.JsonAST.JValue
@ -36,7 +36,8 @@ case class CallContext(
requestHeaders: List[HTTPParam] = Nil,
`X-Rate-Limit-Limit` : Long = -1,
`X-Rate-Limit-Remaining` : Long = -1,
`X-Rate-Limit-Reset` : Long = -1
`X-Rate-Limit-Reset` : Long = -1,
authInfo: Option[AuthInfoBasic]= None // This is only used for kafka/akka connectors, the mapped connector set default as None.
) {
/**

View File

@ -166,23 +166,6 @@ case class Status(
backendMessages: List[InboundStatusMessage]
)
case class ViewBasic(
id: String,
short_name: String,
description: String,
)
case class AccountBasic(
id: String,
accountRoutings: List[AccountRouting],
customerOwners: List[InternalBasicCustomer],
userOwners: List[InternalBasicUser]
)
case class AuthView(
view: ViewBasic,
account:AccountBasic,
)
case class AuthInfo(
userId: String = "",
@ -201,16 +184,6 @@ case class InboundAuthInfo(
sessionId: String = ""
)
case class BasicCustomer(
customerId: String,
customerNumber: String,
legalName: String,
)
case class BasicUserAuthContext(
key: String,
value: String
)
case class InboundAccountSept2018(
errorCode: String,
@ -266,18 +239,10 @@ case class BankAccountSept2018(r: InboundAccountSept2018) extends BankAccount {
}
case class InternalBasicCustomer(
bankId:String,
case class BasicCustomer(
customerId: String,
customerNumber: String,
legalName: String,
dateOfBirth: Date
)
case class InternalBasicUser(
userId:String,
emailAddress: String,
name: String
)
case class InternalBasicCustomers(customers: List[InternalBasicCustomer])

View File

@ -1 +1,9 @@
package com.openbankproject.commons.dto.rest
import com.openbankproject.commons.model.{AuthInfoBasic, BankCommons, BankId}
case class OutBoundBankRest (authInfo: AuthInfoBasic, bankId: BankId)
case class InBoundBankRest (authInfo: AuthInfoBasic, data: BankCommons)

View File

@ -1,6 +1,8 @@
package com.openbankproject.commons.model
import java.util.Date
import scala.collection.immutable.List
//import code.customeraddress.CustomerAddress
//import code.bankconnectors.InboundAccountCommon
//import code.branches.Branches.BranchT
@ -451,4 +453,51 @@ case class TransactionCommons(
override val startDate : Date,
override val finishDate : Date,
override val balance : BigDecimal
) extends Transaction(uuid, id, thisAccount, otherAccount, transactionType, amount, currency,description, startDate, finishDate, balance)
) extends Transaction(uuid, id, thisAccount, otherAccount, transactionType, amount, currency,description, startDate, finishDate, balance)
case class InternalBasicUser(
userId:String,
emailAddress: String,
name: String
)
case class BasicUserAuthContext(
key: String,
value: String
)
case class ViewBasic(
id: String,
short_name: String,
description: String,
)
case class InternalBasicCustomer(
bankId:String,
customerId: String,
customerNumber: String,
legalName: String,
dateOfBirth: Date
)
case class AccountBasic(
id: String,
accountRoutings: List[AccountRouting],
customerOwners: List[InternalBasicCustomer],
userOwners: List[InternalBasicUser]
)
case class AuthView(
view: ViewBasic,
account:AccountBasic,
)
case class AuthInfoBasic(
username: String = "",
correlationId: String = "",
sessionId: String = "",
userAuthContexts: List[BasicUserAuthContext]= Nil,
authViews: List[AuthView] = Nil,
)