mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vfmt: change all '$expr' to '${expr}' (#16428)

Browse Source
This commit is contained in:
yuyi
2022-11-15 21:53:13 +08:00
committed by GitHub
parent 56239b4a23
commit 017ace6ea7
859 changed files with 7156 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/vweb_orm_jwt/src/auth_controllers.v
View File

@ -7,12 +7,12 @@ import json
pub fn (mut app App) controller_auth() vweb.Result {
body := json.decode(AuthRequestDto, app.req.data) or {
app.set_status(400, '')
return app.text('Failed to decode json, error: $err')
return app.text('Failed to decode json, error: ${err}')
}
response := app.service_auth(body.username, body.password) or {
app.set_status(400, '')
return app.text('error: $err')
return app.text('error: ${err}')
}
return app.json(response)

10
examples/vweb_orm_jwt/src/auth_services.v
View File

@ -45,7 +45,7 @@ fn (mut app App) service_auth(username string, password string) !string {
db.close()!
bcrypt.compare_hash_and_password(password.bytes(), user.password.bytes()) or {
return error('Failed to auth user, $err')
return error('Failed to auth user, ${err}')
}
token := make_token(user)
@ -58,17 +58,17 @@ fn make_token(user User) string {
jwt_header := JwtHeader{'HS256', 'JWT'}
jwt_payload := JwtPayload{
sub: '$user.id'
name: '$user.username'
sub: '${user.id}'
name: '${user.username}'
iat: time.now()
}
header := base64.url_encode(json.encode(jwt_header).bytes())
payload := base64.url_encode(json.encode(jwt_payload).bytes())
signature := base64.url_encode(hmac.new(secret.bytes(), '${header}.$payload'.bytes(),
signature := base64.url_encode(hmac.new(secret.bytes(), '${header}.${payload}'.bytes(),
sha256.sum, sha256.block_size).bytestr().bytes())
jwt := '${header}.${payload}.$signature'
jwt := '${header}.${payload}.${signature}'
return jwt
}

4
examples/vweb_orm_jwt/src/main.v
View File

@ -12,7 +12,7 @@ struct App {
}
pub fn (app App) before_request() {
println('[Vweb] $app.Context.req.method $app.Context.req.url')
println('[Vweb] ${app.Context.req.method} ${app.Context.req.url}')
}
fn main() {
@ -20,7 +20,7 @@ fn main() {
sql db {
create table User
} or { panic('error on create table: $err') }
} or { panic('error on create table: ${err}') }
db.close() or { panic(err) }

12
examples/vweb_orm_jwt/src/user_controllers.v
View File

@ -8,7 +8,7 @@ import databases
pub fn (mut app App) controller_get_user_by_id(id int) vweb.Result {
response := app.service_get_user_by_id(id) or {
app.set_status(400, '')
return app.text('$err')
return app.text('${err}')
}
return app.json(response)
}
@ -17,12 +17,12 @@ pub fn (mut app App) controller_get_user_by_id(id int) vweb.Result {
pub fn (mut app App) controller_create_user() vweb.Result {
body := json.decode(User, app.req.data) or {
app.set_status(400, '')
return app.text('Failed to decode json, error: $err')
return app.text('Failed to decode json, error: ${err}')
}
response := app.service_add_user(body.username, body.password) or {
app.set_status(400, '')
return app.text('error: $err')
return app.text('error: ${err}')
}
return app.json(response)
@ -39,7 +39,7 @@ pub fn (mut app App) controller_get_all_user() vweb.Result {
response := app.service_get_all_user() or {
app.set_status(400, '')
return app.text('$err')
return app.text('${err}')
}
return app.json(response)
}
@ -48,7 +48,7 @@ pub fn (mut app App) controller_get_all_user() vweb.Result {
pub fn (mut app App) controller_get_by_username(username string) vweb.Result {
response := app.service_get_by_username(username) or {
app.set_status(400, '')
return app.text('$err')
return app.text('${err}')
}
return app.json(response)
}
@ -57,7 +57,7 @@ pub fn (mut app App) controller_get_by_username(username string) vweb.Result {
pub fn (mut app App) delete() vweb.Result {
mut db := databases.create_db_connection() or {
app.set_status(400, '')
return app.text('$err')
return app.text('${err}')
}
defer {