From 1eaebcaf4b6bc21eb591370f616c281dce140c36 Mon Sep 17 00:00:00 2001
From: Joe Grandja <jgrandja@vmware.com>
Date: Tue, 14 Nov 2023 05:34:43 -0500
Subject: [PATCH] Remove org.webjars dependencies from demo-authorizationserver
 sample

Closes gh-1445
---
 .../samples-demo-authorizationserver.gradle                    | 3 ---
 .../src/main/java/sample/config/DefaultSecurityConfig.java     | 2 +-
 .../src/main/resources/templates/consent.html                  | 2 +-
 .../src/main/resources/templates/device-activate.html          | 2 +-
 .../src/main/resources/templates/device-activated.html         | 2 +-
 .../src/main/resources/templates/error.html                    | 2 +-
 .../src/main/resources/templates/login.html                    | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle
index 7ffc5e3d0..46a3b13d9 100644
--- a/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle
+++ b/samples/demo-authorizationserver/samples-demo-authorizationserver.gradle
@@ -20,9 +20,6 @@ dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 	implementation "org.springframework.boot:spring-boot-starter-jdbc"
 	implementation project(":spring-security-oauth2-authorization-server")
-	implementation "org.webjars:webjars-locator-core"
-	implementation "org.webjars:bootstrap:5.2.3"
-	implementation "org.webjars:jquery:3.6.4"
 	runtimeOnly "com.h2database:h2"
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
diff --git a/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java
index df2bd4c68..7c553744c 100644
--- a/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java
+++ b/samples/demo-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java
@@ -46,7 +46,7 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws
 		http
 			.authorizeHttpRequests(authorize ->
 				authorize
-					.requestMatchers("/assets/**", "/webjars/**", "/login").permitAll()
+					.requestMatchers("/assets/**", "/login").permitAll()
 					.anyRequest().authenticated()
 			)
 			.formLogin(formLogin ->
diff --git a/samples/demo-authorizationserver/src/main/resources/templates/consent.html b/samples/demo-authorizationserver/src/main/resources/templates/consent.html
index 5a4a5f6e9..918a86a42 100644
--- a/samples/demo-authorizationserver/src/main/resources/templates/consent.html
+++ b/samples/demo-authorizationserver/src/main/resources/templates/consent.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Custom consent page - Consent required</title>
-    <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
     <script>
         function cancelConsent() {
             document.consent_form.reset();
diff --git a/samples/demo-authorizationserver/src/main/resources/templates/device-activate.html b/samples/demo-authorizationserver/src/main/resources/templates/device-activate.html
index bea73929d..7540da074 100644
--- a/samples/demo-authorizationserver/src/main/resources/templates/device-activate.html
+++ b/samples/demo-authorizationserver/src/main/resources/templates/device-activate.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Spring Authorization Server sample</title>
-    <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 </head>
 <body>
 <div class="container">
diff --git a/samples/demo-authorizationserver/src/main/resources/templates/device-activated.html b/samples/demo-authorizationserver/src/main/resources/templates/device-activated.html
index ef180ba23..7d4181652 100644
--- a/samples/demo-authorizationserver/src/main/resources/templates/device-activated.html
+++ b/samples/demo-authorizationserver/src/main/resources/templates/device-activated.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Spring Authorization Server sample</title>
-    <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 </head>
 <body>
 <div class="container">
diff --git a/samples/demo-authorizationserver/src/main/resources/templates/error.html b/samples/demo-authorizationserver/src/main/resources/templates/error.html
index eceb5ce05..d2369119b 100644
--- a/samples/demo-authorizationserver/src/main/resources/templates/error.html
+++ b/samples/demo-authorizationserver/src/main/resources/templates/error.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Spring Authorization Server sample</title>
-    <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 </head>
 <body>
 <div class="container">
diff --git a/samples/demo-authorizationserver/src/main/resources/templates/login.html b/samples/demo-authorizationserver/src/main/resources/templates/login.html
index 353315ab3..afa8b5916 100644
--- a/samples/demo-authorizationserver/src/main/resources/templates/login.html
+++ b/samples/demo-authorizationserver/src/main/resources/templates/login.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Spring Authorization Server sample</title>
-    <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
     <link rel="stylesheet" href="/assets/css/signin.css" th:href="@{/assets/css/signin.css}" />
 </head>
 <body>