@pod-os/elements 0.29.1-rc.e9091c9.0 → 0.30.1-rc.3f29969.0

package/dist/collection/components/pos-type-router/selectToolsForTypes.js

@@ -1,72 +1,73 @@
 export const AvailableTools = {
     Generic: {
         element: 'pos-app-generic',
-        label: 'Generic',
+        label: 'Data',
         icon: 'list-ul',
-        types: [],
+        types: [], // since this is included everywhere, it does not need to specify types
     },
     RdfDocument: {
         element: 'pos-app-rdf-document',
-        label: 'RDF Document',
-        icon: 'file-earmark-ruled',
+        label: 'Things',
+        icon: 'diagram-2',
         types: [
             {
-                type: 'http://www.w3.org/2007/ont/link#RDFDocument',
+                uri: 'http://www.w3.org/2007/ont/link#RDFDocument',
                 priority: 20,
             },
         ],
     },
     DocumentViewer: {
         element: 'pos-app-document-viewer',
-        label: 'Document',
+        label: 'Doc',
         icon: 'file-text',
         types: [
             {
-                type: mimeType('application/pdf'),
+                uri: mimeType('application/pdf'),
                 priority: 30,
             },
             {
-                type: 'http://www.w3.org/2007/ont/link#Document',
+                uri: 'http://www.w3.org/2007/ont/link#Document',
                 priority: 10,
             },
         ],
     },
     ImageViewer: {
         element: 'pos-app-image-viewer',
-        label: 'Image',
+        label: 'Pic',
         icon: 'file-image',
         types: [
             {
-                type: 'http://purl.org/dc/terms/Image',
+                uri: 'http://purl.org/dc/terms/Image',
                 priority: 20,
             },
         ],
     },
     LdpContainer: {
         element: 'pos-app-ldp-container',
-        label: 'Container',
+        label: 'Content',
         icon: 'folder',
-        types: [{ type: 'http://www.w3.org/ns/ldp#Container', priority: 30 }],
+        types: [{ uri: 'http://www.w3.org/ns/ldp#Container', priority: 30 }],
     },
 };
 function mimeType(mimeType) {
     return 'http://www.w3.org/ns/iana/media-types/' + mimeType + '#Resource';
 }
 export function selectToolsForTypes(types) {
-    return [
-        ...Object.values(AvailableTools)
-            .map(tool => {
-            const matchingTypes = tool.types.filter(typePriority => types.some(type => type.uri === typePriority.type));
-            if (matchingTypes.length > 0) {
-                const highestPriority = Math.max(...matchingTypes.map(t => t.priority));
-                return { tool, priority: highestPriority };
-            }
-            return null;
-        })
-            .filter(Boolean),
-        { tool: AvailableTools.Generic, priority: 0 },
-    ]
-        .toSorted((a, b) => b.priority - a.priority)
-        .map(item => item.tool);
+    const typeUris = new Set(types.map(type => type.uri));
+    return Object.values(AvailableTools)
+        .map(maxPriorityFor(typeUris))
+        .filter(onlyRelevant)
+        .toSorted(byPriority)
+        .map(it => it.tool)
+        .concat(AvailableTools.Generic);
 }
+const maxPriorityFor = (typeUris) => tool => ({
+    tool,
+    priority: maxPriority(tool.types, typeUris),
+});
+function maxPriority(types, typeUris) {
+    return types.filter(type => typeUris.has(type.uri)).reduce((max, type) => Math.max(max, type.priority), 0);
+}
+const onlyRelevant = (it) => it.priority > 0;
+const byPriority = (a, b) => b.priority - a.priority;
 //# sourceMappingURL=selectToolsForTypes.js.map

