chore(oauth): adapt to OAuth bundle moving out of the whiteboard
diff --git a/oauth/README.md b/oauth/README.md
index 4c47103..c82b1fc 100644
--- a/oauth/README.md
+++ b/oauth/README.md
@@ -1,6 +1,6 @@
# Apache Sling OAuth client sample
-This sample application demonstrates how the [Apache Sling OAuth client](https://github.com/apache/sling-whiteboard/tree/master/org.apache.sling.servlets.oidc-rp)
+This sample application demonstrates how the [Apache Sling OAuth client](https://github.com/apache/sling-org-apache-sling-auth-oauth-client)
bundle can be used. It does so by connecting the Google Cloud APIs using Open ID Connect and to
the GitHub APIs using OAuth 2.0.
@@ -11,11 +11,11 @@
The build requires Java 17.
-First of all, you need to install a SNAPSHOT build of the OIDC client bundle, as it is still in the whiteboard.
+First of all, you need to install a SNAPSHOT build of the OAuth client bundle, as it is still in the whiteboard.
```
-$ git clone https://github.com/apache/sling-whiteboard
-$ cd org.apache.sling.servlets.oidc-rp
+$ git clone https://github.com/apache/sling-org-apache-sling-auth-oauth-client
+$ cd sling-org-apache-sling-auth-oauth-client
$ mvn clean install
```
@@ -90,4 +90,4 @@
$ target/dependency/org.apache.sling.feature.launcher/bin/launcher \
-f target/slingfeature-tmp/feature-app.json \
-D org.apache.felix.configadmin.plugin.interpolation.secretsdir=secrets
-```
\ No newline at end of file
+```
diff --git a/oauth/core/pom.xml b/oauth/core/pom.xml
index 3c7f9c1..1766a5a 100644
--- a/oauth/core/pom.xml
+++ b/oauth/core/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.extensions.oauth-client</artifactId>
+ <artifactId>org.apache.sling.auth.oauth-client</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git a/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/GithubRepositoriesModel.java b/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/GithubRepositoriesModel.java
index d40d893..ab0e1a0 100644
--- a/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/GithubRepositoriesModel.java
+++ b/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/GithubRepositoriesModel.java
@@ -20,11 +20,11 @@
import java.net.URI;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.extensions.oauth_client.ClientConnection;
-import org.apache.sling.extensions.oauth_client.OAuthToken;
-import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
-import org.apache.sling.extensions.oauth_client.OAuthUris;
-import org.apache.sling.extensions.oauth_client.TokenState;
+import org.apache.sling.auth.oauth_client.ClientConnection;
+import org.apache.sling.auth.oauth_client.OAuthToken;
+import org.apache.sling.auth.oauth_client.OAuthTokenStore;
+import org.apache.sling.auth.oauth_client.OAuthUris;
+import org.apache.sling.auth.oauth_client.TokenState;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.injectorspecific.OSGiService;
import org.apache.sling.models.annotations.injectorspecific.SlingObject;
diff --git a/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/impl/YoutubeSearchServlet.java b/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/impl/YoutubeSearchServlet.java
index aecca52..0e2cd54 100644
--- a/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/impl/YoutubeSearchServlet.java
+++ b/oauth/core/src/main/java/org/apache/sling/samples/oauth_demo/impl/YoutubeSearchServlet.java
@@ -25,11 +25,11 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
-import org.apache.sling.extensions.oauth_client.ClientConnection;
-import org.apache.sling.extensions.oauth_client.OAuthToken;
-import org.apache.sling.extensions.oauth_client.OAuthTokenRefresher;
-import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
-import org.apache.sling.extensions.oauth_client.support.OAuthEnabledSlingServlet;
+import org.apache.sling.auth.oauth_client.ClientConnection;
+import org.apache.sling.auth.oauth_client.OAuthToken;
+import org.apache.sling.auth.oauth_client.OAuthTokenRefresher;
+import org.apache.sling.auth.oauth_client.OAuthTokenStore;
+import org.apache.sling.auth.oauth_client.support.OAuthEnabledSlingServlet;
import org.apache.sling.samples.oauth_demo.YoutubeSearchResponse;
import org.apache.sling.servlets.annotations.SlingServletResourceTypes;
import org.jetbrains.annotations.NotNull;
diff --git a/oauth/launcher/pom.xml b/oauth/launcher/pom.xml
index 28d8e68..bfb894b 100644
--- a/oauth/launcher/pom.xml
+++ b/oauth/launcher/pom.xml
@@ -59,7 +59,7 @@
<filesInclude>*.json</filesInclude>
<includeArtifact>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.extensions.oauth-client</artifactId>
+ <artifactId>org.apache.sling.auth.oauth-client</artifactId>
<classifier>app</classifier>
<version>0.1-SNAPSHOT</version>
<type>slingosgifeature</type>
diff --git a/oauth/launcher/src/main/features/launcher.json b/oauth/launcher/src/main/features/launcher.json
index b2b03bf..9ddf3ad 100644
--- a/oauth/launcher/src/main/features/launcher.json
+++ b/oauth/launcher/src/main/features/launcher.json
@@ -5,7 +5,7 @@
"start-order": 25
},
{
- "id": "org.apache.sling/org.apache.sling.extensions.oauth-client/0.1-SNAPSHOT",
+ "id": "org.apache.sling/org.apache.sling.auth.oauth-client/0.1-SNAPSHOT",
"start-order": 24
}
],
@@ -15,7 +15,7 @@
}
],
"configurations": {
- "org.apache.sling.extensions.oauth_client.impl.OidcConnectionImpl~google": {
+ "org.apache.sling.auth.oauth_client.impl.OidcConnectionImpl~google": {
"name": "google",
"baseUrl": "https://accounts.google.com",
"clientId": "$[secret:google/clientId]",
@@ -23,7 +23,7 @@
"scopes": ["openid", "https://www.googleapis.com/auth/youtube.force-ssl"],
"additionalAuthorizationParameters": ["prompt=consent"]
},
- "org.apache.sling.extensions.oauth_client.impl.OAuthConnectionImpl~github": {
+ "org.apache.sling.auth.oauth_client.impl.OAuthConnectionImpl~github": {
"name": "github",
"authorizationEndpoint": "https://github.com/login/oauth/authorize",
"tokenEndpoint": "https://github.com/login/oauth/access_token",
@@ -32,7 +32,7 @@
"scopes": ["user:email"],
"additionalAuthorizationParameters": ["prompt=select_account"]
},
- "org.apache.sling.extensions.oauth_client.impl.JcrUserHomeOAuthTokenStore" : {
+ "org.apache.sling.auth.oauth_client.impl.JcrUserHomeOAuthTokenStore" : {
},
"org.apache.sling.commons.crypto.internal.FilePasswordProvider~oauth": {
"path": "secrets/encrypt/password",
diff --git a/oauth/reference/youtube_search_response.json b/oauth/reference/youtube_search_response.json
new file mode 100644
index 0000000..282866b
--- /dev/null
+++ b/oauth/reference/youtube_search_response.json
@@ -0,0 +1,692 @@
+{
+ "kind": "youtube#searchListResponse",
+ "etag": "qjsgn3rgy6xbgiy_HAE9BuPENr8",
+ "nextPageToken": "CBQQAA",
+ "regionCode": "CH",
+ "pageInfo": {
+ "totalResults": 1000000,
+ "resultsPerPage": 20
+ },
+ "items": [
+ {
+ "kind": "youtube#searchResult",
+ "etag": "0cWaivz0OUBoKerl4OMeZ3KnLI8",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "e8v-EatpD8Y"
+ },
+ "snippet": {
+ "publishedAt": "2014-10-20T09:35:13Z",
+ "channelId": "UC1JxovzTaKG6EJakV9Z-iaw",
+ "title": "Adaptto TSC system - ice drive",
+ "description": "",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/e8v-EatpD8Y/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/e8v-EatpD8Y/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/e8v-EatpD8Y/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Adaptto E-Drive Lab",
+ "liveBroadcastContent": "none",
+ "publishTime": "2014-10-20T09:35:13Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "RF0cs-lhZymU0rTo1J0Faj8-3nk",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "Iq4fL4symHY"
+ },
+ "snippet": {
+ "publishedAt": "2016-08-26T12:14:31Z",
+ "channelId": "UCO1KWAS2I-feCo_mpryV4Ow",
+ "title": "Adaptto Controller Advanced Walkthrough",
+ "description": "THIS DOCUMENT IS THE PROPERTY OF NYX BIKES INC. . IT MUST NOT BE USED, OR REPRODUCED IN WHOLE OR IN ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/Iq4fL4symHY/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/Iq4fL4symHY/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/Iq4fL4symHY/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Nyx Bikes",
+ "liveBroadcastContent": "none",
+ "publishTime": "2016-08-26T12:14:31Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "OmQBWFYkUD9c_zVcz_BW3Gb4c6A",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "q8Q_DJyMw88"
+ },
+ "snippet": {
+ "publishedAt": "2015-10-14T01:29:55Z",
+ "channelId": "UCp1WbWrsdKV_XT-_Jr_7HpA",
+ "title": "Adaptto max-E controller shunt investigation",
+ "description": "Presenting how the current sensing shunt is working on the Adaptto Max-E controller and some highlight about strange behavior ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/q8Q_DJyMw88/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/q8Q_DJyMw88/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/q8Q_DJyMw88/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Doctorbass",
+ "liveBroadcastContent": "none",
+ "publishTime": "2015-10-14T01:29:55Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "JSQVbguTwbBkCZmeacYYHGRQEZ4",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "zs2bXzcebmM"
+ },
+ "snippet": {
+ "publishedAt": "2016-08-19T14:26:21Z",
+ "channelId": "UCO1KWAS2I-feCo_mpryV4Ow",
+ "title": "Adaptto Controller Basic Walkthrough",
+ "description": "THIS DOCUMENT IS THE PROPERTY OF NYX BIKES INC. . IT MUST NOT BE USED, OR REPRODUCED IN WHOLE OR IN ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/zs2bXzcebmM/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/zs2bXzcebmM/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/zs2bXzcebmM/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Nyx Bikes",
+ "liveBroadcastContent": "none",
+ "publishTime": "2016-08-19T14:26:21Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "yO9VRa_BDTJ_oD3mEiwpKjLwWJQ",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "-cmNtBS-n9k"
+ },
+ "snippet": {
+ "publishedAt": "2016-08-16T19:56:09Z",
+ "channelId": "UCO1KWAS2I-feCo_mpryV4Ow",
+ "title": "Adaptto Controller Setup",
+ "description": "THIS DOCUMENT IS THE PROPERTY OF NYX BIKES INC. . IT MUST NOT BE USED OR REPRODUCED IN WHOLE OR IN ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/-cmNtBS-n9k/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/-cmNtBS-n9k/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/-cmNtBS-n9k/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Nyx Bikes",
+ "liveBroadcastContent": "none",
+ "publishTime": "2016-08-16T19:56:09Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "KzTONd4_wnf3xwXl_Lzqz_RpkWc",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "cNC5HpzHhFY"
+ },
+ "snippet": {
+ "publishedAt": "2014-11-20T13:42:19Z",
+ "channelId": "UC1JxovzTaKG6EJakV9Z-iaw",
+ "title": "Infineon vs Adaptto sound profiles",
+ "description": "",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/cNC5HpzHhFY/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/cNC5HpzHhFY/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/cNC5HpzHhFY/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Adaptto E-Drive Lab",
+ "liveBroadcastContent": "none",
+ "publishTime": "2014-11-20T13:42:19Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "MD8YhMMOTMhpe528FMNa7sPEsE4",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "GRMmEH1WKv4"
+ },
+ "snippet": {
+ "publishedAt": "2021-12-20T10:37:45Z",
+ "channelId": "UC5Jtnz_XkHS77s29HpuTv9A",
+ "title": "Lightning Talk: Why adaptTo() (the API call) is a good thing",
+ "description": "Recorded at #adaptTo() 2021 https://adapt.to/2021/en/schedule/lightning-talks/why-adaptto-the-api-call-is-a-good-thing.html ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/GRMmEH1WKv4/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/GRMmEH1WKv4/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/GRMmEH1WKv4/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "adaptTo() Conference - powered by diva-e",
+ "liveBroadcastContent": "none",
+ "publishTime": "2021-12-20T10:37:45Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "bCp2QCU2I2kUqjwcuA54xHdSgVA",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "vPFUuLNXmcE"
+ },
+ "snippet": {
+ "publishedAt": "2020-03-27T13:08:56Z",
+ "channelId": "UCYK9yrav2aijiiPW_sULwrg",
+ "title": "Глубокая модернизация электробайка Sur-Ron X. Контроллер Adaptto Max-E - в топку!! Часть I [4K]",
+ "description": "Как экономить на покупках в интернете до 8,5%, с помощью ePN Cashback? Листай вниз! Ссылка на блок питания ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/vPFUuLNXmcE/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/vPFUuLNXmcE/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/vPFUuLNXmcE/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Андрей Ващенко",
+ "liveBroadcastContent": "none",
+ "publishTime": "2020-03-27T13:08:56Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "uDrdGFpbu5Z11O_exy0IcwA02DY",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "oYPFvHgwALo"
+ },
+ "snippet": {
+ "publishedAt": "2024-08-28T06:01:11Z",
+ "channelId": "UC7zyAgVNs5ILjbrEZW_Ldsw",
+ "title": "Thailand Focus 2024 (4/8) How Thailand's Capital Market Can Adapt to the Changing World",
+ "description": "August 28, 2024 How Thailand's Capital Market Can Adapt to the Changing World by Dr. Pornanong Budsaratragoon, Secretary ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/oYPFvHgwALo/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/oYPFvHgwALo/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/oYPFvHgwALo/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "SET Thailand",
+ "liveBroadcastContent": "none",
+ "publishTime": "2024-08-28T06:01:11Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "sheQXGHTBIfxSRLaPekRlw7Elmw",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "ADv6uNJcZAs"
+ },
+ "snippet": {
+ "publishedAt": "2014-08-06T21:23:01Z",
+ "channelId": "UCYY7iokzWjmrRT57cVcNadQ",
+ "title": "Stealth Bomber Electric Bike and Adaptto - 120km/h",
+ "description": "Doing some runs on a russian countryside road. Modified Bomber Range: 160km with 280pcs 18650 LG DBHE2 cells. 20s14p ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/ADv6uNJcZAs/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/ADv6uNJcZAs/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/ADv6uNJcZAs/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Alex S",
+ "liveBroadcastContent": "none",
+ "publishTime": "2014-08-06T21:23:01Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "hbOcEnLRfDwMMbz9TSYiGvrPr5k",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "YblW2M2BGl8"
+ },
+ "snippet": {
+ "publishedAt": "2017-04-20T20:53:08Z",
+ "channelId": "UC9QK0Y_yFdIfYTdKp6FEMVg",
+ "title": "NEW 14kW EBIKE CONTROLLER | ADAPTTO MAX-E INSTALL",
+ "description": "Bike Stuff Mudhugger rear mudguard - https://amzn.to/2EeSolt Mudhugger front mudguard - https://amzn.to/2IrrJEf Handlebar ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/YblW2M2BGl8/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/YblW2M2BGl8/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/YblW2M2BGl8/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "andy kirby",
+ "liveBroadcastContent": "none",
+ "publishTime": "2017-04-20T20:53:08Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "NUFvRumKhVDe8FLfRN6Ug_uTzOQ",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "PRZL5jZOSvs"
+ },
+ "snippet": {
+ "publishedAt": "2024-08-29T16:30:08Z",
+ "channelId": "UCk8gzAOGprcGAFMWGzZ2zQw",
+ "title": "‘A REAL SHAME!’ How will Barcelona and Hansi Flick adapt to Marc Bernal’s injury? | ESPN FC",
+ "description": "ESPN FC's Julien Laurens joins Gab Marcotti on the Gab & Juls Show to debate whether Barcelona can challenge Real Madrid in ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/PRZL5jZOSvs/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/PRZL5jZOSvs/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/PRZL5jZOSvs/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "ESPN UK",
+ "liveBroadcastContent": "none",
+ "publishTime": "2024-08-29T16:30:08Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "BUdKGLi2iRx2GDqSJU-sdKDuMiw",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "AwJSVuqvwRA"
+ },
+ "snippet": {
+ "publishedAt": "2017-09-28T10:49:03Z",
+ "channelId": "UC5Jtnz_XkHS77s29HpuTv9A",
+ "title": "[extract] Continuous content updates – adaptTo() 2017",
+ "description": "Recorded at #adaptTo() 2017 – visit https://adapt.to for more information – full length: https://youtu.be/cIwNkZbQlto Continuous ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/AwJSVuqvwRA/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/AwJSVuqvwRA/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/AwJSVuqvwRA/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "adaptTo() Conference - powered by diva-e",
+ "liveBroadcastContent": "none",
+ "publishTime": "2017-09-28T10:49:03Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "FCgFs5yQoUM4UR-_CEesqXtc3Po",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "ZCKRjP_DMII"
+ },
+ "snippet": {
+ "publishedAt": "2016-03-03T16:17:52Z",
+ "channelId": "UCsooa4yRKGN_zEE8iknghZA",
+ "title": "Can wildlife adapt to climate change? - Erin Eastwood",
+ "description": "View full lesson: http://ed.ted.com/lessons/can-wildlife-adapt-to-climate-change-erin-eastwood With rising temperatures and seas, ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/ZCKRjP_DMII/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/ZCKRjP_DMII/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/ZCKRjP_DMII/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "TED-Ed",
+ "liveBroadcastContent": "none",
+ "publishTime": "2016-03-03T16:17:52Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "FW42KsXdm_MQKEGBSDxIgLpyzn8",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "GJs2ICqP1-0"
+ },
+ "snippet": {
+ "publishedAt": "2015-03-13T15:15:07Z",
+ "channelId": "UCYY7iokzWjmrRT57cVcNadQ",
+ "title": "Regen at 25Amps with Adaptto max-e",
+ "description": "Motor: MXUS3k V2 4T Battery74V nominal Controller settings: 160DC/400Phase amps Music: ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/GJs2ICqP1-0/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/GJs2ICqP1-0/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/GJs2ICqP1-0/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Alex S",
+ "liveBroadcastContent": "none",
+ "publishTime": "2015-03-13T15:15:07Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "9NFWgU9Nfz8Id2DDVAdQXC9dj60",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "RMxAsZr6A6A"
+ },
+ "snippet": {
+ "publishedAt": "2016-03-14T16:25:51Z",
+ "channelId": "UCO1KWAS2I-feCo_mpryV4Ow",
+ "title": "How to assemble an Adaptto controller to a NYX Frame kit",
+ "description": "HOW TO ASSEMBLE AN ADAPTTO CONTROLLER TO A NYX FRAME KIT ? TOOLS needed -Measuring tape -Center Punch ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/RMxAsZr6A6A/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/RMxAsZr6A6A/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/RMxAsZr6A6A/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Nyx Bikes",
+ "liveBroadcastContent": "none",
+ "publishTime": "2016-03-14T16:25:51Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "ee42eEnLixpOohN5WRuWipcV7FU",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "w_MeaAnvgrs"
+ },
+ "snippet": {
+ "publishedAt": "2014-06-15T00:46:35Z",
+ "channelId": "UCYY7iokzWjmrRT57cVcNadQ",
+ "title": "Bomber Strip Down - Adaptto",
+ "description": "How to fit one stealth bomber electric bikes in a hatchback. Audio: Weezer - Island in the Sun Y.V.E. 48 - On The Road.",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/w_MeaAnvgrs/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/w_MeaAnvgrs/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/w_MeaAnvgrs/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Alex S",
+ "liveBroadcastContent": "none",
+ "publishTime": "2014-06-15T00:46:35Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "7jbhYpuLorH9fKwCjulFQRBMXZM",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "2gXPm_ABf08"
+ },
+ "snippet": {
+ "publishedAt": "2017-09-21T06:47:21Z",
+ "channelId": "UCRZYbsP_FDj-fpSBGikAJIg",
+ "title": "Adaptto Display Temperatur gauge is rising up and down",
+ "description": "",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/2gXPm_ABf08/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/2gXPm_ABf08/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/2gXPm_ABf08/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "ernst grunder",
+ "liveBroadcastContent": "none",
+ "publishTime": "2017-09-21T06:47:21Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "sWkEiKGKw5vp6Sv71YNpENufNdM",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "mk_KobzOiHQ"
+ },
+ "snippet": {
+ "publishedAt": "2021-07-13T11:03:02Z",
+ "channelId": "UC6iwikUHDiGqqgVnzyLMW1Q",
+ "title": "Adapt To This CLIP | X-Men: First Class 2011 | Movie HD Scene",
+ "description": "OUR MONTHLY GIVEAWAY? https://bit.ly/3xyMVCc Adapt To This CLIP | X-Men: First Class 2011 | Movie HD Scene DON'T ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/mk_KobzOiHQ/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/mk_KobzOiHQ/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/mk_KobzOiHQ/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Dc Comics & Marvel",
+ "liveBroadcastContent": "none",
+ "publishTime": "2021-07-13T11:03:02Z"
+ }
+ },
+ {
+ "kind": "youtube#searchResult",
+ "etag": "GVee0shyLd-VpJPB0gFFvk5COT0",
+ "id": {
+ "kind": "youtube#video",
+ "videoId": "SN_YnKlV3Mw"
+ },
+ "snippet": {
+ "publishedAt": "2014-08-06T22:37:57Z",
+ "channelId": "UCYY7iokzWjmrRT57cVcNadQ",
+ "title": "Stealth Bomber Electric Bike - Russian Countryside bashing Adaptto",
+ "description": "Modified Bomber Range: 160km with 280 18650 LG DBHE2 cells. 20s14p gives you 84V 35Ah Charging time 2h. 12kW Adaptto ...",
+ "thumbnails": {
+ "default": {
+ "url": "https://i.ytimg.com/vi/SN_YnKlV3Mw/default.jpg",
+ "width": 120,
+ "height": 90
+ },
+ "medium": {
+ "url": "https://i.ytimg.com/vi/SN_YnKlV3Mw/mqdefault.jpg",
+ "width": 320,
+ "height": 180
+ },
+ "high": {
+ "url": "https://i.ytimg.com/vi/SN_YnKlV3Mw/hqdefault.jpg",
+ "width": 480,
+ "height": 360
+ }
+ },
+ "channelTitle": "Alex S",
+ "liveBroadcastContent": "none",
+ "publishTime": "2014-08-06T22:37:57Z"
+ }
+ }
+ ]
+}
diff --git a/oauth/ui.apps/src/main/content/jcr_root/apps/oauth-demo/components/welcome/welcome.html b/oauth/ui.apps/src/main/content/jcr_root/apps/oauth-demo/components/welcome/welcome.html
index 6a7d6d7..d99b597 100644
--- a/oauth/ui.apps/src/main/content/jcr_root/apps/oauth-demo/components/welcome/welcome.html
+++ b/oauth/ui.apps/src/main/content/jcr_root/apps/oauth-demo/components/welcome/welcome.html
@@ -22,7 +22,7 @@
</sly>
<h2>About the demo</h2>
- <p>This application shows the expected basic usage of the <a class="underline" href="https://github.com/apache/sling-whiteboard/tree/master/org.apache.sling.servlets.oidc-rp"">Sling OAuth Client bundle (whiteboard)</a></em></p>
+ <p>This application shows the expected basic usage of the <a class="underline" href="https://github.com/apache/sling-org-apache-sling-auth-oauth-client">Sling OAuth Client bundle</a></em></p>
<p>It exposes two pages:
<ul class="list-disc list-inside">
@@ -41,4 +41,4 @@
<p>See this project's <a class="underline" href="https://github.com/apache/sling-samples/blob/master/oauth/README.md">README</a> for more detailed instructions.</p>
</main>
</body>
-</html>
\ No newline at end of file
+</html>
