Fixed auth flow and added scaffolding vite config.

package.json

@@ -31,7 +31,8 @@
   },
   "devDependencies": {
     "admin": "workspace:./admin",
-    "docs": "workspace:./doc"
+    "docs": "workspace:./doc",
+    "ui": "workspace:./ui"
   },
   "engines": {
     "node": ">=18.18.2",

pnpm-lock.yaml

@@ -18,6 +18,9 @@ importers:
       docs:
         specifier: workspace:./doc
         version: link:doc
+      ui:
+        specifier: workspace:./ui
+        version: link:ui
 
   admin:
     devDependencies:
@@ -348,6 +351,15 @@ importers:
         specifier: ^5.4.3
         version: 5.4.3
 
+  ui:
+    devDependencies:
+      typescript:
+        specifier: ^5.2.2
+        version: 5.4.3
+      vite:
+        specifier: ^5.2.0
+        version: 5.2.3
+
 packages:
 
   /@aashutoshrathi/word-wrap@1.2.6:

pnpm-workspace.yaml

@@ -3,3 +3,4 @@ packages:
   - admin
   - bin
   - doc
+  - ui

src/node/security/OAuth2Provider.ts

@@ -27,7 +27,6 @@ const configuration: Configuration = {
     ],
     scopes: ['openid', 'profile', 'email'],
     findAccount: async (ctx, id) => {
-        console.log("Finding account", id)
         return {
             accountId: id,
             claims: () => ({
@@ -71,7 +70,6 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
             const {login, password} = (await formid.parse(req))[0]
             const {prompt, jti, session, params, grantId} = await oidc.interactionDetails(req, res);
 
-            console.log("Session is", session)
 
             switch (prompt.name) {
                 case 'login': {
@@ -131,8 +129,7 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
             }
             await next();
         } catch (err) {
-            console.log(err)
-            return next(err);
+            return res.writeHead(500).end(err.message);
         }
     })
 
@@ -143,10 +140,8 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
                 uid, prompt, params, session,
             } = await oidc.interactionDetails(req, res);
 
-            console.log("Params are", params)
             params["state"] = uid
 
-            console.log("Prompt is", prompt)
             switch (prompt.name) {
                 case 'login': {
                     res.redirect(format({
@@ -156,7 +151,6 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
                     break
                 }
                 case 'consent': {
-                    console.log("Consent")
                     res.redirect(format({
                         pathname: '/views/consent',
                         query: params as ParsedUrlQuery
@@ -180,22 +174,7 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
         res.sendFile(path.join(settings.root,'src','static', 'oidc','consent.html'));
     })
 
-    args.app.get('/interaction/:uid/confirm', async (req, res) => {
-        const {uid, prompt, params} = await oidc.interactionDetails(req, res);
-        console.log('interaction', uid, prompt, params);
-        res.render('interaction', {
-            uid,
-            prompt,
-            params,
-            title: 'Authorize',
-            client: await oidc.Client.find(params.client_id!),
-        });
-    })
-
-    args.app.get('/interaction/:uid', async (req, res) => {
-        return res.sendFile(path.join(settings.root,'src','static', 'oidc','login.html'));
-    })
-
+    /*
     oidc.on('authorization.error', (ctx, error) => {
         console.log('authorization.error', error);
     })
@@ -211,7 +190,7 @@ export const expressCreateServer = async (hookName: string, args: ArgsExpressTyp
     })
     oidc.on('revocation.error', (ctx, error) => {
         console.log('revocation.error', error);
-    })
+    })*/
     args.app.use("/oidc", oidc.callback());
     //cb();
 }

src/node/security/OIDCAdapter.ts

@@ -68,7 +68,6 @@ class MemoryAdapter implements Adapter{
 
     find(id: string): Promise<AdapterPayload | void | undefined> {
         const foundSession = storage.get(this.key(id)) as AdapterPayload;
-        console.log("find", id, foundSession);
         if (storage.has(this.key(id))){
             return Promise.resolve<AdapterPayload>(storage.get(this.key(id)) as AdapterPayload);
         }
@@ -76,7 +75,6 @@ class MemoryAdapter implements Adapter{
     }
 
     findByUserCode(userCode: string) {
-        console.log("findByUserCode", userCode);
         const id = storage.get(userCodeKeyFor(userCode)) as string;
         return this.find(id);
     }
@@ -99,14 +97,11 @@ class MemoryAdapter implements Adapter{
     }
 
     findByUid(uid: string): Promise<AdapterPayload | void | undefined> {
-        console.log("findByUid", uid);
         for(const [_, value] of storage.entries()){
             if(typeof value ==="object" && "uid" in value && value.uid === uid){
-                console.log("found", value);
                 return Promise.resolve(value);
             }
         }
-        console.log("not found");
         return Promise.resolve(undefined);
     }
 

src/static/oidc/login.html

@@ -26,17 +26,14 @@
                 body: JSON.stringify(data),
             }).then(response => {
                 if (response.ok) {
-                    return response.json();
-                }
-                throw new Error('Network response was not ok.');
-            }).then(data => {
-                if (data.status === 'success') {
-                    window.location.href = data.redirect;
+                    if (response.redirected) {
+                        window.location.href = response.url;
+                    }
                 } else {
                     document.getElementById('error').innerText = "Error signing in";
                 }
             }).catch(error => {
-                console.error('There has been a problem with your fetch operation:', error);
+                document.getElementById('error').innerText = "Error signing in"+error;
             });
         });
     }

ui/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

ui/consent.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + TS</title>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="/src/consent.ts"></script>
+</body>
+</html>

ui/login.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + TS</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

ui/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "ui",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "typescript": "^5.2.2",
+    "vite": "^5.2.0"
+  }
+}

ui/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

ui/src/main.ts

@@ -0,0 +1,3 @@
+import './style.css'
+
+

ui/src/style.css

@@ -0,0 +1,96 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vanilla:hover {
+  filter: drop-shadow(0 0 2em #3178c6aa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}

ui/src/typescript.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="32" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 256"><path fill="#007ACC" d="M0 128v128h256V0H0z"></path><path fill="#FFF" d="m56.612 128.85l-.081 10.483h33.32v94.68h23.568v-94.68h33.321v-10.28c0-5.69-.122-10.444-.284-10.566c-.122-.162-20.4-.244-44.983-.203l-44.74.122l-.121 10.443Zm149.955-10.742c6.501 1.625 11.459 4.51 16.01 9.224c2.357 2.52 5.851 7.111 6.136 8.208c.08.325-11.053 7.802-17.798 11.988c-.244.162-1.22-.894-2.317-2.52c-3.291-4.795-6.745-6.867-12.028-7.233c-7.76-.528-12.759 3.535-12.718 10.321c0 1.992.284 3.17 1.097 4.795c1.707 3.536 4.876 5.649 14.832 9.956c18.326 7.883 26.168 13.084 31.045 20.48c5.445 8.249 6.664 21.415 2.966 31.208c-4.063 10.646-14.14 17.879-28.323 20.276c-4.388.772-14.79.65-19.504-.203c-10.28-1.828-20.033-6.908-26.047-13.572c-2.357-2.6-6.949-9.387-6.664-9.874c.122-.163 1.178-.813 2.356-1.504c1.138-.65 5.446-3.129 9.509-5.485l7.355-4.267l1.544 2.276c2.154 3.29 6.867 7.801 9.712 9.305c8.167 4.307 19.383 3.698 24.909-1.26c2.357-2.153 3.332-4.388 3.332-7.68c0-2.966-.366-4.266-1.91-6.501c-1.99-2.845-6.054-5.242-17.595-10.24c-13.206-5.69-18.895-9.224-24.096-14.832c-3.007-3.25-5.852-8.452-7.03-12.8c-.975-3.617-1.22-12.678-.447-16.335c2.723-12.76 12.353-21.659 26.25-24.3c4.51-.853 14.994-.528 19.424.569Z"></path></svg>

ui/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

ui/tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src"]
+}

ui/vite.config.ts

@@ -0,0 +1,14 @@
+// vite.config.js
+import { resolve } from 'path'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+    build: {
+        rollupOptions: {
+            input: {
+                main: resolve(__dirname, 'index.html'),
+                nested: resolve(__dirname, 'nested/index.html'),
+            },
+        },
+    },
+})