profile-pane 3.1.2-e3347eef → 3.1.2-f880e98a

package/lib/ContactsCard.d.ts

@@ -2,5 +2,6 @@ import { DataBrowserContext } from 'pane-registry';
 import { AddressBooksData, ContactData } from './contactsTypes';
 import ContactsModuleRdfLib from '@solid-data-modules/contacts-rdflib';
 export declare const createAddressBookUriSelectorDialog: (context: DataBrowserContext, contactsModule: ContactsModuleRdfLib, contactData: ContactData, addressBooksData: AddressBooksData) => HTMLDialogElement;
+export declare const handleContactExistsByName: (context: DataBrowserContext, addressBooksData: AddressBooksData, contactData: ContactData, contactExistsByNameUri: string, fromRegisteredAddressBook: boolean) => Boolean;
 export declare function getButtonContainer(context: DataBrowserContext): HTMLDivElement;
 //# sourceMappingURL=ContactsCard.d.ts.map

package/lib/ContactsCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContactsCard.d.ts","sourceRoot":"","sources":["../src/ContactsCard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAsB,gBAAgB,EAAE,WAAW,EAAa,MAAM,iBAAiB,CAAA;AAC9F,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAQtE,eAAO,MAAM,kCAAkC,GAAI,SAAS,kBAAkB,EAC5E,gBAAgB,oBAAoB,EACpC,aAAa,WAAW,EACxB,kBAAkB,gBAAgB,KACjC,iBAuCF,CAAA;AAw0BD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,kBAAkB,GAC1B,cAAc,CAIhB"}
+{"version":3,"file":"ContactsCard.d.ts","sourceRoot":"","sources":["../src/ContactsCard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAsB,gBAAgB,EAAE,WAAW,EAAa,MAAM,iBAAiB,CAAA;AAC9F,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAUtE,eAAO,MAAM,kCAAkC,GAAI,SAAS,kBAAkB,EAC5E,gBAAgB,oBAAoB,EACpC,aAAa,WAAW,EACxB,kBAAkB,gBAAgB,KACjC,iBAuCF,CAAA;AAgvBD,eAAO,MAAM,yBAAyB,GACpC,SAAS,kBAAkB,EAC3B,kBAAkB,gBAAgB,EAClC,aAAa,WAAW,EACxB,wBAAwB,MAAM,EAC9B,2BAA2B,OAAO,KACjC,OAkEF,CAAA;AAuDD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,kBAAkB,GAC1B,cAAc,CAIhB"}

package/lib/ContactsCard.js

@@ -5,10 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAddressBookUriSelectorDialog = void 0;
 exports.getButtonContainer = getButtonContainer;
+exports.handleContactExistsByName = void 0;
 var _contactsHelpers = require("./contactsHelpers");
+var _contactsPane = require("contacts-pane");
 var _buttonsHelper = require("./buttonsHelper");
 var _texts = require("./texts");
 var _contactsErrors = require("./contactsErrors");
+var _rdflib = require("rdflib");
 const CONTACTS_POPUP_OVERLAY_ID = 'contacts-popup-overlay';
 const CONTACTS_OVERLAY_ACTIVE_CLASS = 'contactsOverlayActive';
 const createAddressBookUriSelectorDialog = (context, contactsModule, contactData, addressBooksData) => {
@@ -269,8 +272,8 @@ const createNewContactCreationButton = (context, contactsModule, addressBooksDat
   const setButtonOnClickHandler = async event => {
     event.preventDefault();
     const contactExistsByWebID = (0, _contactsHelpers.checkIfContactExistsByWebID)(addressBooksData, contactData.webID);
-    const contactExistsByName = (0, _contactsHelpers.checkIfContactExistsByName)(addressBooksData, contactData.name);
-    const contactExistsHandled = handleContactExists(context, contactsModule, addressBooksData, contactData, contactExistsByWebID, contactExistsByName);
+    const contactExistsByNameUri = (0, _contactsHelpers.checkIfContactExistsByName)(addressBooksData, contactData.name);
+    const contactExistsHandled = handleContactExistsFromNonRegisteredAddressBook(context, addressBooksData, contactData, contactExistsByWebID, contactExistsByNameUri);
     if (contactExistsHandled) return;
     let selectedAddressBookUri = null;
     let selectedGroupUris = [];
@@ -288,7 +291,7 @@ const createNewContactCreationButton = (context, contactsModule, addressBooksDat
         groupUris: selectedGroupUris
       };
       try {
-        const contactUri = await (0, _contactsHelpers.createContactInAddressBook)(context, contactsModule, addressBooksData, contactData, selectedAddressBookUris);
+        const contactUri = await (0, _contactsHelpers.createContactInAddressBook)(context, contactsModule, contactData, selectedAddressBookUris);
         finalizeContactEntry(context, addressBooksData, contactData, contactUri);
       } catch (error) {
         (0, _contactsErrors.addErrorToErrorDisplay)(context, `${_texts.errorContactCreation}\n${error}`);
@@ -368,31 +371,35 @@ const createNewAddressBookForm = (context, addressBooksData, contactsModule, con
   const newAddressBookEventListener = async event => {
     event.preventDefault();
     let enteredAddressBookUri = null;
-    let newGroupUri = null;
+    let newGroupNode = null;
     const addressNameField = context.dom.querySelector('#addressBookNameInput');
 
     // @ts-ignore
-    const enteredAddressName = addressNameField.value;
+    const enteredAddressName = sanitizeInput(addressNameField.value);
+    // @ts-ignore
+    addressNameField.value = enteredAddressName;
     const addressContainerField = context.dom.querySelector('#addressBookContainerInput');
 
     // @ts-ignore
-    const enteredAddressContainer = addressContainerField.value;
+    const enteredAddressContainer = sanitizeInput(addressContainerField.value);
+    // @ts-ignore
+    addressContainerField.value = enteredAddressContainer;
     const groupNameField = context.dom.querySelector('#groupNameInput');
     // @ts-ignore
-    const enteredGroupName = groupNameField.value;
+    const enteredGroupName = sanitizeInput(groupNameField.value);
+    // @ts-ignore
+    groupNameField.value = enteredGroupName;
     if (enteredAddressName) {
       // add addressbook first 
       try {
         enteredAddressBookUri = await (0, _contactsHelpers.handleAddressBookCreation)(context, enteredAddressContainer, enteredAddressName);
         const books = await (0, _contactsHelpers.addANewAddressBookUriToAddressBooks)(context, contactsModule, addressBooksData, enteredAddressBookUri);
         if (enteredGroupName) {
-          newGroupUri = await contactsModule.createNewGroup({
-            addressBookUri: enteredAddressBookUri,
-            groupName: enteredGroupName
-          });
+          const selectedAddressBookNode = new _rdflib.NamedNode(enteredAddressBookUri);
+          newGroupNode = await (0, _contactsPane.saveNewGroup)(selectedAddressBookNode, enteredGroupName);
           const groupAdded = await (0, _contactsHelpers.addGroupToAddressBookData)(addressBooksData, enteredAddressBookUri, {
             name: enteredGroupName,
-            uri: newGroupUri
+            uri: newGroupNode.value
           });
           if (!groupAdded) {
             (0, _contactsErrors.addErrorToErrorDisplay)(context, _texts.errorGroupCreation);
@@ -416,7 +423,7 @@ const createNewAddressBookForm = (context, addressBooksData, contactsModule, con
           const groupCreationButton = context.dom.getElementById('contacts-create-group-button');
           groupCreationButton.remove();
           groupListDiv.appendChild(createGroupButton(context, {
-            uri: newGroupUri,
+            uri: newGroupNode.value,
             name: enteredGroupName
           }));
           groupListDiv.appendChild(groupCreationButton);
@@ -465,6 +472,10 @@ const createNewAddressBookForm = (context, addressBooksData, contactsModule, con
   groupNameInputBox.placeholder = 'New group name';
   groupNameInputBox.classList.add('input', 'contactsGroupInput');
   groupNameInputBox.required = true;
+  const validationMessage = createValidationMessage(context);
+  attachSanitizingValidation(addressBookNameInputBox, validationMessage);
+  attachSanitizingValidation(addressBookContainerInputBox, validationMessage);
+  attachSanitizingValidation(groupNameInputBox, validationMessage);
   const submitButton = context.dom.createElement('button');
   submitButton.setAttribute('id', 'submit-addressbook');
   submitButton.setAttribute('role', 'button');
@@ -482,11 +493,13 @@ const createNewAddressBookForm = (context, addressBooksData, contactsModule, con
   newAddressBookForm.appendChild(addressBookContainerInputBox);
   newAddressBookForm.appendChild(groupNameLabel);
   newAddressBookForm.appendChild(groupNameInputBox);
+  newAddressBookForm.appendChild(validationMessage);
   newAddressBookForm.appendChild(submitButton);
   newAddressBookForm.addEventListener('submit', newAddressBookEventListener);
   return newAddressBookForm;
 };
 const createCloseButton = (context, element, specialClass) => {
+  const buttonID = `${element.id}-close-button`;
   const setButtonOnClickHandler = event => {
     event.preventDefault();
     if (element) {
@@ -499,7 +512,7 @@ const createCloseButton = (context, element, specialClass) => {
     }
   };
   const closeButton = context.dom.createElement('button');
-  closeButton.setAttribute('id', 'close-addressbook');
+  closeButton.setAttribute('id', buttonID);
   closeButton.setAttribute('role', 'button');
   closeButton.setAttribute('type', 'button');
   const ariaLabel = specialClass === 'contactsCloseButton' ? 'Close contacts dialog' : 'Close dialog';
@@ -520,7 +533,9 @@ const createGroupNameForm = (context, contactsModule, addressBooksData, contactD
     });
     const groupNameField = context.dom.querySelector('#groupNameInput');
     // @ts-ignore
-    const enteredGroupName = groupNameField.value;
+    const enteredGroupName = sanitizeInput(groupNameField.value);
+    // @ts-ignore
+    groupNameField.value = enteredGroupName;
     if (!selectedAddressBookUri) {
       (0, _contactsErrors.addErrorToErrorDisplay)(context, _texts.errorNotExistsAddressBookUri);
       return;
@@ -528,13 +543,11 @@ const createGroupNameForm = (context, contactsModule, addressBooksData, contactD
     if (enteredGroupName) {
       // add group first 
       try {
-        const newGroupUri = await contactsModule.createNewGroup({
-          addressBookUri: selectedAddressBookUri,
-          groupName: enteredGroupName
-        });
+        const selectedAddressBookNode = new _rdflib.NamedNode(selectedAddressBookUri);
+        const newGroupNode = await (0, _contactsPane.saveNewGroup)(selectedAddressBookNode, enteredGroupName);
         const newGroup = {
           name: enteredGroupName,
-          uri: newGroupUri
+          uri: newGroupNode.value
         };
         const wasUpdated = (0, _contactsHelpers.addGroupToAddressBookData)(addressBooksData, selectedAddressBookUri, newGroup);
         if (!wasUpdated) {
@@ -569,10 +582,13 @@ const createGroupNameForm = (context, contactsModule, addressBooksData, contactD
   groupNameInputBox.id = 'groupNameInput';
   groupNameInputBox.placeholder = 'New group name';
   groupNameInputBox.classList.add('input', 'contactsGroupInput');
+  const validationMessage = createValidationMessage(context);
+  attachSanitizingValidation(groupNameInputBox, validationMessage);
   const submitButton = createAddGroupButton(context, newGroupForm);
   const closeButton = createCloseButton(context, newGroupForm, 'contactsGroupCreationCloseButton');
   newGroupForm.appendChild(groupNameLabel);
   newGroupForm.appendChild(groupNameInputBox);
+  newGroupForm.appendChild(validationMessage);
   newGroupForm.appendChild(submitButton);
   newGroupForm.appendChild(closeButton);
   return newGroupForm;
@@ -593,75 +609,87 @@ const createAddGroupButton = (context, form) => {
   button.addEventListener('click', setButtonOnClickHandler);
   return button;
 };
-const handleContactExists = (context, contactsModule, addressBooksData, contactData, contactExistsByWebID, contactExistsByName) => {
+const handleContactExistsFromNonRegisteredAddressBook = (context, addressBooksData, contactData, contactExistsByWebID, contactExistsByNameUri) => {
   if (contactExistsByWebID) {
     (0, _contactsErrors.addErrorToErrorDisplay)(context, _texts.contactExistsMessage);
     return true;
-  } else if (contactExistsByName) {
-    // need to disable and possibly grey out the dialog
-    const selectorDialog = context.dom.getElementById('contacts-selector-dialog');
-    const contactExistsDiv = context.dom.createElement('div');
-    contactExistsDiv.setAttribute('role', 'alert');
-    contactExistsDiv.setAttribute('aria-live', 'assertive');
-    contactExistsDiv.setAttribute('tabindex', '0');
-    contactExistsDiv.setAttribute('aria-label', 'Alert message indicating that the contact already exists');
-    contactExistsDiv.setAttribute('id', 'contacts-contact-exists');
-    contactExistsDiv.classList.add('contactsContactExistsAlert');
-    contactExistsDiv.innerHTML = `${contactData.name} already exists. \n Do you want to add their WebID?`;
-    const confirmButton = context.dom.createElement('button');
-    confirmButton.setAttribute('id', 'contacts-confirm-add-webid-button');
-    confirmButton.setAttribute('role', 'button');
-    confirmButton.setAttribute('type', 'button');
-    confirmButton.setAttribute('aria-label', 'Confirm adding the contact webID to the existing contact');
-    confirmButton.setAttribute('tabindex', '0');
-    confirmButton.classList.add('contactsConfirmButton');
-    confirmButton.innerHTML = 'Yes';
-    confirmButton.addEventListener('click', async event => {
-      event.preventDefault();
-      await (0, _contactsHelpers.addWebIDToExistingContact)(context, contactsModule, addressBooksData, contactData.webID, contactExistsByName);
-      finalizeContactEntry(context, addressBooksData, contactData, addressBooksData.contactWebIDs.get(contactData.webID));
-      (0, _contactsHelpers.refreshButton)(context, addressBooksData, contactData);
-    });
-    const cancelButton = context.dom.createElement('button');
-    cancelButton.setAttribute('id', 'contacts-cancel-add-webid-button');
-    cancelButton.setAttribute('role', 'button');
-    cancelButton.setAttribute('type', 'button');
-    cancelButton.setAttribute('aria-label', 'Cancel adding the contact webID to the existing contact');
-    cancelButton.setAttribute('tabindex', '0');
-    cancelButton.classList.add('contactsCancelButton');
-    cancelButton.innerHTML = 'No';
-    cancelButton.addEventListener('click', event => {
-      event.preventDefault();
-      selectorDialog.remove();
-      (0, _buttonsHelper.complain)(getButtonContainer(context), context, 'Contact was not added');
-      setTimeout(() => {
-        (0, _buttonsHelper.clearPreviousMessage)(getButtonContainer(context));
-      }, 2000);
-      (0, _contactsHelpers.refreshButton)(context, addressBooksData, contactData);
-    });
-    const actionsDiv = context.dom.createElement('div');
-    actionsDiv.setAttribute('id', 'contacts-contact-exists-actions');
-    actionsDiv.setAttribute('role', 'group');
-    actionsDiv.setAttribute('aria-label', 'Actions for existing contact alert');
-    actionsDiv.setAttribute('tabindex', '0');
-    actionsDiv.classList.add('contactsContactExistsActions');
-    actionsDiv.appendChild(confirmButton);
-    actionsDiv.appendChild(cancelButton);
-    contactExistsDiv.appendChild(actionsDiv);
-    showPopupOverlay(context);
-    selectorDialog.appendChild(contactExistsDiv);
-    return true;
+  } else if (contactExistsByNameUri) {
+    const fromRegisteredAddressBook = false;
+    const handled = handleContactExistsByName(context, addressBooksData, contactData, contactExistsByNameUri, fromRegisteredAddressBook);
+    return handled;
   }
   return false;
 };
+const handleContactExistsByName = (context, addressBooksData, contactData, contactExistsByNameUri, fromRegisteredAddressBook) => {
+  const selectorDialog = context.dom.getElementById('contacts-selector-dialog');
+  const buttonContainer = getButtonContainer(context);
+  const contactExistsDiv = context.dom.createElement('div');
+  contactExistsDiv.setAttribute('role', 'alert');
+  contactExistsDiv.setAttribute('aria-live', 'assertive');
+  contactExistsDiv.setAttribute('tabindex', '0');
+  contactExistsDiv.setAttribute('aria-label', 'Alert message indicating that the contact already exists');
+  contactExistsDiv.setAttribute('id', 'contacts-contact-exists');
+  contactExistsDiv.classList.add('contactsContactExistsAlert');
+  contactExistsDiv.innerHTML = `${contactData.name} already exists. \n Do you want to add their WebID?`;
+  const confirmButton = context.dom.createElement('button');
+  confirmButton.setAttribute('id', 'contacts-confirm-add-webid-button');
+  confirmButton.setAttribute('role', 'button');
+  confirmButton.setAttribute('type', 'button');
+  confirmButton.setAttribute('aria-label', 'Confirm adding the contact webID to the existing contact');
+  confirmButton.setAttribute('tabindex', '0');
+  confirmButton.classList.add('contactsConfirmButton');
+  confirmButton.innerHTML = 'Yes';
+  confirmButton.addEventListener('click', async event => {
+    event.preventDefault();
+    await (0, _contactsHelpers.addWebIDToExistingContact)(context, contactData, contactExistsByNameUri);
+    contactExistsDiv.remove();
+    finalizeContactEntry(context, addressBooksData, contactData, addressBooksData.contactWebIDs.get(contactData.webID));
+    (0, _contactsHelpers.refreshButton)(context, addressBooksData, contactData);
+  });
+  const cancelButton = context.dom.createElement('button');
+  cancelButton.setAttribute('id', 'contacts-cancel-add-webid-button');
+  cancelButton.setAttribute('role', 'button');
+  cancelButton.setAttribute('type', 'button');
+  cancelButton.setAttribute('aria-label', 'Cancel adding the contact webID to the existing contact');
+  cancelButton.setAttribute('tabindex', '0');
+  cancelButton.classList.add('contactsCancelButton');
+  cancelButton.innerHTML = 'No';
+  cancelButton.addEventListener('click', event => {
+    event.preventDefault();
+    if (!fromRegisteredAddressBook) selectorDialog.remove();
+    contactExistsDiv.remove();
+    (0, _buttonsHelper.complain)(getButtonContainer(context), context, 'Contact was not added');
+    setTimeout(() => {
+      (0, _buttonsHelper.clearPreviousMessage)(getButtonContainer(context));
+    }, 2000);
+    (0, _contactsHelpers.refreshButton)(context, addressBooksData, contactData);
+  });
+  const actionsDiv = context.dom.createElement('div');
+  actionsDiv.setAttribute('id', 'contacts-contact-exists-actions');
+  actionsDiv.setAttribute('role', 'group');
+  actionsDiv.setAttribute('aria-label', 'Actions for existing contact alert');
+  actionsDiv.setAttribute('tabindex', '0');
+  actionsDiv.classList.add('contactsContactExistsActions');
+  actionsDiv.appendChild(confirmButton);
+  actionsDiv.appendChild(cancelButton);
+  contactExistsDiv.appendChild(actionsDiv);
+  showPopupOverlay(context);
+  if (fromRegisteredAddressBook) {
+    buttonContainer.appendChild(contactExistsDiv);
+  } else {
+    selectorDialog.appendChild(contactExistsDiv);
+  }
+  return true;
+};
+exports.handleContactExistsByName = handleContactExistsByName;
 const finalizeContactEntry = (context, addressBooksData, contactData, contactUri) => {
   addressBooksData.contactWebIDs.set(contactData.webID, contactUri);
   const selectorDialog = context.dom.getElementById('contacts-selector-dialog');
-  selectorDialog.remove();
+  if (selectorDialog) selectorDialog.remove();
   const buttonContainer = getButtonContainer(context);
   (0, _buttonsHelper.mention)(buttonContainer, _texts.contactWasAddedSuccesMessage);
-  const button = context.dom.getElementById('add-to-contacts-button');
-  button.removeAttribute('disabled');
+  // const button = context.dom.getElementById('add-to-contacts-button')
+  // button.removeAttribute('disabled')  
   setTimeout(() => {
     (0, _buttonsHelper.clearPreviousMessage)(buttonContainer);
   }, 2000);
@@ -718,4 +746,29 @@ const removePopupOverlayIfNoPopup = context => {
   const overlay = selectorDialog.querySelector(`#${CONTACTS_POPUP_OVERLAY_ID}`);
   if (overlay) overlay.remove();
   selectorDialog.classList.remove(CONTACTS_OVERLAY_ACTIVE_CLASS);
-};
+};
+/* Sanitization and validation */
+function sanitizeInput(input) {
+  return (input || '').replace(/[^a-zA-Z0-9 ]+/g, '').replace(/\s+/g, ' ').trim();
+}
+function attachSanitizingValidation(input, feedbackElement) {
+  input.addEventListener('input', () => {
+    const rawValue = input.value;
+    const sanitizedValue = sanitizeInput(rawValue);
+    if (rawValue !== sanitizedValue) {
+      input.value = sanitizedValue;
+      input.setAttribute('aria-invalid', 'true');
+      feedbackElement.textContent = 'Only letters, numbers, and spaces are allowed.';
+      return;
+    }
+    input.removeAttribute('aria-invalid');
+    feedbackElement.textContent = '';
+  });
+}
+function createValidationMessage(context) {
+  const validationMessage = context.dom.createElement('p');
+  validationMessage.setAttribute('role', 'status');
+  validationMessage.setAttribute('aria-live', 'polite');
+  validationMessage.classList.add('contactsInputValidationMessage');
+  return validationMessage;
+}

package/lib/addMeToYourContacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addMeToYourContacts.d.ts","sourceRoot":"","sources":["../src/addMeToYourContacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,cAAc,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAa,SAAS,EAAE,MAAM,QAAQ,CAAA;AAM7C,OAAO,EAAE,gBAAgB,EAAe,MAAM,iBAAiB,CAAA;AAI/D,OAAO,0BAA0B,CAAA;AACjC,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAKtE,QAAA,MAAM,sBAAsB,GAC1B,SAAS,SAAS,EAClB,SAAS,kBAAkB,KAC1B,OAAO,CAAC,cAAc,CAmBxB,CAAA;AAED,QAAA,MAAM,+BAA+B,GACnC,SAAS,SAAS,EAClB,SAAS,kBAAkB,KAC1B,OAAO,CAAC,iBAAiB,CA2D3B,CAAA;AAED,iBAAe,cAAc,CAC3B,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,OAAO,EACL,sBAAsB,EACtB,+BAA+B,EAC/B,cAAc,EACf,CAAA"}
+{"version":3,"file":"addMeToYourContacts.d.ts","sourceRoot":"","sources":["../src/addMeToYourContacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,cAAc,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAa,SAAS,EAAE,MAAM,QAAQ,CAAA;AAM7C,OAAO,EAAE,gBAAgB,EAAe,MAAM,iBAAiB,CAAA;AAK/D,OAAO,0BAA0B,CAAA;AACjC,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAMtE,QAAA,MAAM,sBAAsB,GAC1B,SAAS,SAAS,EAClB,SAAS,kBAAkB,KAC1B,OAAO,CAAC,cAAc,CAmBxB,CAAA;AAED,QAAA,MAAM,+BAA+B,GACnC,SAAS,SAAS,EAClB,SAAS,kBAAkB,KAC1B,OAAO,CAAC,iBAAiB,CA2D3B,CAAA;AAED,iBAAe,cAAc,CAC3B,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED,OAAO,EACL,sBAAsB,EACtB,+BAA+B,EAC/B,cAAc,EACf,CAAA"}

package/lib/addMeToYourContacts.js

@@ -14,6 +14,7 @@ var _texts = require("./texts");
 require("./styles/ProfileCard.css");
 var _contactsRdflib = _interopRequireDefault(require("@solid-data-modules/contacts-rdflib"));
 var _contactsErrors = require("./contactsErrors");
+var _ContactsCard = require("./ContactsCard");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let buttonContainer = document.createElement('section');
 const addMeToYourContactsDiv = async (subject, context) => {
@@ -104,7 +105,9 @@ async function saveNewContact(subject, context, contactsModule, addressBooksData
         const contactData = await (0, _contactsHelpers.getContactData)(store, subject);
         const contactExistsByNameUri = (0, _contactsHelpers.checkIfContactExistsByName)(addressBooksData, contactData.name);
         if (contactExistsByNameUri) {
-          await (0, _contactsHelpers.addWebIDToExistingContact)(context, contactsModule, addressBooksData, contactData.webID, contactExistsByNameUri);
+          const fromRegisteredAddressBook = true;
+          const handled = (0, _ContactsCard.handleContactExistsByName)(context, addressBooksData, contactData, contactExistsByNameUri, fromRegisteredAddressBook);
+          if (!handled) (0, _contactsErrors.addErrorToErrorDisplay)(context, _texts.errorAddingContactWebIDToAddressBook);
         } else {
           await (0, _contactsHelpers.addContactToAddressBook)(context, contactsModule, contactData, addressBooksData, buttonContainer);
         }

package/lib/contactsHelpers.d.ts

@@ -10,13 +10,13 @@ declare function addANewAddressBookUriToAddressBooks(context: DataBrowserContext
     addressBooksData: AddressBooksData;
     addressBook: AddressBookDetails;
 }>;
-declare function createContactInAddressBook(context: DataBrowserContext, contactsModule: ContactsModuleRdfLib, addressBooksData: AddressBooksData, contactData: ContactData, selectedAddressBookUris: SelectedAddressBookUris): Promise<string>;
+declare function createContactInAddressBook(context: DataBrowserContext, contactsModule: ContactsModuleRdfLib, contactData: ContactData, selectedAddressBookUris: SelectedAddressBookUris): Promise<string>;
 declare function addAddressToTypeIndex(context: DataBrowserContext, typeOfIndex: string, addressBookUri: string): Promise<boolean>;
 declare function updateAddressBookName(context: DataBrowserContext, addressBookUri: string, newName: string): Promise<void>;
 declare function refreshButton(context: DataBrowserContext, addressBooksData: AddressBooksData, contactData: ContactData): void;
 declare function checkIfContactExistsByWebID(addressBooksData: AddressBooksData, subjectUri: string): boolean;
 declare function checkIfContactExistsByName(addressBooksData: AddressBooksData, name: string): string | null;
-declare function addWebIDToExistingContact(context: DataBrowserContext, contactsModule: ContactsModuleRdfLib, addressBooksData: AddressBooksData, webID: string, contactUri: string): Promise<void>;
+declare function addWebIDToExistingContact(context: DataBrowserContext, contactData: ContactData, contactUri: string): Promise<void>;
 declare function addGroupToAddressBookData(addressBooksData: AddressBooksData, addressBookUri: string, group: GroupData): boolean;
 declare function handleAddressBookCreation(dataBrowserContext: DataBrowserContext, containerName: string, enteredAddressName: string): Promise<string>;
 export { getAddressBooksData, getContactData, addContactToAddressBook, createContactInAddressBook, addAddressToTypeIndex, refreshButton, checkIfContactExistsByWebID, checkIfContactExistsByName, addWebIDToExistingContact, addANewAddressBookUriToAddressBooks, addGroupToAddressBookData, updateAddressBookName, handleAddressBookCreation };

package/lib/contactsHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contactsHelpers.d.ts","sourceRoot":"","sources":["../src/contactsHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,QAAQ,CAAA;AAE/D,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,2BAA2B,CAAA;AAElC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAgB,SAAS,EAAgB,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAMnJ,iBAAe,uBAAuB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,cAAc,iBAM1B;AAgHD,iBAAe,mBAAmB,CAChC,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,gBAAgB,CAAC,CAY3B;AAkBD,iBAAe,cAAc,CAC3B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CA8BtB;AAED,iBAAe,mCAAmC,CAChD,OAAO,EAAC,kBAAkB,EAC1B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA2BlF;AAED,iBAAe,0BAA0B,CACvC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,EACxB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAqFD,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,iBA0BhB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,QAuBvB;AAEH,iBAAS,2BAA2B,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAGT;AAED,iBAAS,0BAA0B,CACjC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAYf;AAED,iBAAe,yBAAyB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,iBASnB;AA6CD,iBAAS,yBAAyB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CA0BT;AAED,iBAAe,yBAAyB,CACtC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACrB,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,mCAAmC,EACnC,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EAC1B,CAAA"}
+{"version":3,"file":"contactsHelpers.d.ts","sourceRoot":"","sources":["../src/contactsHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,QAAQ,CAAA;AAE/D,OAAO,oBAAoB,MAAM,qCAAqC,CAAA;AAEtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,2BAA2B,CAAA;AAElC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAgB,SAAS,EAAgB,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAMnJ,iBAAe,uBAAuB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,cAAc,iBAM1B;AAgHD,iBAAe,mBAAmB,CAChC,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EAAE,oBAAoB,GAClC,OAAO,CAAC,gBAAgB,CAAC,CAY3B;AAkBD,iBAAe,cAAc,CAC3B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,WAAW,CAAC,CA8BtB;AAED,iBAAe,mCAAmC,CAChD,OAAO,EAAC,kBAAkB,EAC1B,cAAc,EAAE,oBAAoB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA2BlF;AAED,iBAAe,0BAA0B,CACvC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,WAAW,EACxB,uBAAuB,EAAE,uBAAuB,GAC/C,OAAO,CAAC,MAAM,CAAC,CA0BjB;AA0CD,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,iBAAe,qBAAqB,CAClC,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,iBA0BhB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,kBAAkB,EAC3B,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW,QAwBvB;AAEH,iBAAS,2BAA2B,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAGT;AAED,iBAAS,0BAA0B,CACjC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAYf;AAED,iBAAe,yBAAyB,CACtC,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,iBAUnB;AAED,iBAAS,yBAAyB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CA0BT;AASD,iBAAe,yBAAyB,CACtC,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,CA8CjB;AAED,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,qBAAqB,EACrB,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,yBAAyB,EACzB,mCAAmC,EACnC,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EAC1B,CAAA"}

package/lib/contactsHelpers.js

@@ -24,8 +24,8 @@ var _solidLogic = require("solid-logic");
 var _texts = require("./texts");
 var _buttonsHelper = require("./buttonsHelper");
 var _contactsErrors = require("./contactsErrors");
-var _contactsPane = _interopRequireDefault(require("contacts-pane"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _contactsPane = _interopRequireWildcard(require("contacts-pane"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function addContactToAddressBook(context, contactsModule, contactData, addressBooksData, container) {
   const addressBookUriSelectorDialog = (0, _ContactsCard.createAddressBookUriSelectorDialog)(context, contactsModule, contactData, addressBooksData);
   container.appendChild(addressBookUriSelectorDialog);
@@ -204,8 +204,9 @@ async function addANewAddressBookUriToAddressBooks(context, contactsModule, addr
     addressBook: contactsAddressBook
   };
 }
-async function createContactInAddressBook(context, contactsModule, addressBooksData, contactData, selectedAddressBookUris) {
+async function createContactInAddressBook(context, contactsModule, contactData, selectedAddressBookUris) {
   let contactUri = null;
+  const store = context.session.store;
   const newContact = {
     name: contactData.name
   };
@@ -222,7 +223,8 @@ async function createContactInAddressBook(context, contactsModule, addressBooksD
       return;
     }
     await context.session.store.fetcher.load(contactUri);
-    await addWebIDToContact(context, groupUris, contactUri, contactData.webID);
+    const contactNode = new _rdflib.NamedNode(contactUri);
+    await (0, _contactsPane.addWebIDToContacts)(contactNode, contactData.webID, _solidUi.ns.vcard('WebID'), store);
     if (contactData.emails.length || contactData.phoneNumbers.length) {
       await addContactDetails(context, contactUri, contactData);
     }
@@ -261,29 +263,6 @@ async function addContactDetails(context, contactUri, contactData) {
     (0, _contactsErrors.addErrorToErrorDisplay)(context, error);
   }
 }
-async function addWebIDToContact(context, groupUris, contactUri, webID) {
-  const store = context.session.store;
-  const contactNode = new _rdflib.NamedNode(contactUri);
-  const webIDNode = (0, _rdflib.sym)(webID);
-  const vcardURLNode = store.bnode();
-  let groupUriNode = null;
-  try {
-    if (groupUris?.length) {
-      for (const groupUri of groupUris) {
-        await context.session.store.fetcher.load(groupUri);
-        groupUriNode = new _rdflib.NamedNode(groupUri);
-        const groupDoc = groupUriNode.doc();
-        const deletions = context.session.store.statementsMatching(groupUriNode, _solidUi.ns.vcard('hasMember'), contactNode, groupDoc);
-        const insertions = [(0, _rdflib.st)(groupUriNode, _solidUi.ns.vcard('hasMember'), webIDNode, groupDoc), (0, _rdflib.st)(webIDNode, _solidUi.ns.owl('sameAs'), contactNode, groupDoc)];
-        await store.updater.update(deletions, insertions);
-      }
-    }
-    const personInsertions = [(0, _rdflib.st)(contactNode, _solidUi.ns.vcard('url'), vcardURLNode, contactNode.doc()), (0, _rdflib.st)(vcardURLNode, _solidUi.ns.rdf('type'), _solidUi.ns.vcard('WebID'), contactNode.doc()), (0, _rdflib.st)(vcardURLNode, _solidUi.ns.vcard('value'), (0, _rdflib.literal)(webID), contactNode.doc())];
-    await store.updater.update([], personInsertions);
-  } catch (error) {
-    (0, _contactsErrors.addErrorToErrorDisplay)(context, error);
-  }
-}
 async function addAddressToTypeIndex(context, typeOfIndex, addressBookUri) {
   const store = context.session.store;
   const me = _solidLogic.authn.currentUser();
@@ -332,6 +311,7 @@ function refreshButton(context, addressBooksData, contactData) {
       //logged in and friend exists or friend was just added
       button.innerHTML = _texts.contactExistsAlreadyButtonText.toUpperCase();
       button.onclick = null;
+      button.setAttribute('disabled', '');
     } else if (contactExistsByName) {
       button.innerHTML = _texts.contactExistsAlreadyByNameButtonText.toUpperCase();
       button.removeAttribute('disabled');
@@ -358,52 +338,16 @@ function checkIfContactExistsByName(addressBooksData, name) {
   });
   return contactUri;
 }
-async function addWebIDToExistingContact(context, contactsModule, addressBooksData, webID, contactUri) {
+async function addWebIDToExistingContact(context, contactData, contactUri) {
+  const store = context.session.store;
   try {
-    const groupUris = await getGroupUrisForContact(contactsModule, addressBooksData, contactUri);
-    await addWebIDToContact(context, groupUris, contactUri, webID);
+    await context.session.store.fetcher.load(contactUri);
+    const contactNode = new _rdflib.NamedNode(contactUri);
+    await (0, _contactsPane.addWebIDToContacts)(contactNode, contactData.webID, _solidUi.ns.vcard('WebID'), store);
   } catch (error) {
     (0, _contactsErrors.addErrorToErrorDisplay)(context, error);
   }
 }
-async function getGroupUrisForContact(contactsModule, addressBooksData, contactUri) {
-  let groupUrisForContact = [];
-  let addressBookForContact = null;
-  let allGroupUrisForAddressBook = [];
-  addressBooksData.public.forEach((book, uri) => {
-    book.contacts.map(contact => {
-      if (contact.uri === contactUri) {
-        addressBookForContact = book;
-      }
-    });
-  });
-  addressBooksData.private.forEach((book, uri) => {
-    book.contacts.map(contact => {
-      if (contact.uri === contactUri) {
-        addressBookForContact = book;
-      }
-    });
-  });
-  allGroupUrisForAddressBook = addressBookForContact.groups;
-  const groupPromises = allGroupUrisForAddressBook.map(async group => {
-    group = await contactsModule.readGroup(group.uri);
-    return {
-      groupUri: group.uri,
-      group
-    };
-  });
-  const groups = await Promise.all(groupPromises);
-  groups.map(groupInfo => {
-    groupInfo.group.members.map(contact => {
-      if (contact.uri === contactUri) {
-        if (!groupUrisForContact.includes(groupInfo.groupUri)) {
-          groupUrisForContact.push(groupInfo.groupUri);
-        }
-      }
-    });
-  });
-  return groupUrisForContact;
-}
 function addGroupToAddressBookData(addressBooksData, addressBookUri, group) {
   const publicAddressBook = addressBooksData.public.get(addressBookUri);
   if (publicAddressBook) {
@@ -429,6 +373,9 @@ function addGroupToAddressBookData(addressBooksData, addressBookUri, group) {
   }
   return false;
 }
+function sanitizeAlphaNumericSpaces(input) {
+  return (input || '').replace(/[^a-zA-Z0-9 ]+/g, '').replace(/\s+/g, ' ').trim();
+}
 async function handleAddressBookCreation(dataBrowserContext, containerName, enteredAddressName) {
   const me = _solidLogic.authn.currentUser();
   const newAddressContainer = me?.site()?.value;
@@ -438,8 +385,13 @@ async function handleAddressBookCreation(dataBrowserContext, containerName, ente
     if (!me || !newAddressContainer) {
       throw new Error(_texts.errorUnableToDetermineUserWorkspace);
     }
+    const sanitizedAddressName = sanitizeAlphaNumericSpaces(enteredAddressName);
+    if (!sanitizedAddressName) {
+      throw new Error('Address book name can only contain letters, numbers, and spaces');
+    }
+    const sanitizedContainerName = sanitizeAlphaNumericSpaces(containerName);
     const normalizedContainer = newAddressContainer.endsWith('/') ? newAddressContainer : `${newAddressContainer}/`;
-    const addressBookSlug = (containerName || 'address-book').trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'address-book';
+    const addressBookSlug = (sanitizedContainerName || 'address-book').trim().toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]+/g, '-').replace(/^-+|-+$/g, '') || 'address-book';
     const newBase = `${normalizedContainer}${addressBookSlug}/`;
     const mintResult = await _contactsPane.default.mintNew(dataBrowserContext, {
       me,
@@ -447,10 +399,10 @@ async function handleAddressBookCreation(dataBrowserContext, containerName, ente
       div,
       newBase,
       instanceClass: _solidUi.ns.vcard('AddressBook'),
-      instanceName: enteredAddressName
+      instanceName: sanitizedAddressName
     });
     addressBookUri = mintResult?.newInstance?.uri || `${newBase}index.ttl#this`;
-    await updateAddressBookName(dataBrowserContext, addressBookUri, enteredAddressName);
+    await updateAddressBookName(dataBrowserContext, addressBookUri, sanitizedAddressName);
   } catch (error) {
     (0, _contactsErrors.addErrorToErrorDisplay)(dataBrowserContext, _texts.errorAddressBookCreation + '\n' + error);
   }