diff --git a/app/User/models.py b/app/User/models.py index 71ee9b2..9a7da45 100644 --- a/app/User/models.py +++ b/app/User/models.py @@ -2,6 +2,28 @@ class User(db.Model): + """ + User madel provides a direct mapping to the underlying + database. + + Version 1 deploys the following fields: + id (BigInteger) - Unique record identifier + email (String(250)) - User email address + password (String(100)) - User account password + salt (String(50)) - A hash used to encrypt password + auth_source (String(250)) - Identifier for system providing authentication + locale (String(50)) - User language + blocked (Boolean) - Flag to indicate account is disabled + confirmed (Boolean) - Flag to indicate account has been verified + screen_name (String(250)) - Unique user screen name + + Version 2 adds support for US COPPA compliance. The following fields were added: + birth_month (INTEGER) - User birth month + birth_year (INTEGER) - User birth year + parent_email (String(250)) - Sponsor email address + parent_email_source (INTEGER) - Classification of sponsor email address + + """ id = db.Column(db.BigInteger, primary_key=True) email = db.Column(db.String(250), unique=True) password = db.Column(db.String(100)) @@ -21,6 +43,7 @@ class User(db.Model): def __init__(self): self.blocked = False self.confirmed = False + self.version = 2 def __repr__(self): return '' % self.email diff --git a/templates/en/confirm-parent/blocklyprop/plain.mustache b/templates/en/confirm-parent/blocklyprop/plain.mustache index 3840702..4f4dde9 100644 --- a/templates/en/confirm-parent/blocklyprop/plain.mustache +++ b/templates/en/confirm-parent/blocklyprop/plain.mustache @@ -11,6 +11,12 @@ received as the parent or guardian of the registrant. If this is incorrect, please accept our apologies. There is nothing more you need to do. The request will automatically expire. +BlocklyProp is a free, online programming tool designed for education. See +Getting Started with BlocklyProp +http://learn.parallax.com/tutorials/language/blocklyprop/getting-started-blocklyprop +for more information. + + Why are we sending this? In the US, the federal Children's Online Privacy Protection Act, known as COPPA, requires that we communicate with a parent or guardian if the person registering an BlocklyProp account is under the diff --git a/templates/en_US/confirm-parent/blocklyprop/header.mustache b/templates/en_US/confirm-parent/blocklyprop/header.mustache new file mode 100644 index 0000000..3425542 --- /dev/null +++ b/templates/en_US/confirm-parent/blocklyprop/header.mustache @@ -0,0 +1,2 @@ +{{! This is the email Subject line }} +New user registration confirmation request \ No newline at end of file diff --git a/templates/en_US/confirm-parent/blocklyprop/plain.mustache b/templates/en_US/confirm-parent/blocklyprop/plain.mustache new file mode 100644 index 0000000..4f4dde9 --- /dev/null +++ b/templates/en_US/confirm-parent/blocklyprop/plain.mustache @@ -0,0 +1,55 @@ +{{! + This is the text body of the email new account notification to + a parent or guardian +}} +Hello, + +Someone, perhaps your child, has requested a new account on the Parallax +BlocklyProp web site (http://blockly.parallax.com) under the screen name +{{screenname}}. When the account was created, your email address was +received as the parent or guardian of the registrant. If this is incorrect, +please accept our apologies. There is nothing more you need to do. The +request will automatically expire. + +BlocklyProp is a free, online programming tool designed for education. See +Getting Started with BlocklyProp +http://learn.parallax.com/tutorials/language/blocklyprop/getting-started-blocklyprop +for more information. + + +Why are we sending this? In the US, the federal Children's Online Privacy +Protection Act, known as COPPA, requires that we communicate with a parent +or guardian if the person registering an BlocklyProp account is under the +age of 13. The Act allows you to decline the registration request. If you +choose this option, we will immediately remove the registration information +and the associated account. If you choose to confirm the the request and +activate the account, you may close the account at any time by clicking on +the link provided below. This action will close the account and remove any +projects that are associated with the account. + +A full copy of our Child Privacy Policy is available online at: +http://localhost:8080/blockly/child-privacy-policy + + +If this is your child, please confirm the registration by copying the link below into +your browser or by navigating to the second link and confirming the student's email address. + +Confirm account registration: +Copy and paste into your browser +http://localhost:8080/blockly/confirm?locale={{locale}}&email={{registrant-email}}&token={{token}} to confirm your email address. + +If the above link is unable to complete your registration, please go to +http://localhost:8080/blockly/confirm and enter your email address and the token: {{token}} + + +You may also elect to cancel the registration process immediately. To do +so, please copy and paste the link below. This will remove the pending registration +request and the account that was created during the registration process. + +[NEED A CANCEL LINK HERE] + + + +Regards, + +The Parallax team