Merge branch 'develop' of https://github.com/hongwei1/OBP-API into hw-develop

This commit is contained in:
shuang 2019-04-11 22:38:24 +08:00
commit b16ddee934
4 changed files with 14 additions and 0 deletions

View File

@ -87,6 +87,7 @@ class ConsumerRegistration extends MdcLoggable {
def showResults(consumer : Consumer) = {
val urlOAuthEndpoint = APIUtil.getPropsValue("hostname", "") + "/oauth/initiate"
val urlDirectLoginEndpoint = APIUtil.getPropsValue("hostname", "") + "/my/logins/direct"
val createDirectLoginToken = APIUtil.getPropsValue("webui_create_directlogin_token_url", "")
//thanks for registering, here's your key, etc.
"#app-consumer_id *" #> consumer.id.get &
"#app-name *" #> consumer.name.get &
@ -100,6 +101,8 @@ class ConsumerRegistration extends MdcLoggable {
"#oauth-endpoint a *" #> urlOAuthEndpoint &
"#oauth-endpoint a [href]" #> urlOAuthEndpoint &
"#directlogin-endpoint a *" #> urlDirectLoginEndpoint &
"#create-directlogin a *" #> createDirectLoginToken &
"#create-directlogin a [href]" #> createDirectLoginToken &
"#directlogin-endpoint a [href]" #> urlDirectLoginEndpoint &
"#post-consumer-registration-more-info-link a *" #> registrationMoreInfoText &
"#post-consumer-registration-more-info-link a [href]" #> registrationMoreInfoUrl &
@ -206,6 +209,7 @@ class ConsumerRegistration extends MdcLoggable {
val directLoginDocumentationUrl = APIUtil.getPropsValue("webui_direct_login_documentation_url", apiExplorerUrl + "/glossary#Direct-Login")
val oauthDocumentationUrl = APIUtil.getPropsValue("webui_oauth_1_documentation_url", apiExplorerUrl + "/glossary#OAuth-1.0a")
val oauthEndpointUrl = thisApiInstance + "/oauth/initiate"
val createDirectLoginTokenUrl = APIUtil.getPropsValue("webui_create_directlogin_token_url", "")
val directLoginEndpointUrl = thisApiInstance + "/my/logins/direct"
val registrationMessage = s"Thank you for registering a Consumer on $thisApiInstance. \n" +
s"Email: ${registered.developerEmail.get} \n" +
@ -216,6 +220,7 @@ class ConsumerRegistration extends MdcLoggable {
s"Consumer Secret : ${consumerSecretOrMessage} \n" +
s"OAuth Endpoint: ${oauthEndpointUrl} \n" +
s"OAuth Documentation: ${directLoginDocumentationUrl} \n" +
s"Get Direct Login Token: ${createDirectLoginTokenUrl} \n" +
s"Direct Login Endpoint: ${directLoginEndpointUrl} \n" +
s"Direct Login Documentation: ${oauthDocumentationUrl} \n" +
s"$registrationMoreInfoText: $registrationMoreInfoUrl"

View File

@ -152,6 +152,10 @@ class WebUI extends MdcLoggable{
".sofi-link a [href]" #> scala.xml.Unparsed(APIUtil.getPropsValue("webui_sofi_url", ""))
}
// CreateDirectLoginToken
def createDirectLoginToken: CssSel = {
".create-direct-login-token-link a [href]" #> scala.xml.Unparsed(APIUtil.getPropsValue("webui_create_directlogin_token_url", ""))
}
// Points to the documentation. Probably a sandbox specific link is good.
def apiDocumentationLink: CssSel = {

View File

@ -126,6 +126,10 @@ Berlin 13359, Germany
<div class="col-xs-12 col-sm-4">OAuth Documentation</div>
<div class="col-xs-12 col-sm-8"><a href="https://github.com/OpenBankProject/OBP-API/wiki/OAuth-1.0-Server">How to use OAuth for OpenBankProject</a></div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">Get Direct Login Token</div>
<div class="col-xs-12 col-sm-8"><span id="create-directlogin"><a href="#">endpoint</a></span></div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">Direct Login Endpoint</div>
<div class="col-xs-12 col-sm-8"><span id="directlogin-endpoint"><a href="#">endpoint</a></span></div>

View File

@ -39,6 +39,7 @@ Berlin 13359, Germany
</div>
<div id="main-about-buttons">
<a href="/consumer-registration" class="btn btn-default">GET API KEY</a>
<a class="create-direct-login-token-link btn btn-default" data-lift="WebUI.createDirectLoginToken" href="">GET DIRECT LOGIN TOKEN</a>
<a class="api-explorer-link btn btn-default" data-lift="WebUI.apiExplorerLink" href="">API EXPLORER</a>
<a class="sofi-link btn btn-default" data-lift="WebUI.sofiLink" href="">SOFIT</a>
</div>