mirror of
https://github.com/OpenBankProject/OBP-API.git
synced 2026-02-06 17:37:00 +00:00
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
Marko Milić
commit
63bddaddda
@ -99,14 +99,14 @@ object DynamicEndpointHelper extends RestHelper {
|
||||
* @return (adapterUrl, requestBodyJson, httpMethod, requestParams, pathParams, role, operationId, mockResponseCode->mockResponseBody)
|
||||
*/
|
||||
def unapply(r: Req): Option[(String, JValue, AkkaHttpMethod, Map[String, List[String]], Map[String, String], ApiRole, String, Option[(Int, JValue)])] = {
|
||||
val partPath = r.path.partPath
|
||||
if (!testResponse_?(r) || partPath.headOption != Option(urlPrefix))
|
||||
None
|
||||
val partPath = r.path.partPath//eg: List("dynamic","feature-test")
|
||||
if (!testResponse_?(r) || partPath.headOption != Option(urlPrefix))//if check the Content-Type contains json or not, and check the if it is the `dynamic_endpoints_url_prefix`
|
||||
None //if do not match `URL and Content-Type`, then can not find this endpoint. return None.
|
||||
else {
|
||||
val akkaHttpMethod = HttpMethods.getForKeyCaseInsensitive(r.requestType.method).get
|
||||
val httpMethod = HttpMethod.valueOf(r.requestType.method)
|
||||
// url that match original swagger endpoint.
|
||||
val url = partPath.tail.mkString("/", "/", "")
|
||||
val url = partPath.tail.mkString("/", "/", "") // eg: --> /feature-test
|
||||
val foundDynamicEndpoint: Option[(String, String, Int, ResourceDoc)] = dynamicEndpointInfos
|
||||
.map(_.findDynamicEndpoint(httpMethod, url))
|
||||
.collectFirst {
|
||||
|
||||
@ -9250,8 +9250,15 @@ trait RestConnector_vMar2019 extends Connector with KafkaHelper with MdcLoggable
|
||||
//In RestConnector, we use the headers to propagate the parameters to Adapter. The parameters come from the CallContext.outboundAdapterAuthInfo.userAuthContext
|
||||
//We can set them from UserOauthContext or the http request headers.
|
||||
private[this] implicit def buildHeaders(callContext: Option[CallContext]): List[HttpHeader] = {
|
||||
|
||||
val generalContext = callContext.flatMap(_.toOutboundAdapterCallContext.generalContext).getOrElse(List.empty[BasicGeneralContext])
|
||||
generalContext.map(generalContext => RawHeader(generalContext.key,generalContext.value))
|
||||
val headersFromGeneralContext = generalContext.map(generalContext => RawHeader(generalContext.key,generalContext.value))
|
||||
|
||||
val basicUserAuthContexts: List[BasicUserAuthContext] = callContext.flatMap(_.toOutboundAdapterCallContext.outboundAdapterAuthInfo.flatMap(_.userAuthContext)).getOrElse(List.empty[BasicUserAuthContext])
|
||||
val headersFromUserAuthContext = basicUserAuthContexts.map(userAuthContext => RawHeader(userAuthContext.key,userAuthContext.value))
|
||||
|
||||
headersFromGeneralContext++headersFromUserAuthContext
|
||||
|
||||
}
|
||||
|
||||
private[this] def buildAdapterCallContext(callContext: Option[CallContext]): OutboundAdapterCallContext = callContext.map(_.toOutboundAdapterCallContext).orNull
|
||||
|
||||
@ -333,7 +333,7 @@ Berlin 13359, Germany
|
||||
If you are using this sandbox for a hackathon, we recommend you use <a
|
||||
class="direct-login-documentation-url" data-lift="WebUI.directLoginDocumentationUrl"
|
||||
href="">Direct Login</a>.
|
||||
For an OAuth walkthrough example with sample code, please see <a href="http://obp.sckhoo.com/">here</a>.
|
||||
For an OAuth walkthrough example with sample code, please see <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Python">here</a>.
|
||||
We use OAuth 1.0a. For deepish technical details of the flow <a
|
||||
class="oauth-1-documentation-url" data-lift="WebUI.oauth1DocumentationUrl" href="">see
|
||||
here.</a><br/>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#authorise{
|
||||
padding: 0px 10px;
|
||||
color: white;
|
||||
margin: 80px auto;
|
||||
margin: 80px auto 120px;
|
||||
}
|
||||
|
||||
#authorise h1 {
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
width="120" height="120"
|
||||
alt="python"/></a>
|
||||
<h3>Python</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-DirectLogin-Python">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-DirectLogin-Python">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Django"><img class="showcase-django"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/django.png"
|
||||
width="120" height="120" alt="django"/></a>
|
||||
<h3>Django</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Django">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Django">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Node"><img class="showcase-nodejs"
|
||||
@ -22,7 +22,7 @@
|
||||
width="120" height="120"
|
||||
alt="nodejs"/></a>
|
||||
<h3>NodeJS</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Node">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Node">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-DirectLogin-ReactJs"><img class="showcase-react"
|
||||
@ -30,14 +30,14 @@
|
||||
width="120" height="120"
|
||||
alt="react"/></a>
|
||||
<h3>React</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-DirectLogin-ReactJs">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-DirectLogin-ReactJs">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-NextJS"><img class="showcase-react"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/nextjs.png"
|
||||
width="120" height="120" alt="nextjs"/></a>
|
||||
<h3>Next.JS</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-NextJS">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-NextJS">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-Flutter-DirectLogin"><img class="showcase-react"
|
||||
@ -45,28 +45,28 @@
|
||||
width="120" height="120"
|
||||
alt="flutter"/></a>
|
||||
<h3>Flutter</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-Flutter-DirectLogin">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-Flutter-DirectLogin">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Mac"><img class="showcase-mac"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/mac.png"
|
||||
width="120" height="120" alt="mac"/></a>
|
||||
<h3>Mac</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Mac">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Mac">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-IOS"><img class="showcase-ios"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/ios.png"
|
||||
width="120" height="120" alt="ios"/></a>
|
||||
<h3>IOS</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-IOS">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-IOS">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-SpringBoot"><img class="showcase-springboot"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/springboot.png"
|
||||
width="120" height="120" alt="csharp"/></a>
|
||||
<h3 id="main-showcases-item-java">Java / Spring Boot</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-SpringBoot">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-SpringBoot">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Android"><img class="showcase-android"
|
||||
@ -74,29 +74,28 @@
|
||||
width="120" height="120"
|
||||
alt="android"/></a>
|
||||
<h3>Java / Android</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Android">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Hello-OBP-OAuth1.0a-Android">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/OpenBankProject/Social-Finance"><img class="showcase-scala"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/scala.png"
|
||||
width="120" height="120" alt="scala"/></a>
|
||||
<h3 id="main-showcases-item-scala">Scala / Liftweb</h3>
|
||||
By <a href="https://github.com/OpenBankProject/Social-Finance">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/Social-Finance">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="https://github.com/solonas/OBP-PHP-HelloWorld"><img class="showcase-php"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/php.png"
|
||||
width="120" height="120" alt="php"/></a>
|
||||
<h3>PHP</h3>
|
||||
By <a href="https://github.com/solonas/OBP-PHP-HelloWorld">OpenBankProject</a>
|
||||
<a href="https://github.com/solonas/OBP-PHP-HelloWorld">Source Code</a>
|
||||
</div>
|
||||
<div class="main-showcases-item">
|
||||
<a href="http://obp.sckhoo.com"><img class="showcase-csharp"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/csharp.png"
|
||||
width="120" height="120" alt="csharp"/></a>
|
||||
<h3>C#</h3>
|
||||
By <a href="http://obp.sckhoo.com">OpenBankProject</a>
|
||||
<a href="https://github.com/OpenBankProject/OBP-Hola"><img class="showcase-springboot"
|
||||
src="https://static.openbankproject.com/images/sandbox/showcases/springboot.png"
|
||||
width="120" height="120" alt="csharp"/></a>
|
||||
<h3>Spring Boot (Hola) </h3>
|
||||
<a href="https://github.com/OpenBankProject/OBP-Hola">Source Code</a>
|
||||
</div>
|
||||
|
||||
<p>Please make sure you are using the correct sandbox domain when using the SDKs. In doubt, drop us a line.</p>
|
||||
</div>
|
||||
@ -107,12 +107,13 @@ Berlin 13359, Germany
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="navitem" data-lift="WebUI.headerLogoLeft">
|
||||
<a id ="navitem-logo" class="navlink " href="/" ><img src="/media/images/logo.png" alt="homepage logo"></a>
|
||||
<li data-lift="Nav.item?name=Consumer%20Registration&showEvenIfRestricted=true" class="navitem">
|
||||
<a id ="get-api-key-link" class="navlink" href="#">Link name. Has class "selected" if it's the current page.</a>
|
||||
</li>
|
||||
<li class="navitem">
|
||||
<a class="navlink api-explorer-link" data-lift="WebUI.apiExplorerLink" href="">API Explorer</a>
|
||||
</li>
|
||||
<li data-lift="Nav.item?name=Consumer%20Registration&showEvenIfRestricted=true" class="navitem">
|
||||
<a id ="get-api-key-link" class="navlink" href="#">Link name. Has class "selected" if it's the current page.</a>
|
||||
</li>
|
||||
<li class="navitem">
|
||||
<a class="navlink" id="sandbox-introduction-link" data-lift="WebUI.sandboxIntroductionLink" href="">Introduction</a>
|
||||
</li>
|
||||
@ -153,13 +154,13 @@ Berlin 13359, Germany
|
||||
</div>
|
||||
<ul>
|
||||
<li>
|
||||
<div class="navitem" data-lift="Nav.item?name=Consumer%20Registration&showEvenIfRestricted=true" id="sideba-api-key-div">
|
||||
<a id ="get-api-key-link" class="navlink" href="#">Link name. Has class "selected" if it's the current page.</a>
|
||||
<div class="navitem">
|
||||
<a class="navlink api-explorer-link" data-lift="WebUI.apiExplorerLink" href="">API Explorer</a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<div class="navitem">
|
||||
<a class="navlink api-explorer-link" data-lift="WebUI.apiExplorerLink" href="">API Explorer</a>
|
||||
<div class="navitem" data-lift="Nav.item?name=Consumer%20Registration&showEvenIfRestricted=true" id="sideba-api-key-div">
|
||||
<a id ="get-api-key-link" class="navlink" href="#">Link name. Has class "selected" if it's the current page.</a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user