Skip to content

Fix user verify #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix user verify #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63e5760
Fxing user verify
josenavas Mar 31, 2016
4cacd18
Removing code that should not be here
josenavas Mar 31, 2016
6b5a69a
argh
josenavas Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions qiita_db/test/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,6 @@ def test_verify_code(self):
WHERE email = 'new@test.bar' AND dflt = true"""
self.assertEqual(self.conn_handler.execute_fetchone(sql)[0], 2)

# Make sure new system messages are linked to user
sql = """SELECT message_id FROM qiita.message_user
WHERE email = 'new@test.bar'"""
m_id = qdb.util.get_count('qiita.message')
self.assertEqual(self.conn_handler.execute_fetchall(sql), [[m_id]])

def _check_pass(self, passwd):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be put in test_create to make sure this test is still done.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree and more importantly we need to make sure the pathological case doesn't happens. I have created: #1731

obspass = self.conn_handler.execute_fetchone(
"SELECT password FROM qiita.qiita_user WHERE email = %s",
Expand Down
13 changes: 8 additions & 5 deletions qiita_db/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,14 @@ def create(cls, email, password, info=None):
cls._table, ','.join(columns), ','.join(['%s'] * len(values)))
qdb.sql_connection.TRN.add(sql, values)

# Add system messages to user
sql = """INSERT INTO qiita.message_user (email, message_id)
SELECT %s, message_id FROM qiita.message
WHERE expiration > %s"""
qdb.sql_connection.TRN.add(sql, [email, datetime.now()])

qdb.sql_connection.TRN.execute()

return cls(email)

@classmethod
Expand Down Expand Up @@ -322,11 +330,6 @@ def verify_code(cls, email, code, code_type):
qdb.sql_connection.TRN.add(an_sql, args)
an_id = qdb.sql_connection.TRN.execute_fetchlast()
qdb.sql_connection.TRN.add(ap_sql, [an_id, portal_id])
# Add system messages to user
sql = """INSERT INTO qiita.message_user (email, message_id)
SELECT %s, message_id FROM qiita.message
WHERE expiration > %s"""
qdb.sql_connection.TRN.add(sql, [email, datetime.now()])

qdb.sql_connection.TRN.execute()

Expand Down