added function to also strip port, updated test cases

Author: zg009

lib/models/account-template.js

@@ -74,7 +74,7 @@ class AccountTemplate {
    */
   static templateSubstitutionsFor (userAccount) {
     const webUri = new URL(userAccount.webId)
-    const webIdOrigin = webUri.protocol + '//' + webUri.hostname
+    const webIdOrigin = webUri.protocol + '//' + webUri.hostname + ':' + webUri.port
     const podRelWebId = userAccount.webId.replace(webIdOrigin, '')
     const substitutions = {
       name: userAccount.displayName,

test/integration/account-template-test.js

@@ -76,6 +76,18 @@ describe('AccountTemplate', () => {
       expect(substitutions.webId).to.equal('https://alice.example.com/#me')
     })
 
+    it('should not update the nested webid', () => {
+      const userAccount = new UserAccount({
+        webId: 'https://alice.example.com/alice/#me',
+        email: 'alice@example.com',
+        name: 'Alice Q.'
+      })
+
+      const substitutions = AccountTemplate.templateSubstitutionsFor(userAccount)
+
+      expect(substitutions.webId).to.equal('https://alice.example.com/alice/#me')
+    })
+
     it('should update the webid', () => {
       const userAccount = new UserAccount({
         webId: 'http://localhost:8443/alice/#me',