vesta-web 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

vesta/__init__.py

@@ -101,26 +101,27 @@ class Server(server):
         self.sendVerification(user)
 
     @server.expose
-    def login(self, email, password, parrain=None):
-        if 'email' and 'password':
-            password = password.encode('utf-8')  # converting to bytes array
-            account = self.uniauth.getUserCredentials(email)
-            # If account exists in accounts table
-            if account:
-                msg = self.connect(account, password)
-            else:
-                msg = self.register(email, password, parrain)
+    def login(self, email=None, password=None, parrain=None):
+        if not email or not password:
+            return 'please give an email and a password'
+
+        password = password.encode('utf-8')  # converting to bytes array
+        account = self.uniauth.getUserCredentials(email)
+        # If account exists in accounts table
+        if account:
+            msg = self.connect(account, password)
         else:
-            msg = 'please give an email and a password'
+            msg = self.register(email, password, parrain)
 
         return msg
 
     @server.expose
-    def changePasswordVerif(self,mail, code, password):
-        id = self.uniauth.getSomething("account", mail,"email")["id"]
-        if not id :
+    def changePasswordVerif(self, mail, code, password):
+        account = self.uniauth.getSomething("account", mail, "email")
+        if not account or not account.get("id"):
             return "no account found for " + mail
 
+        id = account["id"]
         password = password.encode('utf-8')
         actual = self.uniauth.getSomething("reset_code", id)
         if actual and str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
@@ -152,7 +153,7 @@ class Server(server):
         user = self.getUser(verif=True)
         print("user:", user)
         actual = self.uniauth.getSomething("verif_code", user)
-        if str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
+        if actual and str(actual["code"]) == code and actual["expiration"] > datetime.datetime.now():
             self.uniauth.edit("account", user, "verified", True)
             self.createJwt(user, True)
             self.onLogin(user)
@@ -162,7 +163,11 @@ class Server(server):
 
     @server.expose
     def logout(self):
-        token = self.getJWT()
+        try:
+            token = self.getJWT()
+        except:
+            pass  # Cookie doesn't exist, that's fine
+
         self.response.del_cookie('JWT')
         self.response.del_cookie('auth')
         raise HTTPRedirect(self.response, "/auth")

vesta/emptyProject/static/markdown/markdown.mjs

