catch error iri#issue

Author: bourgeoa

src/authn/SolidAuthnLogic.ts

@@ -17,14 +17,11 @@ export class SolidAuthnLogic implements AuthnLogic {
   currentUser(): NamedNode | null {
     const app = appContext()
     if (app.viewingNoAuthPage) {
-      debug.log(`currentUser: viewingNoAuthPage webId=${app.webId}`)
       return sym(app.webId)
     }
     if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
-      debug.log(`currentUser: session webId=${this.session.info.webId}`)
       return sym(this.session.info.webId)
     }
-    debug.log('currentUser: no user found, falling back to offlineTestID')
     return offlineTestID() // null unless testing
   }
 

src/typeIndex/typeIndexLogic.ts

@@ -27,13 +27,15 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
             debug.warn(message)
         }
         let publicTypeIndex
-        if (suggestion) {
-            try {
-                publicTypeIndex = await utilityLogic.followOrCreateLink(user, ns.solid('publicTypeIndex') as NamedNode, suggestion, profile)
-            } catch (err) {
-                const message = `User ${user} has no pointer in profile to publicTypeIndex file.`
-                debug.warn(message)
-            }
+        try {
+            publicTypeIndex =
+                store.any(user, ns.solid('publicTypeIndex'), undefined, profile) ||
+                (suggestion
+                    ? await utilityLogic.followOrCreateLink(user, ns.solid('publicTypeIndex') as NamedNode, suggestion, profile)
+                    : null)
+        } catch (err) {
+            const message = `User ${user} has no pointer in profile to publicTypeIndex file: ${err}`
+            debug.warn(message)
         }
         const publicScopes = publicTypeIndex ? [{ label: 'public', index: publicTypeIndex as NamedNode, agent: user }] : []
 
@@ -62,7 +64,7 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
                         ? await utilityLogic.followOrCreateLink(user, ns.solid('privateTypeIndex') as NamedNode, suggestedPrivateTypeIndex, preferencesFile)
                         : null)
                 } catch (err) {
-                const message = `User ${user} has no pointer in preference file to privateTypeIndex file.`
+                const message = `User ${user} has no pointer in preference file to privateTypeIndex file: ${err}`
                 debug.warn(message)
             }
             privateScopes = privateTypeIndex ? [{ label: 'private', index: privateTypeIndex as NamedNode, agent: user }] : []

test/typeIndexLogic.test.ts

@@ -2,7 +2,7 @@
 * @jest-environment jsdom
 *
 */
-import { Fetcher, Store, sym, UpdateManager } from 'rdflib'
+import { Fetcher, parse, Store, sym, UpdateManager } from 'rdflib'
 import { createAclLogic } from '../src/acl/aclLogic'
 import { createProfileLogic } from '../src/profile/profileLogic'
 import { createTypeIndexLogic} from '../src/typeIndex/typeIndexLogic'
@@ -51,7 +51,7 @@ describe('TypeIndex logic NEW', () => {
         requests = []
         statustoBeReturned = 200
 
-        fetchMock.mockIf(/^https?.*$/, async req => {
+        fetchMock.mockIf(/^(https?|mailto):.*$/, async req => {
 
         if (req.method !== 'GET') {
             requests.push(req)
@@ -131,6 +131,50 @@ describe('TypeIndex logic NEW', () => {
             expect(store.statementsMatching(null, null, null, AlicePrivateTypeIndex).length).toEqual(8)
             expect(store.statementsMatching(null, null, null, AlicePublicTypeIndex).length).toEqual(8)
         })
+        it('uses existing publicTypeIndex when suggestion fails', async () => {
+            const carol = sym('urn:uuid:carol#me')
+            const CarolProfileDoc = carol.doc()
+            const CarolPreferencesFile = sym('https://carol.example.com/settings/prefs.ttl')
+            const CarolPublicTypeIndex = sym('https://carol.example.com/profile/public-type-index.ttl')
+            const CarolPrivateTypeIndex = sym('https://carol.example.com/settings/private-type-index.ttl')
+
+            const CarolProfile = `
+<#me> a vcard:Individual;
+    space:preferencesFile ${CarolPreferencesFile};
+    solid:publicTypeIndex ${CarolPublicTypeIndex}.
+`
+            const CarolPreferences = `
+    ${carol} solid:privateTypeIndex ${CarolPrivateTypeIndex} .
+`
+
+            web[CarolPreferencesFile.uri] = CarolPreferences
+            web[CarolPublicTypeIndex.uri] = `
+:t solid:forClass wf:Tracker; solid:instance <../publicStuff/actionItems.ttl#this> .
+`
+            web[CarolPrivateTypeIndex.uri] = `
+:t solid:forClass wf:Tracker; solid:instance <../privateStuff/ToDo.ttl#this> .
+`
+
+            const util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
+            const profileLogic = {
+                loadProfile: async (user) => {
+                    parse(prefixes + CarolProfile, store, CarolProfileDoc.uri, 'text/turtle')
+                    return user.doc()
+                },
+                silencedLoadPreferences: async () => {
+                    parse(prefixes + CarolPreferences, store, CarolPreferencesFile.uri, 'text/turtle')
+                    return CarolPreferencesFile
+                }
+            }
+            const typeIndexLogicWithStub = createTypeIndexLogic(store, authn, profileLogic as any, util)
+
+            const result = await typeIndexLogicWithStub.loadTypeIndexesFor(carol)
+            expect(result).toEqual([
+                { label: 'public', index: CarolPublicTypeIndex as any, agent: carol as any },
+                { label: 'private', index: CarolPrivateTypeIndex as any, agent: carol as any }
+            ])
+            expect(requests.length).toEqual(0)
+        })
     })
 
     const ClubScopes =