From 6438dcc9bbadae577d22df78172634e70cd7e6b0 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Thu, 5 Oct 2023 18:05:04 +0530
Subject: [PATCH] ES-4 (#432)

Co-authored-by: ase-101 <>
---
 .../src/main/resources/application-dev.properties     |  6 +++---
 .../src/main/resources/application-local.properties   |  6 +++---
 esignet-service/src/main/resources/logback.xml        | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 esignet-service/src/main/resources/logback.xml

diff --git a/esignet-service/src/main/resources/application-dev.properties b/esignet-service/src/main/resources/application-dev.properties
index 7d0301734..373624233 100644
--- a/esignet-service/src/main/resources/application-dev.properties
+++ b/esignet-service/src/main/resources/application-dev.properties
@@ -140,9 +140,9 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 180,
   'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, 'consented': 120 }
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 mosipbox.public.url=http://localhost:8088
-mosip.esignet.discovery.issuer-id=${mosipbox.public.url}
+mosip.esignet.discovery.issuer-id=${mosipbox.public.url}${server.servlet.path}
 
-mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+mosip.esignet.oauth.key-values={'issuer': '${mosipbox.public.url}' ,\
   \ 'authorization_endpoint': '${mosipbox.public.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosipbox.public.url}${server.servlet.path}/oauth/token' , \
   \ 'jwks_uri' : '${mosipbox.public.url}${server.servlet.path}/oauth/jwks.json' , \
@@ -153,7 +153,7 @@ mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}'
   \ 'grant_types_supported' : ${mosip.esignet.supported.grant.types},\
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}}
 
-mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+mosip.esignet.discovery.key-values={'issuer': '${mosipbox.public.url}' ,\
   \ 'authorization_endpoint': '${mosipbox.public.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosipbox.public.url}${server.servlet.path}/oauth/token' ,\
   \ 'userinfo_endpoint' : '${mosipbox.public.url}${server.servlet.path}/oidc/userinfo' ,\
diff --git a/esignet-service/src/main/resources/application-local.properties b/esignet-service/src/main/resources/application-local.properties
index 9bd40b09d..9f67f471b 100644
--- a/esignet-service/src/main/resources/application-local.properties
+++ b/esignet-service/src/main/resources/application-local.properties
@@ -146,9 +146,9 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 180,
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
 mosipbox.public.url=http://localhost:8088
-mosip.esignet.discovery.issuer-id=${mosipbox.public.url}
+mosip.esignet.discovery.issuer-id=${mosipbox.public.url}${server.servlet.path}
 
-mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+mosip.esignet.oauth.key-values={'issuer': '${mosipbox.public.url}' ,\
   \ 'authorization_endpoint': '${mosipbox.public.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosipbox.public.url}${server.servlet.path}/oauth/token' , \
   \ 'jwks_uri' : '${mosipbox.public.url}${server.servlet.path}/oauth/jwks.json' , \
@@ -159,7 +159,7 @@ mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}'
   \ 'grant_types_supported' : ${mosip.esignet.supported.grant.types},\
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}}
 
-mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+mosip.esignet.discovery.key-values={'issuer': '${mosipbox.public.url}' ,\
   \ 'authorization_endpoint': '${mosipbox.public.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosipbox.public.url}${server.servlet.path}/oauth/token' ,\
   \ 'userinfo_endpoint' : '${mosipbox.public.url}${server.servlet.path}/oidc/userinfo' ,\
diff --git a/esignet-service/src/main/resources/logback.xml b/esignet-service/src/main/resources/logback.xml
new file mode 100644
index 000000000..b9dfc23e6
--- /dev/null
+++ b/esignet-service/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+    <springProperty scope="context" name="appName" source="spring.application.name"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
\ No newline at end of file