Skip to content

irul / opensipkd-base

Go to a project
Commit d58e4def by aagusti
Options

perbaikan oauth login

1 parent 6ef023be
Inline Side-by-side
Showing 2 changed files with 84 additions and 67 deletions
opensipkd/base/views/base_google.py
...@@ -64,13 +64,14 @@ def googlesignin(request, data=None): ...@@ -64,13 +64,14 @@ def googlesignin(request, data=None):
# Or, if multiple clients access the backend server: # Or, if multiple clients access the backend server:
id_token = "id_token" in request.params and request.params[ id_token = "id_token" in request.params and request.params[
'id_token'] or None 'id_token'] or ""
gtoken = None gtoken = None
if id_token: if id_token:
gtoken = json.loads(id_token) gtoken = json.loads(id_token)
else: else:
if data and "id_token" in data: if data and "id_token" in data:
gtoken = data["id_token"] gtoken = data["id_token"]
_logging.debug(gtoken) _logging.debug(gtoken)
if not gtoken: if not gtoken:
raise Exception("Gtoken not found") raise Exception("Gtoken not found")
......
opensipkd/base/views/user_login.py
...@@ -20,6 +20,7 @@ Perubahan Mendasar dari fungsi login adalah: ...@@ -20,6 +20,7 @@ Perubahan Mendasar dari fungsi login adalah:
result object dari fungsi tersebut harus berupa class User() result object dari fungsi tersebut harus berupa class User()
""" """
import os import os
import re
from datetime import timedelta, datetime from datetime import timedelta, datetime
from importlib import import_module from importlib import import_module
...@@ -87,14 +88,76 @@ class LoginUser(object): ...@@ -87,14 +88,76 @@ class LoginUser(object):
self.message = "Login Gagal" self.message = "Login Gagal"
set_user_log(self.message, self.request, log, values["username"]) set_user_log(self.message, self.request, log, values["username"])
return return
# generate security_code dan simpan dalam session # generate security_code dan simpan dalam session
regenerate_security_code(self.user, 0.03) # berlaku selama 1.8 menit regenerate_security_code(self.user, 0.03) # berlaku selama 1.8 menit
# dicek pada module security get_user # dicek pada module security get_user
self.request.session["token"]=self.user.security_code self.request.session["token"] = self.user.security_code
return True return True
class Oauth2ParseExc(Exception):
"""Error parsing"""
class Oauth2UserExc(Exception):
"""Error User Found"""
def oauth2_login(request, params=None):
provider_name = params and params["provider_name"] \
or request.params["provider_name"]
if provider_name == "google":
from .base_google import googlesignin
try:
id_info = googlesignin(request, params)
except Exception as e:
raise Oauth2ParseExc(str(e))
request.session["id_info"] = id_info
else:
id_info = None
iss = id_info and re.sub(r'https?://', '', id_info['iss']) or None
user = id_info and ExternalIdentityService. \
user_by_external_id_and_provider(id_info['sub'], iss)
log.debug("Users : %s", user)
log.debug("IdInfo : %s", id_info)
if id_info and not user:
values = {'email': id_info['email'],
"user_name": id_info["email"],
"status": 1,
"registered_date": datetime.now()}
user = User.get_by_identity(values.get("email"))
partner = Partner.query_email(values.get("email")).first()
log.debug("User : %s", user)
log.debug("Partner : %s", partner)
if user or partner:
raise Oauth2UserExc("Email sudah terdaftar silahkan login standard")
user = User()
user.from_dict(values)
DBSession.add(user)
DBSession.flush()
DBSession.refresh(user)
values = {'external_id': id_info['sub'],
'external_user_name': id_info["name"],
'external_email': id_info["email"],
'provider_name': iss,
"local_user_id": user.id,
"status": 1}
external = ExternalIdentity()
external.from_dict(values)
DBSession.add(external)
DBSession.flush()
# # todo: what is this????
# # values['access_token']
# # values['alt_token']
# # values['token_secret']
return user
class ViewLogin(BaseView): class ViewLogin(BaseView):
@view_config(route_name='login', renderer='templates/form.pt') @view_config(route_name='login', renderer='templates/form.pt')
def view_login(self): def view_login(self):
...@@ -162,69 +225,22 @@ class ViewLogin(BaseView): ...@@ -162,69 +225,22 @@ class ViewLogin(BaseView):
elif "provider_name" in request.params and \ elif "provider_name" in request.params and \
request.params["provider_name"]: request.params["provider_name"]:
provider_name = request.params["provider_name"] try:
if provider_name == "google": user = oauth2_login(request)
from .base_google import googlesignin except Oauth2ParseExc as e:
try: login = ""
id_info = googlesignin(request) request.session.flash(str(e), "error")
except Exception as e: return render_to_response(
login = "" login_tpl, dict(
request.session.flash(str(e), "error") form=form.render(),
return render_to_response( message=message,
login_tpl, dict( url=request.route_url('login'),
form=form.render(), next_url=next_url,
message=message, login=login, ),
url=request.route_url('login'), request=request)
next_url=next_url, except Oauth2UserExc as e:
login=login, ), request.session.flash(str(e), 'error')
request=request) return HTTPFound(location=request.route_url('login'))
request.session["id_info"] = id_info
else:
id_info = None
user = id_info and ExternalIdentityService. \
user_by_external_id_and_provider(id_info['sub'], id_info['iss'])
log.debug("Users : %s", user)
log.debug("IdInfo : %s", id_info)
if id_info and not user:
# Proses Register user
# Cek Data di user dan partner
# Jika sudah ada user login klasik pake user password
# Simpan ke table user dan external identity
values = {'email': id_info['email'],
"user_name": id_info["email"],
"status": 1,
"registered_date": datetime.now()}
user = User.get_by_identity(values.get("email"))
partner = Partner.query_email(values.get("email")).first()
log.debug("User : %s", user)
log.debug("Partner : %s", partner)
if user or partner:
request.session.flash(
"Email sudah terdaftar silahkan login standard",
'error')
return HTTPFound(location=request.route_url('login'))
user = User()
user.from_dict(values)
DBSession.add(user)
DBSession.flush()
DBSession.refresh(user)
values = {'external_id': id_info['sub'],
'external_user_name': id_info["name"],
'external_email': id_info["email"],
'provider_name': id_info["iss"],
"local_user_id": user.id,
"status": 1}
external = ExternalIdentity()
external.from_dict(values)
DBSession.add(external)
DBSession.flush()
# # todo: what is this????
# # values['access_token']
# # values['alt_token']
# # values['token_secret']
if user and user.status == 1: if user and user.status == 1:
return redirect_login(request, user) return redirect_login(request, user)
else: else:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!