mirror of
https://github.com/vlang/v.git
synced 2025-09-13 22:42:26 +03:00
vcreate: update templates, add lib (#19444)
This commit is contained in:
Turiiya
GitHub
parent
9a03e18b81
commit
1a2ad27e79
4 changed files with 826 additions and 805 deletions
13
cmd/tools/vcreate/project_model_bin.v
Normal file
13
cmd/tools/vcreate/project_model_bin.v
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
module main
|
||||
|
||||
fn (mut c Create) set_bin_project_files(new bool) {
|
||||
c.files << ProjectFiles{
|
||||
path: if new { '${c.name}/src/main.v' } else { 'src/main.v' }
|
||||
content: "module main
|
||||
|
||||
fn main() {
|
||||
println('Hello World!')
|
||||
}
|
||||
"
|
||||
}
|
||||
}
|
||||
23
cmd/tools/vcreate/project_model_lib.v
Normal file
23
cmd/tools/vcreate/project_model_lib.v
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
module main
|
||||
|
||||
fn (mut c Create) set_lib_project_files() {
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/${c.name}.v'
|
||||
content: 'module ${c.name}
|
||||
|
||||
// square calculates the second power of `x`
|
||||
pub fn square(x int) int {
|
||||
return x * x
|
||||
}
|
||||
'
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/tests/square_test.v'
|
||||
content: 'import ${c.name}
|
||||
|
||||
fn test_square() {
|
||||
assert ${c.name}.square(2) == 4
|
||||
}
|
||||
'
|
||||
}
|
||||
}
|
||||
773
cmd/tools/vcreate/project_model_web.v
Normal file
773
cmd/tools/vcreate/project_model_web.v
Normal file
|
|
@ -0,0 +1,773 @@
|
|||
module main
|
||||
|
||||
fn (mut c Create) set_web_project_files() {
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/databases/config_databases_sqlite.v'
|
||||
content: "module databases
|
||||
|
||||
import db.sqlite // can change to 'db.mysql', 'db.pg'
|
||||
|
||||
pub fn create_db_connection() !sqlite.DB {
|
||||
mut db := sqlite.connect('app.db')!
|
||||
return db
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/header_component.html'
|
||||
content: "<nav>
|
||||
<div class='nav-wrapper'>
|
||||
<a href='javascript:window.history.back();' class='left'>
|
||||
<i class='material-icons'>arrow_back_ios_new</i>
|
||||
</a>
|
||||
<a href='/'>
|
||||
<img src='src/assets/veasel.png' alt='logo' style='max-height: 100%' />
|
||||
</a>
|
||||
<ul id='nav-mobile' class='right'>
|
||||
<li><a href='https://github.com/vlang/v'>github</a></li>
|
||||
<li><a href='https://vlang.io/'>website</a></li>
|
||||
<li><a href='https://github.com/sponsors/medvednikov'>support</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/products.css'
|
||||
content: 'h1.title {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
color: #3b7bbf;
|
||||
}
|
||||
|
||||
div.products-table {
|
||||
border: 1px solid;
|
||||
max-width: 720px;
|
||||
padding: 10px;
|
||||
margin: 10px;
|
||||
}'
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/products.html'
|
||||
content: "<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<!--Let browser know website is optimized for mobile-->
|
||||
<meta charset='UTF-8' name='viewport' content='width=device-width, initial-scale=1.0'>
|
||||
|
||||
<!-- Compiled and minified CSS -->
|
||||
<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'>
|
||||
|
||||
<!-- Compiled and minified JavaScript -->
|
||||
<script src='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js'></script>
|
||||
|
||||
<!-- Material UI icons -->
|
||||
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
||||
|
||||
<title>Login</title>
|
||||
@css 'src/templates/products.css'
|
||||
</head>
|
||||
<body>
|
||||
<div>@include 'header_component.html'</div>
|
||||
<h1 class='title'>Hi, \${user.username}! you are online</h1>
|
||||
<!-- <button onclick='document.location.reload(true)'>Lala</button> -->
|
||||
<form id='product_form' method='post' action=''>
|
||||
<div class='row'>
|
||||
<div class='input-field col s2'>
|
||||
<input id='product_name' name='product_name' type='text' class='validate'>
|
||||
<label class='active' for='product_name'>product name</label>
|
||||
</div>
|
||||
<div style='margin-top: 10px;'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='addProduct()' formaction='javascript:void(0);' value='Register' required autofocus>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div style='width: 20; height: 300;'>
|
||||
<input type='text' name='product_name' placeholder='product name' required autofocus>
|
||||
</div> -->
|
||||
</form>
|
||||
<script type='text/javascript'>
|
||||
function getCookie(cookieName) {
|
||||
let cookie = {};
|
||||
document.cookie.split(';').forEach(function(el) {
|
||||
let [key,value] = el.split('=');
|
||||
cookie[key.trim()] = value;
|
||||
})
|
||||
return cookie[cookieName];
|
||||
}
|
||||
async function addProduct() {
|
||||
const form = document.querySelector('#product_form');
|
||||
const formData = new FormData(form);
|
||||
console.log(getCookie('token'));
|
||||
await fetch('/controller/product/create', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
headers :{
|
||||
token: getCookie('token')
|
||||
}
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 201) {
|
||||
throw await response.text()
|
||||
}
|
||||
return await response.text()
|
||||
})
|
||||
.then((data) => {
|
||||
// alert('User created successfully')
|
||||
document.location.reload(true)
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<div class='products-table card-panel'>
|
||||
<table class='highlight striped responsive-table'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Name</th>
|
||||
<th>Created date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@for product in user.products
|
||||
<tr>
|
||||
<td>\${product.id}</td>
|
||||
<td>\${product.name}</td>
|
||||
<td>\${product.created_at}</td>
|
||||
</tr>
|
||||
@end
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_controllers.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
|
||||
['/controller/auth'; post]
|
||||
pub fn (mut app App) controller_auth(username string, password string) vweb.Result {
|
||||
response := app.service_auth(username, password) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
|
||||
return app.json(response)
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_dto.v'
|
||||
content: 'module main
|
||||
|
||||
struct AuthRequestDto {
|
||||
username string [nonull]
|
||||
password string [nonull]
|
||||
}
|
||||
'
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_services.v'
|
||||
content: "module main
|
||||
|
||||
import crypto.hmac
|
||||
import crypto.sha256
|
||||
import crypto.bcrypt
|
||||
import encoding.base64
|
||||
import json
|
||||
import databases
|
||||
import time
|
||||
|
||||
struct JwtHeader {
|
||||
alg string
|
||||
typ string
|
||||
}
|
||||
|
||||
struct JwtPayload {
|
||||
sub string // (subject) = Entity to whom the token belongs, usually the user ID;
|
||||
iss string // (issuer) = Token issuer;
|
||||
exp string // (expiration) = Timestamp of when the token will expire;
|
||||
iat time.Time // (issued at) = Timestamp of when the token was created;
|
||||
aud string // (audience) = Token recipient, represents the application that will use it.
|
||||
name string
|
||||
roles string
|
||||
permissions string
|
||||
}
|
||||
|
||||
fn (mut app App) service_auth(username string, password string) !string {
|
||||
mut db := databases.create_db_connection() or {
|
||||
eprintln(err)
|
||||
panic(err)
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
users := sql db {
|
||||
select from User where username == username
|
||||
}!
|
||||
if users.len == 0 {
|
||||
return error('user not found')
|
||||
}
|
||||
user := users.first()
|
||||
|
||||
if !user.active {
|
||||
return error('user is not active')
|
||||
}
|
||||
|
||||
bcrypt.compare_hash_and_password(password.bytes(), user.password.bytes()) or {
|
||||
return error('Failed to auth user, \${err}')
|
||||
}
|
||||
|
||||
token := make_token(user)
|
||||
return token
|
||||
}
|
||||
|
||||
fn make_token(user User) string {
|
||||
secret := 'SECRET_KEY' // os.getenv('SECRET_KEY')
|
||||
|
||||
jwt_header := JwtHeader{'HS256', 'JWT'}
|
||||
jwt_payload := JwtPayload{
|
||||
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(),
|
||||
sha256.sum, sha256.block_size).bytestr().bytes())
|
||||
|
||||
jwt := '\${header}.\${payload}.\${signature}'
|
||||
|
||||
return jwt
|
||||
}
|
||||
|
||||
fn auth_verify(token string) bool {
|
||||
if token == '' {
|
||||
return false
|
||||
}
|
||||
secret := 'SECRET_KEY' // os.getenv('SECRET_KEY')
|
||||
token_split := token.split('.')
|
||||
|
||||
signature_mirror := hmac.new(secret.bytes(), '\${token_split[0]}.\${token_split[1]}'.bytes(),
|
||||
sha256.sum, sha256.block_size).bytestr().bytes()
|
||||
|
||||
signature_from_token := base64.url_decode(token_split[2])
|
||||
|
||||
return hmac.equal(signature_from_token, signature_mirror)
|
||||
// return true
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/index.html'
|
||||
content: "<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<!--Let browser know website is optimized for mobile-->
|
||||
<meta charset='UTF-8' name='viewport' content='width=device-width, initial-scale=1.0'>
|
||||
<!-- Compiled and minified CSS -->
|
||||
<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'>
|
||||
<!-- Compiled and minified JavaScript -->
|
||||
<script src='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js'></script>
|
||||
<!-- Material UI icons -->
|
||||
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
||||
<title>\${title}</title>
|
||||
</head>
|
||||
<body>
|
||||
<div>@include 'templates/header_component.html'</div>
|
||||
<div class='card-panel center-align' style='max-width: 240px; padding: 10px; margin: 10px; border-radius: 5px;'>
|
||||
<form id='index_form' method='post' action=''>
|
||||
<div style='display:flex; flex-direction: column;'>
|
||||
<input type='text' name='username' placeholder='Username' required autofocus>
|
||||
<input type='password' name='password' placeholder='Password' required>
|
||||
</div>
|
||||
<div style='margin-top: 10px;'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='login()' formaction='javascript:void(0);' value='Login'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='addUser()' formaction='javascript:void(0);' value='Register'>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script type='text/javascript'>
|
||||
// function eraseCookie(name) {
|
||||
// document.cookie = name + '=; Max-Age=0'
|
||||
// }
|
||||
async function addUser() {
|
||||
const form = document.querySelector('#index_form');
|
||||
const formData = new FormData(form);
|
||||
await fetch('/controller/user/create', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 201) {
|
||||
throw await response.text()
|
||||
}
|
||||
return await response.text()
|
||||
})
|
||||
.then((data) => {
|
||||
alert('User created successfully')
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
async function login() {
|
||||
const form = document.querySelector('#index_form');
|
||||
const formData = new FormData(form);
|
||||
await fetch('/controller/auth', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 200) {
|
||||
throw await response.text()
|
||||
}
|
||||
return response.json()
|
||||
})
|
||||
.then((data) => {
|
||||
document.cookie = 'token='+data+';';
|
||||
window.location.href = '/products'
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/main.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import databases
|
||||
import os
|
||||
|
||||
const (
|
||||
port = 8082
|
||||
)
|
||||
|
||||
struct App {
|
||||
vweb.Context
|
||||
}
|
||||
|
||||
pub fn (app App) before_request() {
|
||||
println('[web] before_request: \${app.req.method} \${app.req.url}')
|
||||
}
|
||||
|
||||
fn main() {
|
||||
mut db := databases.create_db_connection() or { panic(err) }
|
||||
|
||||
sql db {
|
||||
create table User
|
||||
create table Product
|
||||
} or { panic('error on create table: \${err}') }
|
||||
|
||||
db.close() or { panic(err) }
|
||||
|
||||
mut app := &App{}
|
||||
app.serve_static('/favicon.ico', 'src/assets/favicon.ico')
|
||||
// makes all static files available.
|
||||
app.mount_static_folder_at(os.resource_abs_path('.'), '/')
|
||||
|
||||
vweb.run(app, port)
|
||||
}
|
||||
|
||||
pub fn (mut app App) index() vweb.Result {
|
||||
title := 'vweb app'
|
||||
|
||||
return \$vweb.html()
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_controller.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import encoding.base64
|
||||
import json
|
||||
|
||||
['/controller/products'; get]
|
||||
pub fn (mut app App) controller_get_all_products() vweb.Result {
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
response := app.service_get_all_products_from(user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
// return app.text('response')
|
||||
}
|
||||
|
||||
['/controller/product/create'; post]
|
||||
pub fn (mut app App) controller_create_product(product_name string) vweb.Result {
|
||||
if product_name == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('product name cannot be empty')
|
||||
}
|
||||
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
app.service_add_product(product_name, user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
app.set_status(201, '')
|
||||
return app.text('product created successfully')
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_entities.v'
|
||||
content: "module main
|
||||
|
||||
[table: 'products']
|
||||
struct Product {
|
||||
id int [primary; sql: serial]
|
||||
user_id int
|
||||
name string [nonull; sql_type: 'TEXT']
|
||||
created_at string [default: 'CURRENT_TIMESTAMP']
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_service.v'
|
||||
content: "module main
|
||||
|
||||
import databases
|
||||
|
||||
fn (mut app App) service_add_product(product_name string, user_id int) ! {
|
||||
mut db := databases.create_db_connection()!
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
product_model := Product{
|
||||
name: product_name
|
||||
user_id: user_id
|
||||
}
|
||||
|
||||
mut insert_error := ''
|
||||
|
||||
sql db {
|
||||
insert product_model into Product
|
||||
} or { insert_error = err.msg() }
|
||||
|
||||
if insert_error != '' {
|
||||
return error(insert_error)
|
||||
}
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_all_products_from(user_id int) ![]Product {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
results := sql db {
|
||||
select from Product where user_id == user_id
|
||||
}!
|
||||
|
||||
return results
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_view_api.v'
|
||||
content: "module main
|
||||
|
||||
import json
|
||||
import net.http
|
||||
|
||||
pub fn get_products(token string) ![]Product {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
url := 'http://localhost:8082/controller/products'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
products := json.decode([]Product, resp.body)!
|
||||
|
||||
return products
|
||||
}
|
||||
|
||||
pub fn get_product(token string) ![]User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/product'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
products := json.decode([]User, resp.body)!
|
||||
|
||||
return products
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_view.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
|
||||
['/products'; get]
|
||||
pub fn (mut app App) products() !vweb.Result {
|
||||
token := app.get_cookie('token') or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
|
||||
user := get_user(token) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('Failed to fetch data from the server. Error: \${err}')
|
||||
}
|
||||
|
||||
return \$vweb.html()
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_controllers.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import encoding.base64
|
||||
import json
|
||||
|
||||
['/controller/users'; get]
|
||||
pub fn (mut app App) controller_get_all_user() vweb.Result {
|
||||
// token := app.get_cookie('token') or { '' }
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
response := app.service_get_all_user() or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
}
|
||||
|
||||
['/controller/user'; get]
|
||||
pub fn (mut app App) controller_get_user() vweb.Result {
|
||||
// token := app.get_cookie('token') or { '' }
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
response := app.service_get_user(user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
}
|
||||
|
||||
['/controller/user/create'; post]
|
||||
pub fn (mut app App) controller_create_user(username string, password string) vweb.Result {
|
||||
if username == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('username cannot be empty')
|
||||
}
|
||||
if password == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('password cannot be empty')
|
||||
}
|
||||
app.service_add_user(username, password) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
app.set_status(201, '')
|
||||
return app.text('User created successfully')
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_entities.v'
|
||||
content: "module main
|
||||
|
||||
[table: 'users']
|
||||
pub struct User {
|
||||
mut:
|
||||
id int [primary; sql: serial]
|
||||
username string [nonull; sql_type: 'TEXT'; unique]
|
||||
password string [nonull; sql_type: 'TEXT']
|
||||
active bool
|
||||
products []Product [fkey: 'user_id']
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_services.v'
|
||||
content: "module main
|
||||
|
||||
import crypto.bcrypt
|
||||
import databases
|
||||
|
||||
fn (mut app App) service_add_user(username string, password string) ! {
|
||||
mut db := databases.create_db_connection()!
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
hashed_password := bcrypt.generate_from_password(password.bytes(), bcrypt.min_cost) or {
|
||||
eprintln(err)
|
||||
return err
|
||||
}
|
||||
|
||||
user_model := User{
|
||||
username: username
|
||||
password: hashed_password
|
||||
active: true
|
||||
}
|
||||
|
||||
mut insert_error := ''
|
||||
sql db {
|
||||
insert user_model into User
|
||||
} or { insert_error = err.msg() }
|
||||
if insert_error != '' {
|
||||
return error(insert_error)
|
||||
}
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_all_user() ![]User {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
results := sql db {
|
||||
select from User
|
||||
}!
|
||||
|
||||
return results
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_user(id int) !User {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
results := sql db {
|
||||
select from User where id == id
|
||||
}!
|
||||
if results.len == 0 {
|
||||
return error('no results')
|
||||
}
|
||||
return results[0]
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_view_api.v'
|
||||
content: "module main
|
||||
|
||||
import json
|
||||
import net.http
|
||||
|
||||
pub fn get_users(token string) ![]User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/users'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
users := json.decode([]User, resp.body)!
|
||||
|
||||
return users
|
||||
}
|
||||
|
||||
pub fn get_user(token string) !User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/user'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
users := json.decode(User, resp.body)!
|
||||
|
||||
return users
|
||||
}
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
@ -9,13 +9,12 @@ import os
|
|||
// makes the program structure in a _sub_ directory. Besides that, the
|
||||
// functionality is essentially the same.
|
||||
|
||||
// Note: here are the currently supported invokations so far:
|
||||
// 1) `v init` -> create a new project in the current folder
|
||||
// 2) `v new abc` -> create a new project in the new folder `abc`, by default a "hello world" project.
|
||||
// 3) `v new abcd web` -> create a new project in the new folder `abcd`, using the vweb template.
|
||||
// 4) `v new abcde hello_world` -> create a new project in the new folder `abcde`, using the hello_world template.
|
||||
|
||||
// Note: run `v cmd/tools/vcreate_test.v` after changes to this program, to avoid regressions.
|
||||
// Note: here are the currently supported invocations so far:
|
||||
// - `v init` -> initialize a new project in the current folder
|
||||
// - `v new` -> create a new project in the directory specified during setup, using the "bin" template by default.
|
||||
// - `v new my_bin_project bin` -> create a new project directory `my_bin_project`, using the bin template.
|
||||
// - `v new my_lib_project lib` -> create a new project directory `my_lib_project`, using the lib template.
|
||||
// - `v new my_web_project web` -> create a new project directory `my_web_project`, using the vweb template.
|
||||
|
||||
struct Create {
|
||||
mut:
|
||||
|
|
@ -36,7 +35,7 @@ fn main() {
|
|||
match cmd {
|
||||
'new' {
|
||||
// list of models allowed
|
||||
project_models := ['web', 'hello_world']
|
||||
project_models := ['bin', 'lib', 'web']
|
||||
if os.args.len == 4 {
|
||||
// validation
|
||||
if os.args.last() !in project_models {
|
||||
|
|
@ -97,23 +96,26 @@ fn new_project(args []string) {
|
|||
}
|
||||
|
||||
println('Initialising ...')
|
||||
// `v new abcde hello_world`
|
||||
if args.len == 2 {
|
||||
// E.g.: `v new my_project lib`
|
||||
match os.args.last() {
|
||||
'bin' {
|
||||
c.set_bin_project_files(true)
|
||||
}
|
||||
'lib' {
|
||||
c.set_lib_project_files()
|
||||
}
|
||||
'web' {
|
||||
c.set_web_project_files()
|
||||
}
|
||||
'hello_world' {
|
||||
c.set_hello_world_project_files()
|
||||
}
|
||||
else {
|
||||
eprintln('${os.args.last()} model not exist')
|
||||
exit(1)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// `v new abc`
|
||||
c.set_hello_world_project_files()
|
||||
// E.g.: `v new my_project`
|
||||
c.set_bin_project_files(true)
|
||||
}
|
||||
|
||||
// gen project based in the `Create.files` info
|
||||
|
|
@ -134,10 +136,7 @@ fn init_project() {
|
|||
println('Change the description of your project in `v.mod`')
|
||||
}
|
||||
if !os.exists('src/main.v') {
|
||||
c.files << ProjectFiles{
|
||||
path: 'src/main.v'
|
||||
content: hello_world_content()
|
||||
}
|
||||
c.set_bin_project_files(false)
|
||||
}
|
||||
c.create_files_and_directories()
|
||||
c.write_gitattributes(false)
|
||||
|
|
@ -181,15 +180,6 @@ fn vmod_content(c Create) string {
|
|||
"
|
||||
}
|
||||
|
||||
fn hello_world_content() string {
|
||||
return "module main
|
||||
|
||||
fn main() {
|
||||
println('Hello World!')
|
||||
}
|
||||
"
|
||||
}
|
||||
|
||||
fn gen_gitignore(name string) string {
|
||||
return '# Binaries for programs and plugins
|
||||
main
|
||||
|
|
@ -286,781 +276,3 @@ fn (mut c Create) create_files_and_directories() {
|
|||
os.write_file(file.path, file.content) or { panic(err) }
|
||||
}
|
||||
}
|
||||
|
||||
// ####################################### PROJECTS CONTENT AND PATH #######################################
|
||||
|
||||
fn (mut c Create) set_hello_world_project_files() {
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/main.v'
|
||||
content: hello_world_content()
|
||||
}
|
||||
}
|
||||
|
||||
fn (mut c Create) set_web_project_files() {
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/databases/config_databases_sqlite.v'
|
||||
content: "module databases
|
||||
|
||||
import db.sqlite // can change to 'db.mysql', 'db.pg'
|
||||
|
||||
pub fn create_db_connection() !sqlite.DB {
|
||||
mut db := sqlite.connect('app.db')!
|
||||
return db
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/header_component.html'
|
||||
content: "<nav>
|
||||
<div class='nav-wrapper'>
|
||||
<a href='javascript:window.history.back();' class='left'>
|
||||
<i class='material-icons'>arrow_back_ios_new</i>
|
||||
</a>
|
||||
<a href='/'>
|
||||
<img src='src/assets/veasel.png' alt='logo' style='max-height: 100%' />
|
||||
</a>
|
||||
<ul id='nav-mobile' class='right'>
|
||||
<li><a href='https://github.com/vlang/v'>github</a></li>
|
||||
<li><a href='https://vlang.io/'>website</a></li>
|
||||
<li><a href='https://github.com/sponsors/medvednikov'>support</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/products.css'
|
||||
content: 'h1.title {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
color: #3b7bbf;
|
||||
}
|
||||
|
||||
div.products-table {
|
||||
border: 1px solid;
|
||||
max-width: 720px;
|
||||
padding: 10px;
|
||||
margin: 10px;
|
||||
}'
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/templates/products.html'
|
||||
content: "<!DOCTYPE html>
|
||||
<head>
|
||||
<!--Let browser know website is optimized for mobile-->
|
||||
<meta charset='UTF-8' name='viewport' content='width=device-width, initial-scale=1.0'>
|
||||
|
||||
<!-- Compiled and minified CSS -->
|
||||
<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'>
|
||||
|
||||
<!-- Compiled and minified JavaScript -->
|
||||
<script src='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js'></script>
|
||||
|
||||
<!-- Material UI icons -->
|
||||
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
||||
|
||||
<title>Login</title>
|
||||
@css 'src/templates/products.css'
|
||||
</head>
|
||||
<body>
|
||||
<div>@include 'header_component.html'</div>
|
||||
<h1 class='title'>Hi, \${user.username}! you are online</h1>
|
||||
<!-- <button onclick='document.location.reload(true)'>Lala</button> -->
|
||||
<form id='product_form' method='post' action=''>
|
||||
<div class='row'>
|
||||
<div class='input-field col s2'>
|
||||
<input id='product_name' name='product_name' type='text' class='validate'>
|
||||
<label class='active' for='product_name'>product name</label>
|
||||
</div>
|
||||
<div style='margin-top: 10px;'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='addProduct()' formaction='javascript:void(0);' value='Register' required autofocus>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div style='width: 20; height: 300;'>
|
||||
<input type='text' name='product_name' placeholder='product name' required autofocus>
|
||||
</div> -->
|
||||
</form>
|
||||
<script type='text/javascript'>
|
||||
function getCookie(cookieName) {
|
||||
let cookie = {};
|
||||
document.cookie.split(';').forEach(function(el) {
|
||||
let [key,value] = el.split('=');
|
||||
cookie[key.trim()] = value;
|
||||
})
|
||||
return cookie[cookieName];
|
||||
}
|
||||
async function addProduct() {
|
||||
const form = document.querySelector('#product_form');
|
||||
const formData = new FormData(form);
|
||||
console.log(getCookie('token'));
|
||||
await fetch('/controller/product/create', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
headers :{
|
||||
token: getCookie('token')
|
||||
}
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 201) {
|
||||
throw await response.text()
|
||||
}
|
||||
return await response.text()
|
||||
})
|
||||
.then((data) => {
|
||||
// alert('User created successfully')
|
||||
document.location.reload(true)
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<div class='products-table card-panel'>
|
||||
<table class='highlight striped responsive-table'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Name</th>
|
||||
<th>Created date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@for product in user.products
|
||||
<tr>
|
||||
<td>\${product.id}</td>
|
||||
<td>\${product.name}</td>
|
||||
<td>\${product.created_at}</td>
|
||||
</tr>
|
||||
@end
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_controllers.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
|
||||
['/controller/auth'; post]
|
||||
pub fn (mut app App) controller_auth(username string, password string) vweb.Result {
|
||||
response := app.service_auth(username, password) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
|
||||
return app.json(response)
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_dto.v'
|
||||
content: 'module main
|
||||
|
||||
struct AuthRequestDto {
|
||||
username string [nonull]
|
||||
password string [nonull]
|
||||
}
|
||||
'
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/auth_services.v'
|
||||
content: "module main
|
||||
|
||||
import crypto.hmac
|
||||
import crypto.sha256
|
||||
import crypto.bcrypt
|
||||
import encoding.base64
|
||||
import json
|
||||
import databases
|
||||
import time
|
||||
|
||||
struct JwtHeader {
|
||||
alg string
|
||||
typ string
|
||||
}
|
||||
|
||||
struct JwtPayload {
|
||||
sub string // (subject) = Entity to whom the token belongs, usually the user ID;
|
||||
iss string // (issuer) = Token issuer;
|
||||
exp string // (expiration) = Timestamp of when the token will expire;
|
||||
iat time.Time // (issued at) = Timestamp of when the token was created;
|
||||
aud string // (audience) = Token recipient, represents the application that will use it.
|
||||
name string
|
||||
roles string
|
||||
permissions string
|
||||
}
|
||||
|
||||
fn (mut app App) service_auth(username string, password string) !string {
|
||||
mut db := databases.create_db_connection() or {
|
||||
eprintln(err)
|
||||
panic(err)
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
users := sql db {
|
||||
select from User where username == username
|
||||
}!
|
||||
if users.len == 0 {
|
||||
return error('user not found')
|
||||
}
|
||||
user := users.first()
|
||||
|
||||
if !user.active {
|
||||
return error('user is not active')
|
||||
}
|
||||
|
||||
bcrypt.compare_hash_and_password(password.bytes(), user.password.bytes()) or {
|
||||
return error('Failed to auth user, \${err}')
|
||||
}
|
||||
|
||||
token := make_token(user)
|
||||
return token
|
||||
}
|
||||
|
||||
fn make_token(user User) string {
|
||||
secret := 'SECRET_KEY' // os.getenv('SECRET_KEY')
|
||||
|
||||
jwt_header := JwtHeader{'HS256', 'JWT'}
|
||||
jwt_payload := JwtPayload{
|
||||
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(),
|
||||
sha256.sum, sha256.block_size).bytestr().bytes())
|
||||
|
||||
jwt := '\${header}.\${payload}.\${signature}'
|
||||
|
||||
return jwt
|
||||
}
|
||||
|
||||
fn auth_verify(token string) bool {
|
||||
if token == '' {
|
||||
return false
|
||||
}
|
||||
secret := 'SECRET_KEY' // os.getenv('SECRET_KEY')
|
||||
token_split := token.split('.')
|
||||
|
||||
signature_mirror := hmac.new(secret.bytes(), '\${token_split[0]}.\${token_split[1]}'.bytes(),
|
||||
sha256.sum, sha256.block_size).bytestr().bytes()
|
||||
|
||||
signature_from_token := base64.url_decode(token_split[2])
|
||||
|
||||
return hmac.equal(signature_from_token, signature_mirror)
|
||||
// return true
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/index.html'
|
||||
content: "<!DOCTYPE html>
|
||||
<head>
|
||||
<!--Let browser know website is optimized for mobile-->
|
||||
<meta charset='UTF-8' name='viewport' content='width=device-width, initial-scale=1.0'>
|
||||
<!-- Compiled and minified CSS -->
|
||||
<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css'>
|
||||
<!-- Compiled and minified JavaScript -->
|
||||
<script src='https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js'></script>
|
||||
<!-- Material UI icons -->
|
||||
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
||||
<title>\${title}</title>
|
||||
</head>
|
||||
<body>
|
||||
<div>@include 'templates/header_component.html'</div>
|
||||
<div class='card-panel center-align' style='max-width: 240px; padding: 10px; margin: 10px; border-radius: 5px;'>
|
||||
<form id='index_form' method='post' action=''>
|
||||
<div style='display:flex; flex-direction: column;'>
|
||||
<input type='text' name='username' placeholder='Username' required autofocus>
|
||||
<input type='password' name='password' placeholder='Password' required>
|
||||
</div>
|
||||
<div style='margin-top: 10px;'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='login()' formaction='javascript:void(0);' value='Login'>
|
||||
<input class='waves-effect waves-light btn-small' type='submit' onclick='addUser()' formaction='javascript:void(0);' value='Register'>
|
||||
</div>
|
||||
</form>
|
||||
<script type='text/javascript'>
|
||||
// function eraseCookie(name) {
|
||||
// document.cookie = name + '=; Max-Age=0'
|
||||
// }
|
||||
async function addUser() {
|
||||
const form = document.querySelector('#index_form');
|
||||
const formData = new FormData(form);
|
||||
await fetch('/controller/user/create', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 201) {
|
||||
throw await response.text()
|
||||
}
|
||||
return await response.text()
|
||||
})
|
||||
.then((data) => {
|
||||
alert('User created successfully')
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
async function login() {
|
||||
const form = document.querySelector('#index_form');
|
||||
const formData = new FormData(form);
|
||||
await fetch('/controller/auth', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
.then( async (response) => {
|
||||
if (response.status != 200) {
|
||||
throw await response.text()
|
||||
}
|
||||
return response.json()
|
||||
})
|
||||
.then((data) => {
|
||||
document.cookie = 'token='+data+';';
|
||||
window.location.href = '/products'
|
||||
})
|
||||
.catch((error) => {
|
||||
alert(error);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
</html>"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/main.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import databases
|
||||
import os
|
||||
|
||||
const (
|
||||
port = 8082
|
||||
)
|
||||
|
||||
struct App {
|
||||
vweb.Context
|
||||
}
|
||||
|
||||
pub fn (app App) before_request() {
|
||||
println('[web] before_request: \${app.req.method} \${app.req.url}')
|
||||
}
|
||||
|
||||
fn main() {
|
||||
mut db := databases.create_db_connection() or { panic(err) }
|
||||
|
||||
sql db {
|
||||
create table User
|
||||
create table Product
|
||||
} or { panic('error on create table: \${err}') }
|
||||
|
||||
db.close() or { panic(err) }
|
||||
|
||||
mut app := &App{}
|
||||
app.serve_static('/favicon.ico', 'src/assets/favicon.ico')
|
||||
// makes all static files available.
|
||||
app.mount_static_folder_at(os.resource_abs_path('.'), '/')
|
||||
|
||||
vweb.run(app, port)
|
||||
}
|
||||
|
||||
pub fn (mut app App) index() vweb.Result {
|
||||
title := 'vweb app'
|
||||
|
||||
return \$vweb.html()
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_controller.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import encoding.base64
|
||||
import json
|
||||
|
||||
['/controller/products'; get]
|
||||
pub fn (mut app App) controller_get_all_products() vweb.Result {
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
response := app.service_get_all_products_from(user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
// return app.text('response')
|
||||
}
|
||||
|
||||
['/controller/product/create'; post]
|
||||
pub fn (mut app App) controller_create_product(product_name string) vweb.Result {
|
||||
if product_name == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('product name cannot be empty')
|
||||
}
|
||||
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
app.service_add_product(product_name, user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
app.set_status(201, '')
|
||||
return app.text('product created successfully')
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_entities.v'
|
||||
content: "module main
|
||||
|
||||
[table: 'products']
|
||||
struct Product {
|
||||
id int [primary; sql: serial]
|
||||
user_id int
|
||||
name string [nonull; sql_type: 'TEXT']
|
||||
created_at string [default: 'CURRENT_TIMESTAMP']
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_service.v'
|
||||
content: "module main
|
||||
|
||||
import databases
|
||||
|
||||
fn (mut app App) service_add_product(product_name string, user_id int) ! {
|
||||
mut db := databases.create_db_connection()!
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
product_model := Product{
|
||||
name: product_name
|
||||
user_id: user_id
|
||||
}
|
||||
|
||||
mut insert_error := ''
|
||||
|
||||
sql db {
|
||||
insert product_model into Product
|
||||
} or { insert_error = err.msg() }
|
||||
|
||||
if insert_error != '' {
|
||||
return error(insert_error)
|
||||
}
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_all_products_from(user_id int) ![]Product {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
results := sql db {
|
||||
select from Product where user_id == user_id
|
||||
}!
|
||||
|
||||
return results
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_view_api.v'
|
||||
content: "module main
|
||||
|
||||
import json
|
||||
import net.http
|
||||
|
||||
pub fn get_products(token string) ![]Product {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
url := 'http://localhost:8082/controller/products'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
products := json.decode([]Product, resp.body)!
|
||||
|
||||
return products
|
||||
}
|
||||
|
||||
pub fn get_product(token string) ![]User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/product'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
products := json.decode([]User, resp.body)!
|
||||
|
||||
return products
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/product_view.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
|
||||
['/products'; get]
|
||||
pub fn (mut app App) products() !vweb.Result {
|
||||
token := app.get_cookie('token') or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
|
||||
user := get_user(token) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('Failed to fetch data from the server. Error: \${err}')
|
||||
}
|
||||
|
||||
return \$vweb.html()
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_controllers.v'
|
||||
content: "module main
|
||||
|
||||
import vweb
|
||||
import encoding.base64
|
||||
import json
|
||||
|
||||
['/controller/users'; get]
|
||||
pub fn (mut app App) controller_get_all_user() vweb.Result {
|
||||
// token := app.get_cookie('token') or { '' }
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
response := app.service_get_all_user() or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
}
|
||||
|
||||
['/controller/user'; get]
|
||||
pub fn (mut app App) controller_get_user() vweb.Result {
|
||||
// token := app.get_cookie('token') or { '' }
|
||||
token := app.req.header.get_custom('token') or { '' }
|
||||
|
||||
if !auth_verify(token) {
|
||||
app.set_status(401, '')
|
||||
return app.text('Not valid token')
|
||||
}
|
||||
|
||||
jwt_payload_stringify := base64.url_decode_str(token.split('.')[1])
|
||||
|
||||
jwt_payload := json.decode(JwtPayload, jwt_payload_stringify) or {
|
||||
app.set_status(501, '')
|
||||
return app.text('jwt decode error')
|
||||
}
|
||||
|
||||
user_id := jwt_payload.sub
|
||||
|
||||
response := app.service_get_user(user_id.int()) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('\${err}')
|
||||
}
|
||||
return app.json(response)
|
||||
}
|
||||
|
||||
['/controller/user/create'; post]
|
||||
pub fn (mut app App) controller_create_user(username string, password string) vweb.Result {
|
||||
if username == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('username cannot be empty')
|
||||
}
|
||||
if password == '' {
|
||||
app.set_status(400, '')
|
||||
return app.text('password cannot be empty')
|
||||
}
|
||||
app.service_add_user(username, password) or {
|
||||
app.set_status(400, '')
|
||||
return app.text('error: \${err}')
|
||||
}
|
||||
app.set_status(201, '')
|
||||
return app.text('User created successfully')
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_entities.v'
|
||||
content: "module main
|
||||
|
||||
[table: 'users']
|
||||
pub struct User {
|
||||
mut:
|
||||
id int [primary; sql: serial]
|
||||
username string [nonull; sql_type: 'TEXT'; unique]
|
||||
password string [nonull; sql_type: 'TEXT']
|
||||
active bool
|
||||
products []Product [fkey: 'user_id']
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_services.v'
|
||||
content: "module main
|
||||
|
||||
import crypto.bcrypt
|
||||
import databases
|
||||
|
||||
fn (mut app App) service_add_user(username string, password string) ! {
|
||||
mut db := databases.create_db_connection()!
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
hashed_password := bcrypt.generate_from_password(password.bytes(), bcrypt.min_cost) or {
|
||||
eprintln(err)
|
||||
return err
|
||||
}
|
||||
|
||||
user_model := User{
|
||||
username: username
|
||||
password: hashed_password
|
||||
active: true
|
||||
}
|
||||
|
||||
mut insert_error := ''
|
||||
sql db {
|
||||
insert user_model into User
|
||||
} or { insert_error = err.msg() }
|
||||
if insert_error != '' {
|
||||
return error(insert_error)
|
||||
}
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_all_user() ![]User {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
|
||||
results := sql db {
|
||||
select from User
|
||||
}!
|
||||
|
||||
return results
|
||||
}
|
||||
|
||||
fn (mut app App) service_get_user(id int) !User {
|
||||
mut db := databases.create_db_connection() or {
|
||||
println(err)
|
||||
return err
|
||||
}
|
||||
defer {
|
||||
db.close() or { panic(err) }
|
||||
}
|
||||
results := sql db {
|
||||
select from User where id == id
|
||||
}!
|
||||
if results.len == 0 {
|
||||
return error('no results')
|
||||
}
|
||||
return results[0]
|
||||
}
|
||||
"
|
||||
}
|
||||
c.files << ProjectFiles{
|
||||
path: '${c.name}/src/user_view_api.v'
|
||||
content: "module main
|
||||
|
||||
import json
|
||||
import net.http
|
||||
|
||||
pub fn get_users(token string) ![]User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/users'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
users := json.decode([]User, resp.body)!
|
||||
|
||||
return users
|
||||
}
|
||||
|
||||
pub fn get_user(token string) !User {
|
||||
mut header := http.new_header()
|
||||
header.add_custom('token', token)!
|
||||
|
||||
url := 'http://localhost:8082/controller/user'
|
||||
|
||||
mut config := http.FetchConfig{
|
||||
header: header
|
||||
}
|
||||
|
||||
resp := http.fetch(http.FetchConfig{ ...config, url: url })!
|
||||
users := json.decode(User, resp.body)!
|
||||
|
||||
return users
|
||||
}
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue