From bd2fbdc4a7c9850b3d746c6c7af72164eb3ed6a5 Mon Sep 17 00:00:00 2001 From: kazemicode Date: Sun, 10 Jan 2021 19:56:50 -0800 Subject: [PATCH 1/2] passing auth token via header since passing via params is deprecated --- app/controllers/auth.py | 3 ++- app/models/user.py | 2 +- app/services/github.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/auth.py b/app/controllers/auth.py index e4f1b1f..d2a33c6 100644 --- a/app/controllers/auth.py +++ b/app/controllers/auth.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import functools, json, requests +import pdb from flask import flash, redirect, render_template, request from flask import Blueprint, session, url_for, g @@ -32,7 +33,7 @@ def githubCallback(): session['access_token'] = access_token session['user_id'] = user.id - + pdb.set_trace() return redirect(url_for('home.index')) @blueprint.route('/logout') diff --git a/app/models/user.py b/app/models/user.py index c43b61b..b218600 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -17,7 +17,7 @@ def __init__(self, username, avatar_url, github_id): @staticmethod def find_or_create_from_token(access_token): data = GitHub.get_user_from_token(access_token) - + print(data) """Find existing user or create new User instance""" instance = User.query.filter_by(username=data['login']).first() diff --git a/app/services/github.py b/app/services/github.py index fc5e157..a6f3119 100644 --- a/app/services/github.py +++ b/app/services/github.py @@ -52,6 +52,6 @@ def delete(self, route_url, params = {}): def get_user_from_token(access_token): """Fetch user data using the access token.""" url = api_url + '/user' - params = { 'access_token': access_token } + headers = {'Authorization' : 'token ' + access_token} - return requests.get(url, params=params).json() + return requests.get(url, headers=headers).json() From dc8b478ed918d8db1a5686721d97dcd0e6d3f31d Mon Sep 17 00:00:00 2001 From: kazemicode Date: Sun, 10 Jan 2021 20:03:49 -0800 Subject: [PATCH 2/2] passing auth token via header since passing via params is deprecated --- app/controllers/auth.py | 3 +-- app/models/user.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/auth.py b/app/controllers/auth.py index d2a33c6..e4f1b1f 100644 --- a/app/controllers/auth.py +++ b/app/controllers/auth.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import functools, json, requests -import pdb from flask import flash, redirect, render_template, request from flask import Blueprint, session, url_for, g @@ -33,7 +32,7 @@ def githubCallback(): session['access_token'] = access_token session['user_id'] = user.id - pdb.set_trace() + return redirect(url_for('home.index')) @blueprint.route('/logout') diff --git a/app/models/user.py b/app/models/user.py index b218600..c43b61b 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -17,7 +17,7 @@ def __init__(self, username, avatar_url, github_id): @staticmethod def find_or_create_from_token(access_token): data = GitHub.get_user_from_token(access_token) - print(data) + """Find existing user or create new User instance""" instance = User.query.filter_by(username=data['login']).first()