From 3d4ffe8f28cb4b2825f8b9ab83d0a2b447b76ddc Mon Sep 17 00:00:00 2001 From: Hitalo Souza <63821277+enghitalo@users.noreply.github.com> Date: Sat, 22 Oct 2022 13:12:54 -0300 Subject: [PATCH] examples: unskip vweb_orm_jwt from building, since it is not working directly with mysql anymore (#15671) --- cmd/tools/modules/testing/common.v | 2 -- cmd/tools/vbuild-examples.v | 1 + database.db | Bin 0 -> 8192 bytes examples/vweb_orm_jwt/src/auth_services.v | 3 +++ examples/vweb_orm_jwt/src/main.v | 5 +++++ 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 database.db diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v index 1fb1b23ae5..74a3e13ec9 100644 --- a/cmd/tools/modules/testing/common.v +++ b/cmd/tools/modules/testing/common.v @@ -171,7 +171,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession { skip_files << 'examples/database/mysql.v' skip_files << 'examples/database/orm.v' skip_files << 'examples/database/psql/customer.v' - skip_files << 'examples/vweb_orm_jwt' // requires mysql } $if windows { skip_files << 'examples/database/mysql.v' @@ -181,7 +180,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession { skip_files << 'examples/websocket/client-server/client.v' // requires OpenSSL skip_files << 'examples/websocket/client-server/server.v' // requires OpenSSL skip_files << 'vlib/v/tests/websocket_logger_interface_should_compile_test.v' // requires OpenSSL - skip_files << 'examples/vweb_orm_jwt' // requires mysql $if tinyc { skip_files << 'examples/database/orm.v' // try fix it } diff --git a/cmd/tools/vbuild-examples.v b/cmd/tools/vbuild-examples.v index 8f7bafb1fb..f9d04f97cf 100644 --- a/cmd/tools/vbuild-examples.v +++ b/cmd/tools/vbuild-examples.v @@ -5,6 +5,7 @@ import testing const vroot = @VMODROOT +// build as a project folder const efolders = [ 'examples/viewer', 'examples/vweb_orm_jwt', diff --git a/database.db b/database.db new file mode 100644 index 0000000000000000000000000000000000000000..69bd2b3164d5fa35032915765fa42ca4b04b88dd GIT binary patch literal 8192 zcmeI#u};G<5C&koLV^Xvmi0y|Ar@W$Qw|hJs@8P{oodqE%#M>%Ryr}D z{}d;>Unk4?Hc!S`89Y5z^~wc07so^R2#LsT!Eg60=F<85%d8_I;^c^f}?}9JpE^H#Y;%ha{3=O7Q^U%yq zn)Ae{eAI5YE_NR-{L=5dvs;AnH6HWl=p&uxO3&zyXWdWr`|aI4UiwiGfB*y_009U< R00Izz00bZa0SNqKfiGq?Tr~gy literal 0 HcmV?d00001 diff --git a/examples/vweb_orm_jwt/src/auth_services.v b/examples/vweb_orm_jwt/src/auth_services.v index 5536b1dac0..3ae9fa0fe3 100644 --- a/examples/vweb_orm_jwt/src/auth_services.v +++ b/examples/vweb_orm_jwt/src/auth_services.v @@ -74,6 +74,9 @@ fn make_token(user User) string { } fn auth_verify(token string) bool { + if token == '' { + return false + } secret := os.getenv('SECRET_KEY') token_split := token.split('.') diff --git a/examples/vweb_orm_jwt/src/main.v b/examples/vweb_orm_jwt/src/main.v index 96159faccd..b48f6e6601 100644 --- a/examples/vweb_orm_jwt/src/main.v +++ b/examples/vweb_orm_jwt/src/main.v @@ -28,3 +28,8 @@ fn new_app() &App { return app } + +['/'; get] +pub fn (mut app App) ping() ?vweb.Result { + return app.text('ping') +}