diff --git a/ayct_backend/campaign/models.py b/ayct_backend/campaign/models.py index a29447b..8db7bb8 100644 --- a/ayct_backend/campaign/models.py +++ b/ayct_backend/campaign/models.py @@ -5,4 +5,4 @@ campaign_db = SQLAlchemy() class TwitterCampaign(campaign_db.Model): __tablename__ = 'twitter_campaign' - campaign_id = campaign_db.Column(campaign_db.Integer, primary_key=True, nullable=False) + campaign_id = campaign_db.Column(campaign_db.Integer, primary_key=True) diff --git a/ayct_backend/twitter/__init__.py b/ayct_backend/twitter/__init__.py index 5b7554a..775d928 100644 --- a/ayct_backend/twitter/__init__.py +++ b/ayct_backend/twitter/__init__.py @@ -30,7 +30,7 @@ def add_twitter_account(): content_type = request.headers.get('Content-Type') if (content_type == 'application/json'): json = request.json - if not json['veryfier']: + if not json['veryfier'] or not json['oauth_token'] or not json['oauth_token_secret']: return Response( "Invalid request!", status=400, @@ -39,19 +39,12 @@ def add_twitter_account(): consumer_key = current_app.config["TWITTER_CONSUMER_KEY"] consumer_secret = current_app.config["TWITTER_CONSUMER_SECERT"] - oauth = OAuth1Session( - consumer_key, - client_secret=consumer_secret - ) - request_token_url = "https://api.twitter.com/oauth/request_token?oauth_callback=oob&x_auth_access_type=write" - fetch_response = oauth.fetch_request_token(request_token_url) - access_token_url = "https://api.twitter.com/oauth/access_token" oauth = OAuth1Session( consumer_key, client_secret=consumer_secret, - resource_owner_key=fetch_response.get("oauth_token"), - resource_owner_secret=fetch_response.get("oauth_token_secret"), + resource_owner_key=json['oauth_token'], + resource_owner_secret=json['oauth_token_secret'], verifier=json['veryfier'], ) oauth_tokens = oauth.fetch_access_token(access_token_url) diff --git a/ayct_backend/twitter/models.py b/ayct_backend/twitter/models.py index 677088f..8650611 100644 --- a/ayct_backend/twitter/models.py +++ b/ayct_backend/twitter/models.py @@ -6,7 +6,7 @@ twitter_db = SQLAlchemy() class TwitterAccount(twitter_db.Model): __tablename__ = 'twitter_account' - account_id = twitter_db.Column(twitter_db.Integer, primary_key=True, nullable=False) + account_id = twitter_db.Column(twitter_db.Integer, primary_key=True) twitter_user_id = twitter_db.Column(twitter_db.String(16), unique=True, nullable=False) username = twitter_db.Column(twitter_db.String(16), unique=True, nullable=False) access_token = twitter_db.Column(twitter_db.String(256), nullable=False)