From 7500e5f8875b4e8278f1cdf90e3363317b1130df Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Tue, 25 May 2021 19:43:58 -0700
Subject: [PATCH] username support

---
 frontend/src/locales/messages/en-US.json      |  1 +
 frontend/src/pages/Admin/About/index.vue      | 28 +++++++++++++++++++
 frontend/src/pages/Admin/Profile/UserCard.vue | 13 ++++++++-
 mealie/core/security.py                       |  5 ++++
 mealie/db/models/users.py                     | 25 +++++++++--------
 mealie/routes/users/auth.py                   |  4 +--
 mealie/schema/user.py                         |  2 ++
 7 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/frontend/src/locales/messages/en-US.json b/frontend/src/locales/messages/en-US.json
index 85886f1a1..b8b6914ff 100644
--- a/frontend/src/locales/messages/en-US.json
+++ b/frontend/src/locales/messages/en-US.json
@@ -377,6 +377,7 @@
     "untagged-count": "Untagged {count}"
   },
   "user": {
+    "username": "Username",
     "admin": "Admin",
     "are-you-sure-you-want-to-delete-the-link": "Are you sure you want to delete the link <b>{link}<b/>?",
     "are-you-sure-you-want-to-delete-the-user": "Are you sure you want to delete the user <b>{activeName} ID: {activeId}<b/>?",
diff --git a/frontend/src/pages/Admin/About/index.vue b/frontend/src/pages/Admin/About/index.vue
index eabfcc7fb..be086065c 100644
--- a/frontend/src/pages/Admin/About/index.vue
+++ b/frontend/src/pages/Admin/About/index.vue
@@ -1,5 +1,33 @@
 <template>
   <div>
+    <v-app-bar color="primary">
+      <v-spacer></v-spacer>
+      <v-btn href="https://github.com/sponsors/hay-kot" target="_blank" class="mx-1" color="secondary">
+        <v-icon left>
+          mdi-heart
+        </v-icon>
+        Support
+      </v-btn>
+      <v-btn href="https://github.com/hay-kot" target="_blank" class="mx-1" color="secondary">
+        <v-icon left>
+          mdi-github
+        </v-icon>
+        Github
+      </v-btn>
+      <v-btn href="https://hay-kot.dev" target="_blank" class="mx-1" color="secondary">
+        <v-icon left>
+          mdi-account
+        </v-icon>
+        Portfolio
+      </v-btn>
+      <v-btn href="https://hay-kot.github.io/mealie/" target="_blank" class="mx-1" color="secondary">
+        <v-icon left>
+          mdi-folder-outline
+        </v-icon>
+        Docs
+      </v-btn>
+      <v-spacer></v-spacer>
+    </v-app-bar>
     <v-card class="mt-3">
       <v-card-title class="headline">
         {{ $t("about.about-mealie") }}
diff --git a/frontend/src/pages/Admin/Profile/UserCard.vue b/frontend/src/pages/Admin/Profile/UserCard.vue
index 73e659f0a..3d26108f5 100644
--- a/frontend/src/pages/Admin/Profile/UserCard.vue
+++ b/frontend/src/pages/Admin/Profile/UserCard.vue
@@ -67,7 +67,15 @@
     </template>
     <template v-slot:bottom>
       <v-card-text>
-        <v-form>
+        <v-form ref="userUpdate">
+          <v-text-field
+            :label="$t('user.username')"
+            required
+            v-model="user.username"
+            :rules="[existsRule]"
+            validate-on-blur
+          >
+          </v-text-field>
           <v-text-field
             :label="$t('user.full-name')"
             required
@@ -151,6 +159,9 @@ export default {
       this.user.avatar = avatar;
     },
     async updateUser() {
+      if (!this.$refs.userUpdate.validate()) {
+        return;
+      }
       this.loading = true;
 
       const response = await api.users.update(this.user);
diff --git a/mealie/core/security.py b/mealie/core/security.py
index 12cbe2257..a7a2d847c 100644
--- a/mealie/core/security.py
+++ b/mealie/core/security.py
@@ -28,8 +28,13 @@ def create_file_token(file_path: Path) -> bool:
 
 def authenticate_user(session, email: str, password: str) -> UserInDB:
     user: UserInDB = db.users.get(session, email, "email", any_case=True)
+
+    if not user:
+        user = db.users.get(session, email, "username", any_case=True)
     if not user:
         return False
+
+    print(user)
     if not verify_password(password, user.password):
         return False
     return user
diff --git a/mealie/db/models/users.py b/mealie/db/models/users.py
index 537b2b17a..5ab7d715c 100644
--- a/mealie/db/models/users.py
+++ b/mealie/db/models/users.py
@@ -22,6 +22,11 @@ class User(SqlAlchemyBase, BaseMixins):
     __tablename__ = "users"
     id = Column(Integer, primary_key=True)
     full_name = Column(String, index=True)
+    username = Column(
+        String,
+        index=True,
+        unique=True,
+    )
     email = Column(String, unique=True, index=True)
     password = Column(String)
     group_id = Column(Integer, ForeignKey("groups.id"))
@@ -32,16 +37,7 @@ class User(SqlAlchemyBase, BaseMixins):
     )
 
     def __init__(
-        self,
-        session,
-        full_name,
-        email,
-        password,
-        group: str = settings.DEFAULT_GROUP,
-        admin=False,
-        id=None,
-        *args,
-        **kwargs
+        self, session, full_name, email, password, group: str = settings.DEFAULT_GROUP, admin=False, **_
     ) -> None:
 
         group = group or settings.DEFAULT_GROUP
@@ -51,12 +47,19 @@ class User(SqlAlchemyBase, BaseMixins):
         self.admin = admin
         self.password = password
 
-    def update(self, full_name, email, group, admin, session=None, id=None, password=None, *args, **kwargs):
+        if self.username is None:
+            self.username = full_name
+
+    def update(self, full_name, email, group, admin, username, session=None, id=None, password=None, *args, **kwargs):
+        self.username = username
         self.full_name = full_name
         self.email = email
         self.group = Group.get_ref(session, group)
         self.admin = admin
 
+        if self.username is None:
+            self.username = full_name
+
         if password:
             self.password = password
 
diff --git a/mealie/routes/users/auth.py b/mealie/routes/users/auth.py
index bfcb02982..b5b5ddb9e 100644
--- a/mealie/routes/users/auth.py
+++ b/mealie/routes/users/auth.py
@@ -23,7 +23,7 @@ def get_token(
     email = data.username
     password = data.password
 
-    user = authenticate_user(session, email, password)
+    user: UserInDB = authenticate_user(session, email, password)
 
     if not user:
         background_tasks.add_task(
@@ -34,7 +34,7 @@ def get_token(
             headers={"WWW-Authenticate": "Bearer"},
         )
 
-    access_token = security.create_access_token(dict(sub=email))
+    access_token = security.create_access_token(dict(sub=user.email))
     return {"access_token": access_token, "token_type": "bearer"}
 
 
diff --git a/mealie/schema/user.py b/mealie/schema/user.py
index 4bba3e556..9ee1b0b8f 100644
--- a/mealie/schema/user.py
+++ b/mealie/schema/user.py
@@ -43,6 +43,7 @@ class GroupBase(CamelModel):
 
 
 class UserBase(CamelModel):
+    username: Optional[str]
     full_name: Optional[str] = None
     email: constr(to_lower=True, strip_whitespace=True)
     admin: bool
@@ -59,6 +60,7 @@ class UserBase(CamelModel):
             }
 
         schema_extra = {
+            "username": "ChangeMe",
             "fullName": "Change Me",
             "email": "changeme@email.com",
             "group": settings.DEFAULT_GROUP,