Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
webomagic-auth
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Pratik Shrivastava
webomagic-auth
Commits
98bb3639
Commit
98bb3639
authored
Jul 13, 2024
by
deepdey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: reconstrct application
parent
97676091
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
30 additions
and
103 deletions
+30
-103
app/__init__.py
app/__init__.py
+1
-6
app/app_config/constant.py
app/app_config/constant.py
+1
-0
app/orm/__init__.py
app/orm/__init__.py
+4
-1
app/orm/role_orm.py
app/orm/role_orm.py
+2
-0
app/orm/user_orm.py
app/orm/user_orm.py
+1
-1
app/orm/user_role_map_orm.py
app/orm/user_role_map_orm.py
+3
-1
app/routes/user/__init__.py
app/routes/user/__init__.py
+6
-1
app/routes/user/user_dao_service.py
app/routes/user/user_dao_service.py
+3
-8
app/routes/user/user_payload.py
app/routes/user/user_payload.py
+3
-6
app/routes/user/user_response.py
app/routes/user/user_response.py
+2
-18
app/routes/user/user_validator.py
app/routes/user/user_validator.py
+0
-36
app/utils/get_my_ip.py
app/utils/get_my_ip.py
+0
-8
app/utils/model_to_dict.py
app/utils/model_to_dict.py
+0
-13
app/utils/redis.py
app/utils/redis.py
+4
-4
No files found.
app/__init__.py
View file @
98bb3639
from
flask
import
Flask
from
flask
import
Flask
from
flask_cors
import
CORS
from
flask_cors
import
CORS
from
flask_jwt_extended
import
JWTManager
from
flask_bcrypt
import
Bcrypt
from
flask_bcrypt
import
Bcrypt
from
flask_sqlalchemy
import
SQLAlchemy
from
flask_sqlalchemy
import
SQLAlchemy
from
app.app_config.config
import
DB_URI
,
JWT_SECRET_KEY
from
app.app_config.config
import
DB_URI
...
@@ -15,12 +14,8 @@ cors: CORS = CORS(app, resources={r'/*': {'origins': '*'}})
...
@@ -15,12 +14,8 @@ cors: CORS = CORS(app, resources={r'/*': {'origins': '*'}})
# db configuration
# db configuration
app
.
config
[
'SQLALCHEMY_DATABASE_URI'
]
=
DB_URI
app
.
config
[
'SQLALCHEMY_DATABASE_URI'
]
=
DB_URI
app
.
config
[
'SQLALCHEMY_TRACK_MODIFICATIONS'
]
=
False
app
.
config
[
'SQLALCHEMY_TRACK_MODIFICATIONS'
]
=
False
app
.
config
[
'JWT_SECRET_KEY'
]
=
JWT_SECRET_KEY
app
.
config
[
'JWT_TOKEN_LOCATION'
]
=
[
'headers'
]
app
.
config
[
'JWT_HEADER_TYPE'
]
=
'Bearer'
db
:
SQLAlchemy
=
SQLAlchemy
(
app
)
db
:
SQLAlchemy
=
SQLAlchemy
(
app
)
jwt
=
JWTManager
(
app
)
# IMPORTANT: BCRYPT IS USED FOR HASHING THE PASSWORD ONLY AS IT IS CPU INTENSIVE
# IMPORTANT: BCRYPT IS USED FOR HASHING THE PASSWORD ONLY AS IT IS CPU INTENSIVE
...
...
app/app_config/constant.py
0 → 100644
View file @
98bb3639
ALPHANUMARIC_STRING
:
str
=
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
\ No newline at end of file
app/orm/__init__.py
View file @
98bb3639
from
app.orm.user_orm
import
*
from
app.orm.user_orm
import
*
from
app.orm.
role
_orm
import
*
from
app.orm.
api
_orm
import
*
from
app.orm.role_type_orm
import
*
from
app.orm.role_type_orm
import
*
from
app.orm.role_orm
import
*
from
app.orm.user_role_map_orm
import
*
from
app.orm.role_api_map_orm
import
*
app/orm/role_orm.py
View file @
98bb3639
...
@@ -22,3 +22,5 @@ class Role(db.Model, SerializerMixin):
...
@@ -22,3 +22,5 @@ class Role(db.Model, SerializerMixin):
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
role_type
=
db
.
relationship
(
'RoleType'
)
app/orm/user_orm.py
View file @
98bb3639
...
@@ -28,6 +28,6 @@ class User(db.Model, SerializerMixin):
...
@@ -28,6 +28,6 @@ class User(db.Model, SerializerMixin):
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
# user_roles = db.relationship('Role
')
user_roles
=
db
.
relationship
(
'UserRoleMap
'
)
serialize_rules
=
(
'-password'
,)
serialize_rules
=
(
'-password'
,)
app/orm/user_role_map_orm.py
View file @
98bb3639
...
@@ -18,3 +18,5 @@ class UserRoleMap(db.Model, SerializerMixin):
...
@@ -18,3 +18,5 @@ class UserRoleMap(db.Model, SerializerMixin):
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
role
=
db
.
relationship
(
'Role'
)
\ No newline at end of file
app/routes/user/__init__.py
View file @
98bb3639
...
@@ -5,6 +5,7 @@ from flask import request
...
@@ -5,6 +5,7 @@ from flask import request
from
flask_restx
import
Resource
from
flask_restx
import
Resource
from
marshmallow
import
ValidationError
from
marshmallow
import
ValidationError
from
app.app_config.config
import
get_logger
from
app.app_config.config
import
get_logger
from
app.app_config.constant
import
ALPHANUMARIC_STRING
from
app.app_config.response_code
import
*
from
app.app_config.response_code
import
*
from
app.app_config.response_message
import
*
from
app.app_config.response_message
import
*
from
app.decorators.sanitizer
import
sanitized
from
app.decorators.sanitizer
import
sanitized
...
@@ -31,7 +32,7 @@ ns = api.namespace(
...
@@ -31,7 +32,7 @@ ns = api.namespace(
class
Login
(
Resource
):
class
Login
(
Resource
):
def
generate_api_key
(
self
)
->
str
:
def
generate_api_key
(
self
)
->
str
:
return
''
.
join
(
secrets
.
choice
(
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
)
for
_
in
range
(
18
))
return
''
.
join
(
secrets
.
choice
(
ALPHANUMARIC_STRING
)
for
_
in
range
(
18
))
@
ns
.
expect
(
*
login_payload
())
@
ns
.
expect
(
*
login_payload
())
@
ns
.
response
(
*
login_response
())
@
ns
.
response
(
*
login_response
())
...
@@ -44,6 +45,8 @@ class Login(Resource):
...
@@ -44,6 +45,8 @@ class Login(Resource):
email
:
str
=
payload
[
'email'
]
email
:
str
=
payload
[
'email'
]
password
:
str
=
payload
[
'password'
]
password
:
str
=
payload
[
'password'
]
# hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
user_info
:
ORM
.
User
|
None
=
get_user_by_email
(
email
)
user_info
:
ORM
.
User
|
None
=
get_user_by_email
(
email
)
if
(
not
user_info
):
if
(
not
user_info
):
...
@@ -52,6 +55,8 @@ class Login(Resource):
...
@@ -52,6 +55,8 @@ class Login(Resource):
if
not
bcrypt
.
check_password_hash
(
user_info
.
password
,
password
):
if
not
bcrypt
.
check_password_hash
(
user_info
.
password
,
password
):
return
prepare_api_response
(
401
,
'Invalid password'
)
return
prepare_api_response
(
401
,
'Invalid password'
)
# fetch user role info
api_key
=
self
.
generate_api_key
()
api_key
=
self
.
generate_api_key
()
if
user_info
.
id
:
if
user_info
.
id
:
...
...
app/routes/user/user_dao_service.py
View file @
98bb3639
from
typing
import
List
from
app
import
orm
as
ORM
from
app
import
orm
as
ORM
from
app
import
db
def
get_user_by_username
(
username
:
str
)
->
ORM
.
User
|
None
:
def
get_user_by_username
(
username
:
str
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
return
ORM
.
User
.
query
.
filter_by
(
username
=
username
,
is_deleted
=
False
)
.
first
()
username
=
username
,
is_deleted
=
False
)
.
first
()
def
get_user_by_email
(
email
:
str
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
email
=
email
,
is_deleted
=
False
)
.
first
()
def
get_user_by_email
(
email
:
str
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
email
=
email
,
is_deleted
=
False
)
.
first
()
app/routes/user/user_payload.py
View file @
98bb3639
...
@@ -4,11 +4,8 @@ from app.routes import api
...
@@ -4,11 +4,8 @@ from app.routes import api
def
login_payload
()
->
list
:
def
login_payload
()
->
list
:
payload
=
api
.
model
(
'login Payload'
,
{
payload
=
api
.
model
(
'email'
:
fields
.
String
,
'login Payload'
,
{
'email'
:
fields
.
String
,
'password'
:
fields
.
String
}
'password'
:
fields
.
String
)
})
return
[
payload
]
return
[
payload
]
app/routes/user/user_response.py
View file @
98bb3639
...
@@ -5,22 +5,7 @@ from flask_restx import fields
...
@@ -5,22 +5,7 @@ from flask_restx import fields
from
app.utils.api_response
import
prepare_swagger_response
from
app.utils.api_response
import
prepare_swagger_response
USER_RESPONSE_MODEL
:
any
=
api
.
model
(
'user'
,
{
LOGIN_RESPONSE_MODEL
:
any
=
api
.
model
(
'login Data'
,
{
'apiKey'
:
fields
.
String
})
'id'
:
fields
.
Integer
,
'username'
:
fields
.
String
,
'first_name'
:
fields
.
String
,
'last_name'
:
fields
.
String
,
'password'
:
fields
.
String
,
'phone'
:
fields
.
String
,
'email'
:
fields
.
String
,
'gender'
:
fields
.
String
,
'active'
:
fields
.
Boolean
,
'date_of_join'
:
fields
.
Integer
(
description
=
'date in epoch format'
),
})
JWT_RESPONSE_MODEL
:
any
=
api
.
model
(
'jwt Data'
,
{
'jwt'
:
fields
.
String
})
def
login_response
()
->
any
:
def
login_response
()
->
any
:
...
@@ -28,6 +13,5 @@ def login_response() -> any:
...
@@ -28,6 +13,5 @@ def login_response() -> any:
code
=
SUCCESS_CODE
,
code
=
SUCCESS_CODE
,
message
=
SUCCESS_MESSAGE
,
message
=
SUCCESS_MESSAGE
,
model_name
=
'login Response'
,
model_name
=
'login Response'
,
data
=
fields
.
Nested
(
JWT_RESPONSE_MODEL
)
data
=
fields
.
Nested
(
LOGIN_RESPONSE_MODEL
),
)
)
app/routes/user/user_validator.py
View file @
98bb3639
# from app.enum.user_role_enum import USER_ROLE
from
marshmallow
import
Schema
,
fields
,
validate
from
marshmallow
import
Schema
,
fields
,
validate
class
LoginValidator
(
Schema
):
class
LoginValidator
(
Schema
):
email
=
fields
.
String
(
required
=
True
)
email
=
fields
.
String
(
required
=
True
)
password
=
fields
.
String
(
required
=
True
)
password
=
fields
.
String
(
required
=
True
)
# class AddUserValidator(Schema):
# username = fields.String(required=True)
# first_name = fields.String(required=True)
# last_name = fields.String(required=True)
# password = fields.String(required=True, validate=validate.Length(min=6, max=32))
# phone = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
# email = fields.String(required=True, validate=validate.Email())
# gender = fields.String(required=True)
# active = fields.Boolean(required=True)
# date_of_join = fields.Integer(required=True)
# roles = fields.List(
# fields.String(
# required=True,
# validate=validate.OneOf(USER_ROLE.get_list()),
# ),
# required=True,
# validate=validate.Length(min=1),
# )
# class UpdateUserValidator(Schema):
# id = fields.Integer(required=True, validate=validate.Range(min=1))
# first_name = fields.String(required=True)
# last_name = fields.String(required=True)
# password = fields.String(required=True, validate=validate.Length(min=6, max=32))
# phone = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
# gender = fields.String(required=True)
# active = fields.Boolean(required=True)
# date_of_join = fields.Integer(required=True)
# class GetUserValidator(Schema):
# id = fields.Integer(required=True, validate=validate.Range(min=1))
app/utils/get_my_ip.py
deleted
100644 → 0
View file @
97676091
from
flask
import
Request
def
get_my_ip
(
request
:
Request
)
->
str
:
ip_address
:
str
=
request
.
environ
.
get
(
'HTTP_X_FORWARDED_FOR'
)
if
ip_address
is
None
:
ip_address
=
request
.
environ
[
'REMOTE_ADDR'
]
return
ip_address
\ No newline at end of file
app/utils/model_to_dict.py
deleted
100644 → 0
View file @
97676091
from
datetime
import
datetime
from
decimal
import
Decimal
def
model_to_dict
(
self
):
result
:
dict
=
{}
for
column
in
self
.
__table__
.
columns
:
value
=
getattr
(
self
,
column
.
name
)
if
isinstance
(
value
,
datetime
):
value
=
value
.
isoformat
()
if
isinstance
(
value
,
Decimal
):
value
=
float
(
value
)
result
[
column
.
name
]
=
value
return
result
\ No newline at end of file
app/utils/redis.py
View file @
98bb3639
...
@@ -2,7 +2,7 @@ import redis
...
@@ -2,7 +2,7 @@ import redis
from
app.app_config.config
import
REDIS_HOST
,
REDIS_PORT
,
REDIS_DATABASE
from
app.app_config.config
import
REDIS_HOST
,
REDIS_PORT
,
REDIS_DATABASE
def
get_client
(
host
,
port
,
password
)
:
def
get_client
(
host
:
str
,
port
:
int
,
password
:
str
)
->
redis
.
Redis
|
None
:
try
:
try
:
redis_client
=
redis
.
Redis
(
host
=
host
,
port
=
port
,
db
=
REDIS_DATABASE
)
redis_client
=
redis
.
Redis
(
host
=
host
,
port
=
port
,
db
=
REDIS_DATABASE
)
return
redis_client
return
redis_client
...
@@ -11,7 +11,7 @@ def get_client(host, port, password):
...
@@ -11,7 +11,7 @@ def get_client(host, port, password):
return
None
return
None
def
get_value
(
key
)
:
def
get_value
(
key
:
str
)
->
str
|
None
:
try
:
try
:
client
=
get_client
(
REDIS_HOST
,
REDIS_PORT
,
None
)
client
=
get_client
(
REDIS_HOST
,
REDIS_PORT
,
None
)
val
=
client
.
get
(
str
(
key
))
val
=
client
.
get
(
str
(
key
))
...
@@ -21,11 +21,11 @@ def get_value(key):
...
@@ -21,11 +21,11 @@ def get_value(key):
return
None
return
None
def
set_value
(
key
,
value
)
:
def
set_value
(
key
:
str
,
value
:
str
)
->
bool
:
try
:
try
:
client
=
get_client
(
REDIS_HOST
,
REDIS_PORT
,
None
)
client
=
get_client
(
REDIS_HOST
,
REDIS_PORT
,
None
)
client
.
set
(
key
,
value
)
client
.
set
(
key
,
value
)
return
True
return
True
except
Exception
as
e
:
except
Exception
as
e
:
print
(
e
)
print
(
e
)
return
None
return
False
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment