Tweak root .acl recovery email template

Author: dmitrizagidulin

account-template-default/.acl

@@ -7,7 +7,7 @@
     acl:agent <{{webId}}> ;
 
     # Optional owner email, to be used for account recovery:
-    {{{accountMailto}}}
+    {{#if email}}acl:agent <mailto:{{{email}}}>{{/if}}
 
     # Set the access to the root storage folder itself
     acl:accessTo </>;

lib/models/account-template.js

@@ -81,11 +81,10 @@ class AccountTemplate {
   static templateSubstitutionsFor (userAccount) {
     let substitutions = {
       name: userAccount.displayName,
-      webId: userAccount.webId
-    }
-    if (userAccount.email) {
-      substitutions.accountMailto = `acl:agent <mailto:${userAccount.email}> ;`
+      webId: userAccount.webId,
+      email: userAccount.email
     }
+
     return substitutions
   }
 

test/account-template.js

@@ -75,7 +75,7 @@ describe('AccountTemplate', () => {
 
       let substitutions = AccountTemplate.templateSubstitutionsFor(userAccount)
       expect(substitutions.name).to.equal('Alice Q.')
-      expect(substitutions.accountMailto).to.equal('acl:agent <mailto:alice@example.com> ;')
+      expect(substitutions.email).to.equal('alice@example.com')
       expect(substitutions.webId).to.equal('https://alice.example.com/profile/card#me')
     })
   })
@@ -84,7 +84,7 @@ describe('AccountTemplate', () => {
     it('should process all the files in an account', () => {
       let substitutions = {
         webId: 'https://alice.example.com/#me',
-        accountMailto: 'acl:agent <mailto:alice@example.com> ;',
+        email: 'alice@example.com',
         name: 'Alice Q.'
       }
       let template = new AccountTemplate({ substitutions })