Merge branch 'mvp_feature3_dev' of https://dev.azure.com/alicorn-dev/KintoneAppBuilder/_git/KintoneAppBuilder into mvp_feature3_dev
This commit is contained in:
@@ -38,9 +38,10 @@ async def login(
|
|||||||
|
|
||||||
@r.post("/signup")
|
@r.post("/signup")
|
||||||
async def signup(
|
async def signup(
|
||||||
|
firstname:str, lastname:str,
|
||||||
db=Depends(get_db), form_data: OAuth2PasswordRequestForm = Depends()
|
db=Depends(get_db), form_data: OAuth2PasswordRequestForm = Depends()
|
||||||
):
|
):
|
||||||
user = sign_up_new_user(db, form_data.username, form_data.password)
|
user = sign_up_new_user(db, form_data.username, form_data.password,firstname,lastname)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_409_CONFLICT,
|
status_code=status.HTTP_409_CONFLICT,
|
||||||
|
|||||||
@@ -241,7 +241,6 @@ async def get_useractivedomain(
|
|||||||
)
|
)
|
||||||
async def update_activeuserdomain(
|
async def update_activeuserdomain(
|
||||||
request: Request,
|
request: Request,
|
||||||
userid: int,
|
|
||||||
domainid:int,
|
domainid:int,
|
||||||
user=Depends(get_current_user),
|
user=Depends(get_current_user),
|
||||||
db=Depends(get_db),
|
db=Depends(get_db),
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ def authenticate_user(db, email: str, password: str):
|
|||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
def sign_up_new_user(db, email: str, password: str):
|
def sign_up_new_user(db, email: str, password: str, firstname: str,lastname: str):
|
||||||
user = get_user_by_email(db, email)
|
user = get_user_by_email(db, email)
|
||||||
if user:
|
if user:
|
||||||
return False # User already exists
|
return False # User already exists
|
||||||
@@ -67,6 +67,8 @@ def sign_up_new_user(db, email: str, password: str):
|
|||||||
schemas.UserCreate(
|
schemas.UserCreate(
|
||||||
email=email,
|
email=email,
|
||||||
password=password,
|
password=password,
|
||||||
|
firstname = firstname,
|
||||||
|
lastname = lastname,
|
||||||
is_active=True,
|
is_active=True,
|
||||||
is_superuser=False,
|
is_superuser=False,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ class UserOut(UserBase):
|
|||||||
|
|
||||||
class UserCreate(UserBase):
|
class UserCreate(UserBase):
|
||||||
password: str
|
password: str
|
||||||
|
first_name: str
|
||||||
|
last_name: str
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
orm_mode = True
|
orm_mode = True
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ export const useAuthStore = defineStore({
|
|||||||
this.token =result.data.access_token;
|
this.token =result.data.access_token;
|
||||||
this.name = result.data.user_name;
|
this.name = result.data.user_name;
|
||||||
localStorage.setItem('token', result.data.access_token);
|
localStorage.setItem('token', result.data.access_token);
|
||||||
localStorage.setItem('id', result.data.user_id);
|
|
||||||
localStorage.setItem('name', result.data.user_name);
|
localStorage.setItem('name', result.data.user_name);
|
||||||
// const config = {headers:{Authorization : 'Bearer ' + this.token}};
|
// const config = {headers:{Authorization : 'Bearer ' + this.token}};
|
||||||
api.defaults.headers["Authorization"]='Bearer ' + this.token;
|
api.defaults.headers["Authorization"]='Bearer ' + this.token;
|
||||||
@@ -46,7 +45,6 @@ export const useAuthStore = defineStore({
|
|||||||
logout() {
|
logout() {
|
||||||
this.token = null;
|
this.token = null;
|
||||||
localStorage.removeItem('token');
|
localStorage.removeItem('token');
|
||||||
localStorage.removeItem('id');
|
|
||||||
localStorage.removeItem('name');
|
localStorage.removeItem('name');
|
||||||
localStorage.removeItem('domain');
|
localStorage.removeItem('domain');
|
||||||
Router.push('/login');
|
Router.push('/login');
|
||||||
|
|||||||
Reference in New Issue
Block a user