@@ -16,8 +16,9 @@ export class Markdown {
         "||":"<div class='spoiler' onclick='showSpoiler(event)'>${content}</div>",
         "link":"<a href='${props.link}' target='_blank'>${content}</a>",
         "color":"<div class='color' style='color: ${props.color}'>${content}</div>",
+        "-#":"<small>${content}</small>",
         "endline":"\n",
-        "newline":"",
+        "newline":"${content}",
         ")":")",
         "'":"'",
         "(":"(",
@@ -43,7 +44,7 @@ export class Markdown {
                     currentToken.type="link"
                 }
 
-                let look_id = 5
+                let look_id = str.slice(char_id,char_id+6) === "https:" ? 6 : 5
                 let nextToken
                 while (char_id+look_id<str.length){
                     if(str[char_id+look_id]=== "\n"){
@@ -124,6 +125,16 @@ export class Markdown {
                                 currentToken.content = currentToken.content.concat(char)
                         }
                         break
+                    case "-#":
+                        switch (char){
+                            case '\n':
+                                tokenList.push(currentToken)
+                                currentToken = new Token("newline")
+                                break
+                            default:
+                                currentToken.content = currentToken.content.concat(char)
+                        }
+                        break
                     case "newline":
                         switch (char){
                             case '#':
@@ -139,9 +150,15 @@ export class Markdown {
                                     currentToken.type=currentToken.props.consuming
                                     tokenList.push(currentToken)
                                 }
-                                currentToken = new Token("text")
-                                tokenList.push(new Token("start li"))
-                                commitEndline = true
+                                // Check if next character is # for small text
+                                if (char_id + 1 < str.length && str[char_id + 1] === '#') {
+                                    currentToken = new Token("-#")
+                                    char_id += 1 // Skip the # character
+                                } else {
+                                    currentToken = new Token("text")
+                                    tokenList.push(new Token("start li"))
+                                    commitEndline = true
+                                }
                                 break
                             case '>':
                                 if (currentToken.content.trim() !== ""){
@@ -153,6 +170,10 @@ export class Markdown {
                                 commitEndline = true
                                 break
                             case '*':
+                                if (currentToken.content.trim() !== ""){
+                                    currentToken.type=currentToken.props.consuming
+                                    tokenList.push(currentToken)
+                                }
                                 currentToken = new Token("*")
                                 currentToken.props.level = 1
                                 break
@@ -162,12 +183,22 @@ export class Markdown {
                             case '/':
                             case '&':
                             case '<':
-                                currentToken.type = char
+                                if (currentToken.content.trim() !== ""){
+                                    currentToken.type=currentToken.props.consuming
+                                    tokenList.push(currentToken)
+                                    currentToken = new Token(char)
+                                }else{
+                                    currentToken.type = char
+                                }
                                 break
                             case '[':
                             case ']':
                             case '(':
                             case ')':
+                                if (currentToken.content.trim() !== ""){
+                                    currentToken.type=currentToken.props.consuming
+                                    tokenList.push(currentToken)
+                                }
                                 tokenList.push(new Token(char))
                                 currentToken = new Token("text")
                                 break
@@ -175,8 +206,10 @@ export class Markdown {
                                 currentToken.content = currentToken.content.concat(char)
                                 break
                             case '\n':
-                                currentToken.type = "text"
-                                tokenList.push(currentToken)
+                                if (currentToken.content.trim() !== "") {
+                                    currentToken.type = currentToken.props.consuming || "text"
+                                    tokenList.push(currentToken)
+                                }
                                 tokenList.push(new Token("endline"))
                                 currentToken = new Token("newline")
                                 break
@@ -365,7 +398,17 @@ export class Markdown {
                     content = content.concat(render[0])
                 }
                 token.content = content
-                return [fillTemplate(this.HTML_equiv[token.type], token), token_id+1]
+                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
+            case "-#":
+                let smallContent = token.content
+                while (token_id + 1 < tokens.length && tokens[token_id + 1].type !== "endline") {
+                    token_id += 1
+                    const render = this.renderToken(tokens[token_id], token_id, tokens)
+                    token_id = render[1]
+                    smallContent = smallContent.concat(render[0])
+                }
+                token.content = smallContent
+                return [fillTemplate(this.HTML_equiv[token.type], token), token_id]
             case "*":
                 // this is suboptimal because we're looking for same size closing
                 // smth like *** a ** b * will not work as intended
@@ -410,7 +453,10 @@ export class Markdown {
                         break
                     }
                     if(tokens[token_id].type === "]"){
-                        if(tokens[token_id+1].type === "(" && tokens[token_id+2].type === "link" && tokens[token_id+3].type === ")"){
+                        if(token_id + 3 < tokens.length &&
+                           tokens[token_id+1].type === "(" &&
+                           tokens[token_id+2].type === "link" &&
+                           tokens[token_id+3].type === ")"){
                             token.content = content
                             token.props.link = tokens[token_id+2].content
                             return [fillTemplate(this.HTML_equiv["link"], token), token_id+3]

vesta/scripts/cli.py

@@ -2,6 +2,7 @@ import argparse
 import os
 import subprocess
 from .utils import ex, Installer
+from .initDB import DBInitializer
 
 HERE = os.path.dirname(__file__)
 PATH = os.getcwd()
@@ -191,7 +192,6 @@ def main():
     service_subparsers = parser_service.add_subparsers(dest='service_command')
     parser_service_setup = service_subparsers.add_parser('setup', help='Install systemd config')
 
-
     args = parser.parse_args()
 
     if args.command == 'init':

vesta/scripts/initDB.py

@@ -18,27 +18,29 @@ class DBInitializer(Server):
 
     def referenceUniauth(self):
         self.db.cur.execute("CREATE EXTENSION if not exists postgres_fdw;")
-        self.db.cur.execute(
-            sql.SQL("""
-            CREATE SERVER if not exists uniauth
-            FOREIGN DATA WRAPPER postgres_fdw
-            OPTIONS (host %s, port %s, dbname %s);
-            """),
-            (
-                self.config.get('UNIAUTH', 'DB_HOST'),
-                self.config.get('UNIAUTH', 'DB_PORT'),
-                self.config.get('UNIAUTH', 'DB_NAME')
-            ))
 
-        self.db.cur.execute(
-            sql.SQL("""
-            CREATE USER MAPPING if not exists FOR CURRENT_USER SERVER uniauth
-            OPTIONS (user %s, password %s);
-            """),
-            (
-                self.config.get('DB', 'DB_USER'),
-                self.config.get('DB', 'DB_PASSWORD')
-            ))
+        ua_host = self.config.get('UNIAUTH', 'DB_HOST')
+        ua_port = self.config.get('UNIAUTH', 'DB_PORT')
+        ua_dbname = self.config.get('UNIAUTH', 'DB_NAME')
+        q_server = sql.SQL("""
+            CREATE SERVER IF NOT EXISTS uniauth
+            FOREIGN DATA WRAPPER postgres_fdw
+            OPTIONS (host {host}, port {port}, dbname {dbname});
+        """).format(
+            host=sql.Literal(ua_host),
+            port=sql.Literal(ua_port),
+            dbname=sql.Literal(ua_dbname)
+        )
+        self.db.cur.execute(q_server)
+
+        q_mapping = sql.SQL("""
+        CREATE USER MAPPING IF NOT EXISTS FOR CURRENT_USER SERVER uniauth
+        OPTIONS (user {user}, password {password});
+    """).format(
+            user=sql.Literal(self.config.get('DB', 'DB_USER')),
+            password=sql.Literal(self.config.get('DB', 'DB_PASSWORD'))
+        )
+        self.db.cur.execute(q_mapping)
         self.db.cur.execute(
             """
             CREATE FOREIGN TABLE if not exists account (id bigserial NOT NULL)
@@ -48,7 +50,7 @@ class DBInitializer(Server):
 
 
 
-initializer = DBInitializer(path=PATH[:-3], configFile="/server.ini", noStart=True)
-initializer.initUniauth()
-initializer.initDB()
-print("DB ready")
+# initializer = DBInitializer(path=PATH[:-3], configFile="/server.ini", noStart=True)
+# initializer.initUniauth()
+# initializer.initDB()
+# print("DB ready")

{vesta_web-1.1.9.dist-info → vesta_web-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vesta-web
-Version: 1.1.9
+Version: 1.2.0
 Summary: An extensive web framework adding every feature needed for Carbonlab
 Project-URL: Homepage, https://gitlab.com/Louciole/vesta
 Project-URL: Issues, https://gitlab.com/Louciole/vesta/-/issues

{vesta_web-1.1.9.dist-info → vesta_web-1.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-vesta/__init__.py,sha256=B84n0xvfCLiCpXLpvPkjlEgGwBaxCzr0Xazm5e84mdo,17977
+vesta/__init__.py,sha256=nK5NpQ_E9DbuhuoDNJsUdKdLVQ3PFK2Ou1fepo-92Q0,18106
 vesta/db/UNIAUTH.sql,sha256=3R8Si3rcXfRFC5idmaKTixDWXMazXQzdC9u1BCPCovY,2126
 vesta/db/db_service.py,sha256=E2r6LxxycMOBtpUXWbVIge_363QUCOIJg-MK-Z5dzmw,10058
 vesta/emptyProject/.gitignore,sha256=9ImxEbKZYcw6fZv2coknCwBdmfY7xWkrOgfBWR03VG0,206
@@ -38,7 +38,7 @@ vesta/emptyProject/static/home/auth.html,sha256=sz-CC-B4NUqth8aSQqwQCvq2V46AnhaI
 vesta/emptyProject/static/home/auth.js,sha256=txMlUqr4A-15Czf4MYwaED35XXcaHI_zrc4SpnjItJU,4622
 vesta/emptyProject/static/home/reset.html,sha256=EcXfX2Vil3NrYhDvEptrIhW9QV9X_kDy59-TK2S_P4w,2655
 vesta/emptyProject/static/home/verif.html,sha256=tUw96l0FZ5-AXuE8s-7v1nM632onErq5swgCU53zP-s,2906
-vesta/emptyProject/static/markdown/markdown.mjs,sha256=gpSUS-8UUJYb_sahgnrobqMvtlYpS2Q-AaE-RUeqIyA,21469
+vesta/emptyProject/static/markdown/markdown.mjs,sha256=eqSV-uzI1PcZS6eev8pqXv2UocDv2NHyFG6v91b-KAo,24105
 vesta/emptyProject/static/markdown/utils.mjs,sha256=PGxhsJfub_lt-LEZVqYt8lKEp_RTRVGXuNhGmWxto-k,614
 vesta/emptyProject/static/translations/en.mjs,sha256=ouMluPVTgB4Q5vmb7zGE6YGTH4URruog5_a52sBDYNE,22
 vesta/emptyProject/static/translations/fr.mjs,sha256=ouMluPVTgB4Q5vmb7zGE6YGTH4URruog5_a52sBDYNE,22
@@ -50,13 +50,13 @@ vesta/http/error.py,sha256=fWdp-oI2ObJD2mHHuxs1yVJvhON5oHYgYFRLAcUMs-I,180
 vesta/http/redirect.py,sha256=OiDeOmU-X5Mos8a0BQIeOIJqvgWjDEtaYrM4-x4MXl0,177
 vesta/http/response.py,sha256=G7cmbrXFNbIbQoqNxNkR06I5VymIwjFSAe3LtVa56Ok,3760
 vesta/mailing/mailing_service.py,sha256=GBO5Hnspm9Pqwd5kGB0iekZaMoIrfQvrhMUf8tVma7g,5386
-vesta/scripts/cli.py,sha256=AtC7hxB3sMH984e65msO2-R0s4nkrzP09Aqd3OPwCes,8224
-vesta/scripts/initDB.py,sha256=TKaK4RZM6CycBEsHeGb9Q9PdphkQgaJDnEWhvRnGC9k,1659
+vesta/scripts/cli.py,sha256=8IHmL09-kzdp-FdqyFlO6cmgYKX5UcpdXdjQDXJpzHs,8257
+vesta/scripts/initDB.py,sha256=4o_J3IK0vcil2oHvk_qmtqLSlWABcRPFBC3M61-oSF8,1842
 vesta/scripts/install.py,sha256=GvH_HHx5aU5_54RQ1_2vz4DaLCh42AHfUKy-m0q21vY,2125
 vesta/scripts/testsRun.py,sha256=bXJImdexKQUDW8CR8F9VIKTrgkd7QfnvHQPENEV4x38,2463
 vesta/scripts/utils.py,sha256=PR2XPonaoZEbegzV3QX1EHfyq67sU-cbDEUexCuJp9Q,6013
-vesta_web-1.1.9.dist-info/METADATA,sha256=Ad5pJwLi3w1i5HOR4W7005x3Qf_pV68DPcblzlxvwE8,1584
-vesta_web-1.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-vesta_web-1.1.9.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
-vesta_web-1.1.9.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
-vesta_web-1.1.9.dist-info/RECORD,,
+vesta_web-1.2.0.dist-info/METADATA,sha256=-Y1fT4y1JvrNFro0-AnUig48F5cAru500JpWkdsUy-0,1584
+vesta_web-1.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+vesta_web-1.2.0.dist-info/entry_points.txt,sha256=MHMrWJwtkb4FmNz0CTpxZzwQ3LTqndXBh8YBPDfXlW4,49
+vesta_web-1.2.0.dist-info/licenses/LICENSE.md,sha256=zoPFEFUUoSgosmDBK5fGTWGRHHBaSVuuJT2ZQIYXuIk,177
+vesta_web-1.2.0.dist-info/RECORD,,