From 3a4bb730e5acab7b9cb5eb70c7675045a3c66b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 7 Jun 2022 07:54:27 +0200 Subject: [PATCH] feature/Add Access Token to User Information Page --- .../main/scala/code/model/dataAccess/AuthUser.scala | 11 +++++++++++ .../src/main/scala/code/snippet/UserInformation.scala | 5 ++++- obp-api/src/main/webapp/user-information.html | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 048256905..5ad281316 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -511,6 +511,17 @@ import net.liftweb.util.Helpers._ } else { "This information is not allowed at this instance." } + } + def getAccessTokenOfCurrentUser(): String = { + if(APIUtil.getPropsAsBoolValue("openid_connect.show_tokens", false)) { + AuthUser.currentUser match { + case Full(authUser) => + TokensOpenIDConnect.tokens.vend.getOpenIDConnectTokenByAuthUser(authUser.id.get).map(_.accessToken).getOrElse("") + case _ => "" + } + } else { + "This information is not allowed at this instance." + } } /** diff --git a/obp-api/src/main/scala/code/snippet/UserInformation.scala b/obp-api/src/main/scala/code/snippet/UserInformation.scala index 0bec120d0..d326ec730 100644 --- a/obp-api/src/main/scala/code/snippet/UserInformation.scala +++ b/obp-api/src/main/scala/code/snippet/UserInformation.scala @@ -39,6 +39,7 @@ import scala.xml.NodeSeq class UserInformation extends MdcLoggable { private object idTokenVar extends RequestVar("") + private object accessTokenVar extends RequestVar("") private object providerVar extends RequestVar("") private object devEmailVar extends RequestVar("") private object usernameVar extends RequestVar("") @@ -54,11 +55,13 @@ class UserInformation extends MdcLoggable { devEmailVar.set(user.emailAddress) providerVar.set(user.provider) idTokenVar.set(AuthUser.getIDTokenOfCurrentUser) + accessTokenVar.set(AuthUser.getAccessTokenOfCurrentUser) "form" #> { "#user-info-username" #> SHtml.text(usernameVar, usernameVar(_)) & "#user-info-provider" #> SHtml.text(providerVar.is, providerVar(_)) & "#user-info-email" #> SHtml.text(devEmailVar, devEmailVar(_)) & - "#user-info-id-token" #> SHtml.text(idTokenVar, idTokenVar(_)) + "#user-info-id-token" #> SHtml.text(idTokenVar, idTokenVar(_)) & + "#user-info-access-token" #> SHtml.text(idTokenVar, accessTokenVar(_)) } & "#register-consumer-success" #> "" } } diff --git a/obp-api/src/main/webapp/user-information.html b/obp-api/src/main/webapp/user-information.html index d60122c6d..40a84c086 100644 --- a/obp-api/src/main/webapp/user-information.html +++ b/obp-api/src/main/webapp/user-information.html @@ -53,6 +53,10 @@ Berlin 13359, Germany +
+ + +