package/dist/collection/components/pos-type-router/selectToolsForTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectToolsForTypes.js","sourceRoot":"","sources":["../../../../src/components/pos-type-router/selectToolsForTypes.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,OAAO,EAAE;QACP,OAAO,EAAE,iBAAiB;QAC1B,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,EAAE;KACV;IACD,WAAW,EAAE;QACX,OAAO,EAAE,sBAAsB;QAC/B,KAAK,EAAE,cAAc;QACrB,IAAI,EAAE,oBAAoB;QAC1B,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,6CAA6C;gBACnD,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE,yBAAyB;QAClC,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC;gBACjC,QAAQ,EAAE,EAAE;aACb;YACD;gBACE,IAAI,EAAE,0CAA0C;gBAChD,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,WAAW,EAAE;QACX,OAAO,EAAE,sBAAsB;QAC/B,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,gCAAgC;gBACtC,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,uBAAuB;QAChC,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oCAAoC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;KACtE;CACF,CAAC;AAEF,SAAS,QAAQ,CAAC,QAAgB;IAChC,OAAO,wCAAwC,GAAG,QAAQ,GAAG,WAAW,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAgB;IAClD,OAAO;QACL,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;aAC7B,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5G,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACxE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;YAC7C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAC;QAClB,EAAE,IAAI,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE;KAC9C;SACE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;SAC3C,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import { RdfType } from '@pod-os/core';\n\ninterface TypePriority {\n  type: string;\n  priority: number;\n}\n\nexport interface ToolConfig {\n  element: string;\n  label: string;\n  icon: string;\n  types: TypePriority[];\n}\n\nexport const AvailableTools: { [key: string]: ToolConfig } = {\n  Generic: {\n    element: 'pos-app-generic',\n    label: 'Generic',\n    icon: 'list-ul',\n    types: [],\n  },\n  RdfDocument: {\n    element: 'pos-app-rdf-document',\n    label: 'RDF Document',\n    icon: 'file-earmark-ruled',\n    types: [\n      {\n        type: 'http://www.w3.org/2007/ont/link#RDFDocument',\n        priority: 20,\n      },\n    ],\n  },\n  DocumentViewer: {\n    element: 'pos-app-document-viewer',\n    label: 'Document',\n    icon: 'file-text',\n    types: [\n      {\n        type: mimeType('application/pdf'),\n        priority: 30,\n      },\n      {\n        type: 'http://www.w3.org/2007/ont/link#Document',\n        priority: 10,\n      },\n    ],\n  },\n  ImageViewer: {\n    element: 'pos-app-image-viewer',\n    label: 'Image',\n    icon: 'file-image',\n    types: [\n      {\n        type: 'http://purl.org/dc/terms/Image',\n        priority: 20,\n      },\n    ],\n  },\n  LdpContainer: {\n    element: 'pos-app-ldp-container',\n    label: 'Container',\n    icon: 'folder',\n    types: [{ type: 'http://www.w3.org/ns/ldp#Container', priority: 30 }],\n  },\n};\n\nfunction mimeType(mimeType: string) {\n  return 'http://www.w3.org/ns/iana/media-types/' + mimeType + '#Resource';\n}\n\nexport function selectToolsForTypes(types: RdfType[]) {\n  return [\n    ...Object.values(AvailableTools)\n      .map(tool => {\n        const matchingTypes = tool.types.filter(typePriority => types.some(type => type.uri === typePriority.type));\n        if (matchingTypes.length > 0) {\n          const highestPriority = Math.max(...matchingTypes.map(t => t.priority));\n          return { tool, priority: highestPriority };\n        }\n        return null;\n      })\n      .filter(Boolean),\n    { tool: AvailableTools.Generic, priority: 0 },\n  ]\n    .toSorted((a, b) => b.priority - a.priority)\n    .map(item => item.tool);\n}\n"]}
+{"version":3,"file":"selectToolsForTypes.js","sourceRoot":"","sources":["../../../../src/components/pos-type-router/selectToolsForTypes.ts"],"names":[],"mappings":"AAqDA,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,OAAO,EAAE;QACP,OAAO,EAAE,iBAAiB;QAC1B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,EAAE,EAAE,uEAAuE;KACnF;IACD,WAAW,EAAE;QACX,OAAO,EAAE,sBAAsB;QAC/B,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE;YACL;gBACE,GAAG,EAAE,6CAA6C;gBAClD,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,cAAc,EAAE;QACd,OAAO,EAAE,yBAAyB;QAClC,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE;YACL;gBACE,GAAG,EAAE,QAAQ,CAAC,iBAAiB,CAAC;gBAChC,QAAQ,EAAE,EAAE;aACb;YACD;gBACE,GAAG,EAAE,0CAA0C;gBAC/C,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,WAAW,EAAE;QACX,OAAO,EAAE,sBAAsB;QAC/B,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE;YACL;gBACE,GAAG,EAAE,gCAAgC;gBACrC,QAAQ,EAAE,EAAE;aACb;SACF;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,uBAAuB;QAChC,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,oCAAoC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;KACrE;CACF,CAAC;AAEF,SAAS,QAAQ,CAAC,QAAgB;IAChC,OAAO,wCAAwC,GAAG,QAAQ,GAAG,WAAW,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAgB;IAClD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtD,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;SACjC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;SAC7B,MAAM,CAAC,YAAY,CAAC;SACpB,QAAQ,CAAC,UAAU,CAAC;SACpB,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;SAClB,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,QAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CACvD,CAAC;IACC,IAAI;IACJ,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;CAC5C,CAAiB,CAAC;AAErB,SAAS,WAAW,CAAC,KAAqB,EAAE,QAAqB;IAC/D,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7G,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,EAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,CAAC,CAAe,EAAE,CAAe,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC","sourcesContent":["import { RdfType } from '@pod-os/core';\n\n/**\n * Describes a tool that can be used\n */\nexport interface ToolConfig {\n  /**\n   * The HTML custom element that renders the tool\n   */\n  element: string;\n  /**\n   * A human-readable short label to identify the tool\n   */\n  label: string;\n  /**\n   * An icon to identify the tool\n   * Available values see https://shoelace.style/components/icon/#default-icons\n   */\n  icon: string;\n  /**\n   * The types that can be handled by that tool\n   */\n  types: TypePriority[];\n}\n\n/**\n * Describes how well a given RDF type can be handled\n */\ninterface TypePriority {\n  /**\n   * URI identifying the RDF type\n   */\n  uri: string;\n  /**\n   * how well that type can be handled (higher values === better fit)\n   */\n  priority: number;\n}\n\n/**\n * Describes the priority (order) that applies to a tool\n */\ninterface ToolPriority {\n  /**\n   * The tool in question\n   */\n  tool: ToolConfig;\n  /**\n   * The priority given to the tool (higher values === better fit)\n   */\n  priority: number;\n}\n\nexport const AvailableTools: { [key: string]: ToolConfig } = {\n  Generic: {\n    element: 'pos-app-generic',\n    label: 'Data',\n    icon: 'list-ul',\n    types: [], // since this is included everywhere, it does not need to specify types\n  },\n  RdfDocument: {\n    element: 'pos-app-rdf-document',\n    label: 'Things',\n    icon: 'diagram-2',\n    types: [\n      {\n        uri: 'http://www.w3.org/2007/ont/link#RDFDocument',\n        priority: 20,\n      },\n    ],\n  },\n  DocumentViewer: {\n    element: 'pos-app-document-viewer',\n    label: 'Doc',\n    icon: 'file-text',\n    types: [\n      {\n        uri: mimeType('application/pdf'),\n        priority: 30,\n      },\n      {\n        uri: 'http://www.w3.org/2007/ont/link#Document',\n        priority: 10,\n      },\n    ],\n  },\n  ImageViewer: {\n    element: 'pos-app-image-viewer',\n    label: 'Pic',\n    icon: 'file-image',\n    types: [\n      {\n        uri: 'http://purl.org/dc/terms/Image',\n        priority: 20,\n      },\n    ],\n  },\n  LdpContainer: {\n    element: 'pos-app-ldp-container',\n    label: 'Content',\n    icon: 'folder',\n    types: [{ uri: 'http://www.w3.org/ns/ldp#Container', priority: 30 }],\n  },\n};\n\nfunction mimeType(mimeType: string) {\n  return 'http://www.w3.org/ns/iana/media-types/' + mimeType + '#Resource';\n}\n\nexport function selectToolsForTypes(types: RdfType[]) {\n  const typeUris = new Set(types.map(type => type.uri));\n\n  return Object.values(AvailableTools)\n    .map(maxPriorityFor(typeUris))\n    .filter(onlyRelevant)\n    .toSorted(byPriority)\n    .map(it => it.tool)\n    .concat(AvailableTools.Generic);\n}\n\nconst maxPriorityFor = (typeUris: Set<string>) => tool =>\n  ({\n    tool,\n    priority: maxPriority(tool.types, typeUris),\n  }) as ToolPriority;\n\nfunction maxPriority(types: TypePriority[], typeUris: Set<string>): number {\n  return types.filter(type => typeUris.has(type.uri)).reduce((max, type) => Math.max(max, type.priority), 0);\n}\n\nconst onlyRelevant = (it: ToolPriority) => it.priority > 0;\n\nconst byPriority = (a: ToolPriority, b: ToolPriority) => b.priority - a.priority;\n"]}

