From 40579252ee95283ec82199aafd908ebe7c9d71c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Fri, 21 May 2021 11:28:04 +0200
Subject: [PATCH] bugfix/Fiy OIDC library version issue; Uncomment login GUI

---
 obp-api/pom.xml                               |  4 +--
 obp-api/src/main/webapp/oauth/authorize.html  | 28 +++++++++----------
 .../main/webapp/templates-hidden/_login.html  | 28 +++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 2246aea1e..92fbb7418 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -324,7 +324,7 @@
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
-      <version>9.7</version>
+      <version>9.9.3</version>
     </dependency>
     <dependency>
       <groupId>com.github.OpenBankProject</groupId>
@@ -347,7 +347,7 @@
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>oauth2-oidc-sdk</artifactId>
-      <version>7.4</version>
+      <version>9.5.2</version>
     </dependency>
     <dependency>
       <groupId>com.vladsch.flexmark</groupId>
diff --git a/obp-api/src/main/webapp/oauth/authorize.html b/obp-api/src/main/webapp/oauth/authorize.html
index 482f7f091..397c5fbc8 100644
--- a/obp-api/src/main/webapp/oauth/authorize.html
+++ b/obp-api/src/main/webapp/oauth/authorize.html
@@ -43,20 +43,20 @@
 						<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0">Register</a>
 					</div>
 
-<!--					<div class ="login-or"> or Login with OpenID : </div>-->
-<!--					<hr>-->
-<!--					<div data-lift="OpenIDConnectSnippet.showFirstButton">-->
-<!--						<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">-->
-<!--							<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText"  class="btn btn-danger">OIDC 1</a>-->
-<!--							</div>-->
-<!--						</div>-->
-<!--					</div>-->
-<!--					<div data-lift="OpenIDConnectSnippet.showSecondButton">-->
-<!--						<div data-lift="OpenidConnectInvoke.linkButtonSecondProvider">-->
-<!--							<div class="authorise-button-oidc"> <a id="open-id-connect-button-2" data-lift="OpenIDConnectSnippet.getSecondButtonText" class="btn btn-danger">OIDC 2</a>-->
-<!--							</div>-->
-<!--						</div>-->
-<!--					</div>-->
+					<div class ="login-or"> or Login with OpenID : </div>
+					<hr>
+					<div data-lift="OpenIDConnectSnippet.showFirstButton">
+						<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">
+							<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText"  class="btn btn-danger">OIDC 1</a>
+							</div>
+						</div>
+					</div>
+					<div data-lift="OpenIDConnectSnippet.showSecondButton">
+						<div data-lift="OpenidConnectInvoke.linkButtonSecondProvider">
+							<div class="authorise-button-oidc"> <a id="open-id-connect-button-2" data-lift="OpenIDConnectSnippet.getSecondButtonText" class="btn btn-danger">OIDC 2</a>
+							</div>
+						</div>
+					</div>
 					
 				</form>
 			</div>
diff --git a/obp-api/src/main/webapp/templates-hidden/_login.html b/obp-api/src/main/webapp/templates-hidden/_login.html
index 41a52bd00..4517637b6 100644
--- a/obp-api/src/main/webapp/templates-hidden/_login.html
+++ b/obp-api/src/main/webapp/templates-hidden/_login.html
@@ -45,20 +45,20 @@
 				<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0">Register</a>
 			</div>
 
-<!--			<div class ="login-or"> or Login with OpenID : </div>-->
-<!--			<hr>-->
-<!--			<div data-lift="OpenIDConnectSnippet.showFirstButton">-->
-<!--				<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">-->
-<!--					<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText"  class="btn btn-danger">OIDC 1</a>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--			</div>-->
-<!--			<div data-lift="OpenIDConnectSnippet.showSecondButton">-->
-<!--				<div data-lift="OpenidConnectInvoke.linkButtonSecondProvider">-->
-<!--					<div class="authorise-button-oidc"> <a id="open-id-connect-button-2" data-lift="OpenIDConnectSnippet.getSecondButtonText" class="btn btn-danger">OIDC 2</a>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--			</div>-->
+			<div class ="login-or"> or Login with OpenID : </div>
+			<hr>
+			<div data-lift="OpenIDConnectSnippet.showFirstButton">
+				<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">
+					<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText"  class="btn btn-danger">OIDC 1</a>
+					</div>
+				</div>
+			</div>
+			<div data-lift="OpenIDConnectSnippet.showSecondButton">
+				<div data-lift="OpenidConnectInvoke.linkButtonSecondProvider">
+					<div class="authorise-button-oidc"> <a id="open-id-connect-button-2" data-lift="OpenIDConnectSnippet.getSecondButtonText" class="btn btn-danger">OIDC 2</a>
+					</div>
+				</div>
+			</div>
 		</form>
 	</div>
 </div>