Skip to content

feat: Addition of fields for reCAPTCHA #6044

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

Merged
merged 3 commits into from
Jun 18, 2019
Merged

feat: Addition of fields for reCAPTCHA #6044

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
88a718b
Addition of Fields For reCaptcha
Jun 16, 2019
72a635e
Add server default
Jun 18, 2019
0f74887
Merge branch 'development' into field
abhinavk96 Jun 18, 2019
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
9 changes: 9 additions & 0 deletions app/api/schema/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,15 @@ class Meta:
gs_secret = fields.Str(allow_none=True)
gs_bucket_name = fields.Str(allow_none=True)

#
# CAPTCHA
#

# Google reCAPTCHA
is_google_recaptcha_enabled = fields.Bool(allow_none=False, default=False)
google_recaptcha_site = fields.Str(allow_none=True)
google_recaptcha_secret = fields.Str(allow_none=True)

#
# Social Login
#
Expand Down
14 changes: 14 additions & 0 deletions app/models/setting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ class Setting(db.Model):
gs_secret = db.Column(db.String)
gs_bucket_name = db.Column(db.String)

#
# CAPTCHA
#

# Google reCAPTCHA
is_google_recaptcha_enabled = db.Column(db.Boolean, default=False, nullable=False)
google_recaptcha_site = db.Column(db.String)
google_recaptcha_secret = db.Column(db.String)

#
# Social Login
#
Expand Down Expand Up @@ -148,6 +157,7 @@ def __init__(self,
gs_key=None,
gs_secret=None,
gs_bucket_name=None,
is_google_recaptcha_enabled=False, google_recaptcha_secret=None, google_recaptcha_site=None,
google_client_id=None, google_client_secret=None,
fb_client_id=None, fb_client_secret=None, tw_consumer_key=None,
stripe_client_id=None,
Expand Down Expand Up @@ -198,6 +208,10 @@ def __init__(self,
self.gs_secret = gs_secret
self.gs_bucket_name = gs_bucket_name

self.is_google_recaptcha_enabled = is_google_recaptcha_enabled
self.google_recaptcha_site = google_recaptcha_site
self.google_recaptcha_secret = google_recaptcha_secret

self.google_client_id = google_client_id
self.google_client_secret = google_client_secret
self.fb_client_id = fb_client_id
Expand Down
32 changes: 32 additions & 0 deletions migrations/versions/232b13d4e86a_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"""empty message

Revision ID: 232b13d4e86a
Revises: 14e31b3a860b
Create Date: 2019-06-17 02:51:42.186307

"""

from alembic import op
import sqlalchemy as sa
import sqlalchemy_utils


# revision identifiers, used by Alembic.
revision = '232b13d4e86a'
down_revision = '14e31b3a860b'


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('settings', sa.Column('google_recaptcha_secret', sa.String(), nullable=True))
op.add_column('settings', sa.Column('google_recaptcha_site', sa.String(), nullable=True))
op.add_column('settings', sa.Column('is_google_recaptcha_enabled', sa.Boolean(), server_default='False', nullable=False))
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('settings', 'is_google_recaptcha_enabled')
op.drop_column('settings', 'google_recaptcha_site')
op.drop_column('settings', 'google_recaptcha_secret')
# ### end Alembic commands ###