Merge pull request #309 from logion-network/feature/refactor-account-…

…recovery

Refactor account recovery

README.md

@@ -24,18 +24,6 @@ This project features:
 
 ## Logion API
 
-### Protection requests
-
-Request IDs are randomly generated upon creation. Please note down the request ID you get on creation in order to use
-it as a path variable in the other queries.
-
-- Create: `curl -v http://127.0.0.1:8088/api/protection-request -H "Content-Type: application/json" -d @sample-data/create.json  | jq`
-- Fetch by requester: `curl -vX PUT http://127.0.0.1:8088/api/protection-request -H "Content-Type: application/json" -d @sample-data/fetch_pending_by_requester.json | jq`
-- Fetch by legal officer: `curl -vX PUT http://127.0.0.1:8088/api/protection-request -H "Content-Type: application/json" -d @ sample-data/fetch_pending_by_legal_officer.json | jq`
-- Reject: `curl -v http://127.0.0.1:8088/api/protection-request/<id>/reject -H "Content-Type: application/json" -d @sample-data/reject.json  | jq`
-- Accept: `curl -v http://127.0.0.1:8088/api/protection-request/<id>/accept -H "Content-Type: application/json" -d @sample-data/accept.json  | jq`
-- Check: `curl -v http://127.0.0.1:8088/api/protection-request/<id>/check-activation -H "Content-Type: application/json" -d @sample-data/check.json  | jq`
-
 ### Authentication
 Authentication process is described [here](doc/Authentication.md).
 

resources/mail/README.md

@@ -25,19 +25,19 @@ All possible variables are available (for copy/paste) in this template: [all-doc
     legalOfficer.postalAddress.city
     legalOfficer.postalAddress.country
 
-In the context of a protection (or recovery), all the variables defined above may also be prefixed with
+In the context of an account recovery, all the variables defined above may also be prefixed with
 `otherLegalOfficer` instead of `legalOfficer`. 
 
-### Protection and Recovery Request
-    protection.requesterAddress
-    protection.otherLegalOfficerAddress
-    protection.addressToRecover
-    protection.createdOn
-    protection.isRecovery
+### Recovery Request
+    recovery.requesterAddress
+    recovery.otherLegalOfficerAddress
+    recovery.addressToRecover
+    recovery.createdOn
+    recovery.isRecovery
 
-    protection.decision.decisionOn
-    protection.decision.rejectReason
-    protection.decision.locId
+    recovery.decision.decisionOn
+    recovery.decision.rejectReason
+    recovery.decision.locId
 
 ### LOC
     loc.id

resources/mail/all-documented-vars.pug

@@ -34,16 +34,15 @@
 | #{otherLegalOfficer.postalAddress.city};
 | #{otherLegalOfficer.postalAddress.country};
 |
-| === Protection ===
-| #{protection.requesterAddress.address};
-| #{protection.otherLegalOfficerAddress};
-| #{protection.addressToRecover};
-| #{protection.createdOn};
-| #{protection.isRecovery};
+| === Account Recovery ===
+| #{recovery.requesterAddress.address};
+| #{recovery.otherLegalOfficerAddress};
+| #{recovery.addressToRecover};
+| #{recovery.createdOn};
 |
-| #{protection.decision.decisionOn};
-| #{protection.decision.rejectReason};
-| #{protection.decision.locId};
+| #{recovery.decision.decisionOn};
+| #{recovery.decision.rejectReason};
+| #{recovery.decision.locId};
 |
 | === LOC ===
 | #{loc.id};

resources/mail/recovery-accepted.pug

@@ -5,14 +5,14 @@
 |
 | Please note, you can't answer this email. The logion network will never ask you to provide any kind of information or access to a web address through its email notifications.
 |
-| One of your Legal Officers, #{legalOfficer.userIdentity.firstName} #{legalOfficer.userIdentity.lastName}, has accepted to let you recover all digital assets from your Polkadot account set as follows: #{protection.requesterAddress.address}.
+| One of your Legal Officers, #{legalOfficer.userIdentity.firstName} #{legalOfficer.userIdentity.lastName}, has accepted to let you recover all digital assets from your Polkadot account set as follows: #{recovery.requesterAddress.address}.
 |
 | As a reminder, find below all details of the Legal Officer who accepted this request:
 |
 include /legal-officer-details.pug
 |
 | Upon acceptance of both selected Legal Officers, you will be able, from the "Recovery" section of your wallet, to:
-| * activate the protection of your new account by the same Legal Officers
-| * recover all digital assets from your previous account (#{protection.addressToRecover}) by transfering them to the new one
+| * activate the recovery of your new account by the same Legal Officers
+| * recover all digital assets from your previous account (#{recovery.addressToRecover}) by transfering them to the new one
 |
 include /footer.pug

resources/mail/recovery-cancelled.pug

@@ -12,11 +12,11 @@
 |
 | Identification key to recover:
 | ***********************************
-| #{protection.addressToRecover}
+| #{recovery.addressToRecover}
 |
 | New Identification key:
 | **************************
-| #{protection.requesterAddress.address}
+| #{recovery.requesterAddress.address}
 |
 | Email:
 | *******

resources/mail/recovery-rejected.pug

@@ -1,11 +1,11 @@
 | logion notification - Recovery request refusal
 | Dear #{walletUser.firstName} #{walletUser.lastName},
 |
-| You receive this message because you are requesting a recovery process from a Legal Officer through the logion blockchain network.
+| You receive this message because you are requesting an account recovery from a Legal Officer through the logion blockchain network.
 | Please note, you can't answer this email. The logion network will never ask you to provide any kind of information or access to a web address through its email notifications.
 |
-| One of your Legal Officers, #{legalOfficer.userIdentity.firstName} #{legalOfficer.userIdentity.lastName}, has refused to let you recover assets from the Polkadot account you mentioned in your request (#{protection.requesterAddress.address}) for the following reason:
-| #{protection.decision.rejectReason}
+| One of your Legal Officers, #{legalOfficer.userIdentity.firstName} #{legalOfficer.userIdentity.lastName}, has refused to let you recover assets from the Polkadot account you mentioned in your request (#{recovery.requesterAddress.address}) for the following reason:
+| #{recovery.decision.rejectReason}
 |
 | As a reminder, find below all details of the Legal Officer who refused this request:
 |

resources/mail/recovery-requested.pug

@@ -12,11 +12,11 @@
 |
 | Identification key to recover:
 | ***********************************
-| #{protection.addressToRecover}
+| #{recovery.addressToRecover}
 |
 | New Identification key:
 | **************************
-| #{protection.requesterAddress.address}
+| #{recovery.requesterAddress.address}
 |
 | Email:
 | *******