package/dist/components/pos-app2.js

@@ -2514,8 +2514,6 @@ const redirectForLogin = async (idp, redirect_uri, client_details) => {
     // RFC 6749 - Section 3.1.2 - sanitize redirect_uri
     const redirect_uri_ = new URL(redirect_uri);
     const redirect_uri_sane = redirect_uri_.origin + redirect_uri_.pathname + redirect_uri_.search;
-    // RFC 9207 iss check: remember the identity provider (idp) / issuer (iss)
-    sessionStorage.setItem("idp", idp);
     // lookup openid configuration of idp
     const idp_origin = new URL(idp).origin;
     const openid_configuration = await fetch(`${idp_origin}/.well-known/openid-configuration`)
@@ -2525,6 +2523,13 @@ const redirectForLogin = async (idp, redirect_uri, client_details) => {
         }
         return response.json();
     });
+    // RFC 9207 iss check: remember the identity provider (idp) / issuer (iss) - relaxing for trailing slash
+    const issuer = openid_configuration["issuer"];
+    const trim_trailing_slash = (url) => (url.endsWith('/') ? url.slice(0, -1) : url);
+    if (trim_trailing_slash(idp) !== trim_trailing_slash(issuer)) { // expected idp matches received issuer mod trailing slash?
+        throw new Error("RFC 9207 - iss != idp - " + issuer + " != " + idp);
+    }
+    sessionStorage.setItem("idp", issuer);
     // remember token endpoint
     sessionStorage.setItem("token_endpoint", openid_configuration["token_endpoint"]);
     // remember jwks_uri for later token verification