From 68ee2bdcdcbd569ea9ccd8fdaeb293aa90c0b40d Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sat, 3 Oct 2020 16:31:10 -0700
Subject: [PATCH] Fix another GitHub OAuth Bug, allow users to register with
 null names. (#69)

* Change header name

* Add default bio value

* Remove default

* Make name null

* Run prepare
---
 migrations/20201003211651_make-name-null.sql | 5 +++++
 sqlx-data.json                               | 4 ++--
 src/auth/mod.rs                              | 2 +-
 src/database/models/user_item.rs             | 4 ++--
 src/models/users.rs                          | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 migrations/20201003211651_make-name-null.sql

diff --git a/migrations/20201003211651_make-name-null.sql b/migrations/20201003211651_make-name-null.sql
new file mode 100644
index 000000000..2bfbfbe76
--- /dev/null
+++ b/migrations/20201003211651_make-name-null.sql
@@ -0,0 +1,5 @@
+-- Add migration script here
+ALTER TABLE users
+ALTER COLUMN name DROP NOT NULL;
+ALTER TABLE users
+ALTER COLUMN name DROP DEFAULT;
diff --git a/sqlx-data.json b/sqlx-data.json
index fbb317215..8b4202b76 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -801,7 +801,7 @@
       },
       "nullable": [
         true,
-        false,
+        true,
         true,
         true,
         false,
@@ -1327,7 +1327,7 @@
       },
       "nullable": [
         false,
-        false,
+        true,
         true,
         true,
         false,
diff --git a/src/auth/mod.rs b/src/auth/mod.rs
index 85383f233..1765ef08c 100644
--- a/src/auth/mod.rs
+++ b/src/auth/mod.rs
@@ -23,7 +23,7 @@ pub struct GitHubUser {
     pub login: String,
     pub id: u64,
     pub avatar_url: String,
-    pub name: String,
+    pub name: Option<String>,
     pub email: Option<String>,
     pub bio: Option<String>,
 }
diff --git a/src/database/models/user_item.rs b/src/database/models/user_item.rs
index 1bcddc574..b3aa7524b 100644
--- a/src/database/models/user_item.rs
+++ b/src/database/models/user_item.rs
@@ -4,7 +4,7 @@ pub struct User {
     pub id: UserId,
     pub github_id: Option<i64>,
     pub username: String,
-    pub name: String,
+    pub name: Option<String>,
     pub email: Option<String>,
     pub avatar_url: Option<String>,
     pub bio: Option<String>,
@@ -31,7 +31,7 @@ impl User {
             self.id as UserId,
             self.github_id,
             &self.username,
-            &self.name,
+            self.name.as_ref(),
             self.email.as_ref(),
             self.avatar_url.as_ref(),
             self.bio.as_ref(),
diff --git a/src/models/users.rs b/src/models/users.rs
index 81a315c27..b0a881c81 100644
--- a/src/models/users.rs
+++ b/src/models/users.rs
@@ -11,7 +11,7 @@ pub struct User {
     pub id: UserId,
     pub github_id: Option<u64>,
     pub username: String,
-    pub name: String,
+    pub name: Option<String>,
     pub email: Option<String>,
     pub avatar_url: Option<String>,
     pub bio: Option<String>,