WebID UI #16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,14 +8,25 @@ | |
| { | ||
| "imports": { | ||
| "oauth4webapi": "https://cdn.jsdelivr.net/npm/oauth4webapi@3.8.6/+esm", | ||
| "dpop": "https://cdn.jsdelivr.net/npm/dpop@2.1.1/+esm", | ||
| "n3": "https://esm.sh/n3@2.0.3", | ||
| "@rdfjs/wrapper": "https://cdn.jsdelivr.net/npm/@rdfjs/wrapper@0.34.0/+esm" | ||
| } | ||
| } | ||
| </script> | ||
| <script type="module"> | ||
| import { DPoPTokenProvider, ReactiveFetchManager } from "./dist/mod.js" | ||
| import "./dist/registerElements.js" | ||
|
|
||
| /* Reactive fetch infrastructure */ | ||
| const ui = document.querySelector("authorization-code-flow") | ||
| const issuerUi = document.querySelector("idp-picker") | ||
| const callbackUri = new URL("/callback.html", location.href).toString() | ||
|
|
||
| const dPoPTokenProvider = new DPoPTokenProvider(callbackUri, ui.getCode.bind(ui), issuerUi.getIssuer.bind(issuerUi)) | ||
|
|
||
| const fetch = new ReactiveFetchManager([dPoPTokenProvider]).fetch | ||
|
|
||
|
Comment on lines
+21
to
+29
Collaborator
Author
There was a problem hiding this comment. Substantial change here is that in the demo, global Fun fact: Some Solid servers return |
||
| /* Page functionality: Buttons */ | ||
| document.addEventListener("DOMContentLoaded", () => | ||
| document.querySelectorAll("button.fetch").forEach(button => | ||
|
|
@@ -27,7 +38,8 @@ | |
| console.log(`Start fetch to ${uri}`) | ||
|
|
||
| try { | ||
| // const response = await fetch(uri, {signal: AbortSignal.timeout(5000)}) | ||
| const response = await fetch(uri) | ||
| console.log(`Fetch succeeded to ${uri}`, response) | ||
| } catch (e) { | ||
| console.error(`Fetch failed to ${uri}`, e) | ||
|
|
@@ -46,26 +58,6 @@ | |
| // f("http://localhost:3000/a/profile/"), | ||
| ]) | ||
| }) | ||
| </script> | ||
| </head> | ||
| <body> | ||
|
|
@@ -77,6 +69,7 @@ | |
| <button class="fetch" value="https://teamid.live/langsamu/settings/">teamid.live (CSS)</button> | ||
| <button class="fetch" value="https://langsamu.solidweb.org/settings/">solidweb.org (NSS 6.0.0)</button> | ||
| <button class="fetch" value="https://langsamu.privatedatapod.com/settings/">privatedatapod (CSS)</button> | ||
| <button class="fetch" value="https://solidweb.me/langsamu/profile/">solidweb.me (CSS)</button> | ||
| <button class="fetch" value="http://localhost:3000/a/profile/">localhost (CSS)</button> | ||
| <authorization-code-flow> | ||
| <span slot="new-text">USER INTERACTION NEEDED TO LAUNCH AUTHORIZATION CODE FLOW IN NEW WINDOW.</span> | ||
|
|
@@ -94,7 +87,17 @@ | |
| <option value="https://teamid.live"></option> | ||
| <option value="https://solidweb.org"></option> | ||
| <option value="https://privatedatapod.com"></option> | ||
| <option value="https://solidweb.me/"></option> | ||
| <option value="http://localhost:3000"></option> | ||
| <webid-picker slot="webid-picker"> | ||
| <option value="https://YOUR_USERNAME.solidcommunity.net/profile/card#me"></option> | ||
| <option value="https://id.inrupt.com/YOUR_USERNAME"></option> | ||
| <option value="https://YOUR_USERNAME.datapod.igrant.io/profile/card#me"></option> | ||
| <option value="https://YOUR_USERNAME.solidweb.app/profile/card.jsonld#me"></option> | ||
| <option value="https://teamid.live/YOUR_USERNAME/profile/card#me"></option> | ||
| <option value="https://YOUR_USERNAME.solidweb.org/profile/card#me"></option> | ||
| <option value="https://solidweb.me/YOUR_USERNAME/profile/card#me"></option> | ||
| </webid-picker> | ||
|
Comment on lines
+92
to
+100
Collaborator
Author
There was a problem hiding this comment. Interesting pattern of composing custom elements: The new |
||
| </idp-picker> | ||
| </body> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import type { DatasetCore, Quad, Term } from "@rdfjs/types" | ||
|
|
||
| // TODO: Eliminate once N3 stops trying to nodejs the browser | ||
| export class SimpleDataset implements DatasetCore { | ||
|
Collaborator
Author
There was a problem hiding this comment. I'm not sure what the proper way to do this is. I find N3 unusable in a modern module way. Maybe I just don't know how to configure package dependencies and/or import maps and/or unpackagers. Specifically N3 seems to be pulling in |
||
| readonly #quads: Quad[] | ||
|
|
||
| constructor(quads: Quad[]) { | ||
| this.#quads = quads | ||
| } | ||
|
|
||
| get size() { | ||
| return this.#quads.length | ||
| } | ||
|
|
||
| add(quad: Quad) { | ||
| if (!this.has(quad)) { | ||
| this.#quads.push(quad) | ||
| } | ||
|
|
||
| return this | ||
| } | ||
|
|
||
| delete(quad: Quad) { | ||
| const index = this.#quads.findIndex(q => q.equals(quad)) | ||
| if (index >= 0) { | ||
| this.#quads.splice(index, 1) | ||
| } | ||
|
|
||
| return this | ||
| } | ||
|
|
||
| has(quad: Quad) { | ||
| return this.#quads.some(q => q.equals(quad)) | ||
| } | ||
|
|
||
| match(subject?: Term | null, predicate?: Term | null, object?: Term | null, graph?: Term | null) { | ||
| return new SimpleDataset(this.#quads.filter(q => | ||
| (!subject || q.subject.equals(subject)) && | ||
| (!predicate || q.predicate.equals(predicate)) && | ||
| (!object || q.object.equals(object)) && | ||
| (!graph || q.graph.equals(graph)))) | ||
| } | ||
|
|
||
| [Symbol.iterator]() { | ||
| return this.#quads[Symbol.iterator]() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| import { Mutex } from "./Mutex.js" | ||
| import { WebIdRequestCancelledError } from "./WebIdRequestCancelledError.js" | ||
|
|
||
| const onlyOnce = {once: true} | ||
| const searchString = "YOUR_USERNAME" | ||
| const html = ` | ||
| <dialog> | ||
| <fieldset> | ||
| <legend> | ||
| <slot name="legend">WebID required</slot> | ||
| </legend> | ||
| <p> | ||
| <span> | ||
| <slot name="description">The application needs a WebID so it can derive an Authorization Server URI from the profile to handle the following request URI.</slot> | ||
| </span> | ||
| <details> | ||
| <summary> | ||
| <slot name="summary">Request URI</slot> | ||
| </summary> | ||
| <code></code> | ||
| </details> | ||
| </p> | ||
| <form method="dialog"> | ||
| <label> | ||
| <span> | ||
| <slot name="label">WebID</slot> | ||
| </span> | ||
| <input autofocus required type="url" list="autocomplete"> | ||
| <datalist id="autocomplete"></datalist> | ||
| </label> | ||
| <button> | ||
| <slot name="ok-button">OK</slot> | ||
| </button> | ||
| <button type="button" id="cancel"> | ||
| <slot name="cancel-button">Cancel</slot> | ||
| </button> | ||
| </form> | ||
| </fieldset> | ||
| </dialog> | ||
| ` | ||
|
|
||
| export class WebIdPicker extends HTMLElement { | ||
|
Collaborator
Author
There was a problem hiding this comment. A very simple custom element that is quite similar to the existing IdP picker. It's a modal that asks for a WebID URI, with an optional |
||
| readonly #mutex = new Mutex | ||
| #dialog!: HTMLDialogElement | ||
| #input!: HTMLInputElement | ||
| #code!: HTMLElement | ||
|
|
||
| /** @ignore */ | ||
| connectedCallback() { | ||
| const template = this.ownerDocument.createElement("template") | ||
| template.innerHTML = html | ||
|
|
||
| const shadow = this.attachShadow({mode: "closed"}) | ||
| shadow.appendChild(this.ownerDocument.importNode(template.content, true)) | ||
|
|
||
| this.#dialog = shadow.querySelector("dialog")! | ||
| this.#input = shadow.querySelector("input")! | ||
| this.#code = shadow.querySelector("code")! | ||
|
|
||
| shadow.querySelector("form")!.addEventListener("submit", () => this.#dialog.returnValue = this.#input.value) | ||
| shadow.querySelector("#cancel")!.addEventListener("click", () => this.#dialog.close()) | ||
| this.#input.addEventListener("change", () => { | ||
| if (this.#input.value.includes(searchString)) { | ||
| const start = this.#input.value.indexOf(searchString) | ||
| this.#input.setSelectionRange(start, start + searchString.length, "forward") | ||
| } | ||
| }) | ||
|
Comment on lines
+62
to
+67
Collaborator
Author
There was a problem hiding this comment. If the |
||
|
|
||
| for (const option of this.querySelectorAll(":scope > option")) { | ||
| shadow.querySelector("datalist")!.appendChild(option.cloneNode()) | ||
| } | ||
| } | ||
|
|
||
| async getWebId(request: Request): Promise<URL> { | ||
| using _ = await this.#mutex.acquire() | ||
|
|
||
| this.#input.value = "" | ||
| this.#code.innerText = request.url | ||
| this.#dialog.returnValue = "" | ||
| this.#dialog.showModal() | ||
|
|
||
| const {promise, reject, resolve} = Promise.withResolvers<URL>() | ||
|
|
||
| const onClose = () => { | ||
| request.signal.removeEventListener("abort", onAbort) | ||
| if (this.#dialog.returnValue !== "") { | ||
| resolve(new URL(this.#dialog.returnValue)) | ||
| } else { | ||
| reject(new WebIdRequestCancelledError(request)) | ||
| } | ||
| } | ||
| const onAbort = () => { | ||
| this.#dialog.removeEventListener("close", onClose) | ||
| this.#dialog.close() | ||
| reject(request.signal.reason) | ||
| } | ||
|
|
||
| request.signal.addEventListener("abort", onAbort, onlyOnce) | ||
| this.#dialog.addEventListener("close", onClose, onlyOnce) | ||
|
|
||
| return await promise | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { ReactiveAuthenticationError } from "./ReactiveAuthenticationError.js" | ||
|
|
||
| export class WebIdRequestCancelledError extends ReactiveAuthenticationError { | ||
| constructor(public request: Request, cause?: any) { | ||
| super("WebID request cancelled", cause) | ||
| this.name = "WebIdRequestCancelledError" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As before, this is for the demo only. Just so I don't have to worry about transpilation and bundling at the moment.