From a53c834043115878451413a18246e60300865ab6 Mon Sep 17 00:00:00 2001
From: crowlkats <crowlkats@toaxl.com>
Date: Wed, 28 Feb 2024 14:59:21 +0100
Subject: [PATCH 1/5] feat: allow inviting to scope via email

---
 api/src/api/scope.rs                          | 26 ++++++----
 api/src/api/types.rs                          |  5 +-
 .../@[scope]/(_islands)/ScopeInviteForm.tsx   | 49 ++++++++++++++-----
 3 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/api/src/api/scope.rs b/api/src/api/scope.rs
index 0529c106..e884fef1 100644
--- a/api/src/api/scope.rs
+++ b/api/src/api/scope.rs
@@ -220,7 +220,7 @@ async fn invite_member_handler(
   let scope = req.param_scope()?;
   Span::current().record("scope", &field::display(&scope));
 
-  let ApiAddScopeMemberRequest { github_login } = decode_json(&mut req).await?;
+  let invite = decode_json::<ApiAddScopeMemberRequest>(&mut req).await?;
 
   let iam = req.iam();
   let current_user = iam.check_current_user_access()?.to_owned();
@@ -233,14 +233,22 @@ async fn invite_member_handler(
   let iam = req.iam();
   iam.check_scope_admin_access(&scope).await?;
 
-  let new_user = lookup_user_by_github_login(
-    db,
-    github_oauth2_client,
-    &current_user,
-    &github_login,
-  )
-  .await?
-  .ok_or(ApiError::UserNotFound)?;
+  let new_user = match invite {
+    ApiAddScopeMemberRequest::GithubLogin(github_login) => {
+      lookup_user_by_github_login(
+        db,
+        github_oauth2_client,
+        &current_user,
+        &github_login,
+      )
+        .await?
+        .ok_or(ApiError::UserNotFound)?
+    }
+    ApiAddScopeMemberRequest::Email(email) => db
+      .get_user_by_email(&email)
+      .await?
+      .ok_or(ApiError::UserNotFound)?,
+  };
 
   if db.get_scope_member(&scope, new_user.id).await?.is_some() {
     return Err(ApiError::AlreadyScopeMember);
diff --git a/api/src/api/types.rs b/api/src/api/types.rs
index 256f24a1..6f44d6a7 100644
--- a/api/src/api/types.rs
+++ b/api/src/api/types.rs
@@ -282,8 +282,9 @@ impl From<(ScopeMember, UserPublic)> for ApiScopeMember {
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ApiAddScopeMemberRequest {
-  pub github_login: String,
+pub enum ApiAddScopeMemberRequest {
+  GithubLogin(String),
+  Email(String),
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
index 2d2ebed8..ae544a64 100644
--- a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
+++ b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
@@ -1,6 +1,6 @@
 // Copyright 2024 the JSR authors. All rights reserved. MIT license.
 import { useSignal } from "@preact/signals";
-import { useCallback } from "preact/hooks";
+import { useCallback, useRef } from "preact/hooks";
 import { JSX } from "preact/jsx-runtime";
 import { ScopeInvite } from "../../../utils/api_types.ts";
 import { api, path } from "../../../utils/api.ts";
@@ -12,18 +12,25 @@ interface ScopeInviteFormProps {
 export function ScopeInviteForm(props: ScopeInviteFormProps) {
   const submitting = useSignal(false);
   const error = useSignal<string>("");
+  const kind = useSignal<"github" | "email">("github");
+  const inputRef = useRef<HTMLInputElement>(null);
 
   const onSubmit = useCallback(
     (e: JSX.TargetedEvent<HTMLFormElement>) => {
       e.preventDefault();
       const formData = new FormData(e.currentTarget);
-      const githubLogin = String(formData.get("githubLogin"));
+
+      const kind = String(formData.get("kind"));
+      const inviteValue = String(formData.get("inviteValue"));
 
       submitting.value = true;
 
       api.post<ScopeInvite>(
         path`/scopes/${props.scope}/members`,
-        { githubLogin },
+        {
+          githubLogin: kind === "github" ? inviteValue : undefined,
+          email: kind === "email" ? inviteValue : undefined,
+        },
       ).then((res) => {
         submitting.value = false;
         if (!res.ok) {
@@ -47,14 +54,34 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
       onSubmit={onSubmit}
     >
       <div class="mt-4 flex gap-4">
-        <input
-          class="block w-full max-w-sm p-1.5 input-container input"
-          type="text"
-          name="githubLogin"
-          placeholder="GitHub username"
-          required
-          disabled={submitting}
-        />
+        <div class="flex">
+          <select
+            name="kind"
+            id="kind-select"
+            class="inline-block p-1.5 input-container input rounded-r-none border-r-0"
+            disabled={submitting}
+            onChange={(e) => {
+              if (kind.value !== e.currentTarget.value) {
+                kind.value = e.currentTarget.value as "github" | "email";
+                if (inputRef?.current) {
+                  inputRef.current.value = "";
+                }
+              }
+            }}
+          >
+            <option value="github" selected>GitHub</option>
+            <option value="email">E-Mail</option>
+          </select>
+          <input
+            class="inline-block w-full max-w-sm p-1.5 input-container input rounded-l-none"
+            type="text"
+            name="inviteValue"
+            placeholder={kind.value === "github" ? "GitHub login" : "E-Mail"}
+            required
+            ref={inputRef}
+            disabled={submitting}
+          />
+        </div>
         <button
           class="button-primary"
           type="submit"

From 846ccfd1e8c8628d97bc4e18a283ef52f63e52f4 Mon Sep 17 00:00:00 2001
From: crowlkats <crowlkats@toaxl.com>
Date: Wed, 28 Feb 2024 15:46:25 +0100
Subject: [PATCH 2/5] re-add query

---
 api/src/db/database.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/api/src/db/database.rs b/api/src/db/database.rs
index 0b296ee4..cd6ba1a3 100644
--- a/api/src/db/database.rs
+++ b/api/src/db/database.rs
@@ -86,6 +86,24 @@ impl Database {
     .await
   }
 
+  #[instrument(name = "Database::get_user_by_email", skip(self), err)]
+  pub async fn get_user_by_email(
+    &self,
+    email: &str,
+  ) -> Result<Option<User>> {
+    sqlx::query_as!(
+      User,
+      r#"SELECT id, name, email, avatar_url, updated_at, created_at, github_id, is_blocked, is_staff, scope_limit, waitlist_accepted_at,
+        (SELECT COUNT(created_at) FROM scope_invites WHERE target_user_id = id) as "invite_count!",
+        (SELECT COUNT(created_at) FROM scopes WHERE creator = id) as "scope_usage!"
+      FROM users
+      WHERE email = $1"#,
+      email
+    )
+    .fetch_optional(&self.pool)
+    .await
+  }
+
   #[instrument(name = "Database::list_users", skip(self), err)]
   pub async fn list_users(
     &self,

From 7d314cb183709be17826c01707cbcf7d6592a07e Mon Sep 17 00:00:00 2001
From: crowlkats <crowlkats@toaxl.com>
Date: Mon, 4 Mar 2024 12:54:29 +0100
Subject: [PATCH 3/5] switch to uuid

---
 api/src/api/scope.rs                           | 11 +++++------
 api/src/api/types.rs                           |  2 +-
 api/src/db/database.rs                         | 18 ------------------
 frontend/fresh.gen.ts                          |  1 -
 .../@[scope]/(_islands)/ScopeInviteForm.tsx    | 10 +++++-----
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/api/src/api/scope.rs b/api/src/api/scope.rs
index e884fef1..4005e473 100644
--- a/api/src/api/scope.rs
+++ b/api/src/api/scope.rs
@@ -241,13 +241,12 @@ async fn invite_member_handler(
         &current_user,
         &github_login,
       )
-        .await?
-        .ok_or(ApiError::UserNotFound)?
-    }
-    ApiAddScopeMemberRequest::Email(email) => db
-      .get_user_by_email(&email)
       .await?
-      .ok_or(ApiError::UserNotFound)?,
+      .ok_or(ApiError::UserNotFound)?
+    }
+    ApiAddScopeMemberRequest::Uuid(id) => {
+      db.get_user(id).await?.ok_or(ApiError::UserNotFound)?
+    }
   };
 
   if db.get_scope_member(&scope, new_user.id).await?.is_some() {
diff --git a/api/src/api/types.rs b/api/src/api/types.rs
index 6f44d6a7..5e0fd046 100644
--- a/api/src/api/types.rs
+++ b/api/src/api/types.rs
@@ -284,7 +284,7 @@ impl From<(ScopeMember, UserPublic)> for ApiScopeMember {
 #[serde(rename_all = "camelCase")]
 pub enum ApiAddScopeMemberRequest {
   GithubLogin(String),
-  Email(String),
+  Uuid(Uuid),
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/api/src/db/database.rs b/api/src/db/database.rs
index cd6ba1a3..0b296ee4 100644
--- a/api/src/db/database.rs
+++ b/api/src/db/database.rs
@@ -86,24 +86,6 @@ impl Database {
     .await
   }
 
-  #[instrument(name = "Database::get_user_by_email", skip(self), err)]
-  pub async fn get_user_by_email(
-    &self,
-    email: &str,
-  ) -> Result<Option<User>> {
-    sqlx::query_as!(
-      User,
-      r#"SELECT id, name, email, avatar_url, updated_at, created_at, github_id, is_blocked, is_staff, scope_limit, waitlist_accepted_at,
-        (SELECT COUNT(created_at) FROM scope_invites WHERE target_user_id = id) as "invite_count!",
-        (SELECT COUNT(created_at) FROM scopes WHERE creator = id) as "scope_usage!"
-      FROM users
-      WHERE email = $1"#,
-      email
-    )
-    .fetch_optional(&self.pool)
-    .await
-  }
-
   #[instrument(name = "Database::list_users", skip(self), err)]
   pub async fn list_users(
     &self,
diff --git a/frontend/fresh.gen.ts b/frontend/fresh.gen.ts
index 955ae16e..2c9e138e 100644
--- a/frontend/fresh.gen.ts
+++ b/frontend/fresh.gen.ts
@@ -1,4 +1,3 @@
-// Copyright 2024 the JSR authors. All rights reserved. MIT license.
 // DO NOT EDIT. This file is generated by Fresh.
 // This file SHOULD be checked into source version control.
 // This file is automatically updated during development when running `dev.ts`.
diff --git a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
index ae544a64..7c0932f3 100644
--- a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
+++ b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
@@ -12,7 +12,7 @@ interface ScopeInviteFormProps {
 export function ScopeInviteForm(props: ScopeInviteFormProps) {
   const submitting = useSignal(false);
   const error = useSignal<string>("");
-  const kind = useSignal<"github" | "email">("github");
+  const kind = useSignal<"github" | "uuid">("github");
   const inputRef = useRef<HTMLInputElement>(null);
 
   const onSubmit = useCallback(
@@ -29,7 +29,7 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
         path`/scopes/${props.scope}/members`,
         {
           githubLogin: kind === "github" ? inviteValue : undefined,
-          email: kind === "email" ? inviteValue : undefined,
+          uuid: kind === "uuid" ? inviteValue : undefined,
         },
       ).then((res) => {
         submitting.value = false;
@@ -62,7 +62,7 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
             disabled={submitting}
             onChange={(e) => {
               if (kind.value !== e.currentTarget.value) {
-                kind.value = e.currentTarget.value as "github" | "email";
+                kind.value = e.currentTarget.value as "github" | "uuid";
                 if (inputRef?.current) {
                   inputRef.current.value = "";
                 }
@@ -70,13 +70,13 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
             }}
           >
             <option value="github" selected>GitHub</option>
-            <option value="email">E-Mail</option>
+            <option value="uuid">User ID</option>
           </select>
           <input
             class="inline-block w-full max-w-sm p-1.5 input-container input rounded-l-none"
             type="text"
             name="inviteValue"
-            placeholder={kind.value === "github" ? "GitHub login" : "E-Mail"}
+            placeholder={kind.value === "github" ? "GitHub login" : "User ID"}
             required
             ref={inputRef}
             disabled={submitting}

From a647b38a6b79ff2dc03260189137989127471aee Mon Sep 17 00:00:00 2001
From: crowlkats <crowlkats@toaxl.com>
Date: Mon, 4 Mar 2024 12:59:15 +0100
Subject: [PATCH 4/5] fmt

---
 frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
index e219c44c..94f6386c 100644
--- a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
+++ b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
@@ -76,7 +76,9 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
             class="inline-block w-full max-w-sm px-3 input-container text-sm input rounded-l-none"
             type="text"
             name="inviteValue"
-            placeholder={kind.value === "github" ? "GitHub username" : "User ID"}
+            placeholder={kind.value === "github"
+              ? "GitHub username"
+              : "User ID"}
             required
             ref={inputRef}
             disabled={submitting}

From fb69e710b011dbd7d3a7a5d56fa0221649ea359a Mon Sep 17 00:00:00 2001
From: crowlkats <crowlkats@toaxl.com>
Date: Mon, 4 Mar 2024 19:40:07 +0100
Subject: [PATCH 5/5] fix

---
 api/src/api/scope.rs                                    | 2 +-
 api/src/api/types.rs                                    | 2 +-
 frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/api/scope.rs b/api/src/api/scope.rs
index c9e1dc71..7386f49a 100644
--- a/api/src/api/scope.rs
+++ b/api/src/api/scope.rs
@@ -243,7 +243,7 @@ async fn invite_member_handler(
       .await?
       .ok_or(ApiError::UserNotFound)?
     }
-    ApiAddScopeMemberRequest::Uuid(id) => {
+    ApiAddScopeMemberRequest::Id(id) => {
       db.get_user(id).await?.ok_or(ApiError::UserNotFound)?
     }
   };
diff --git a/api/src/api/types.rs b/api/src/api/types.rs
index 2640dd00..8728be66 100644
--- a/api/src/api/types.rs
+++ b/api/src/api/types.rs
@@ -287,7 +287,7 @@ impl From<(ScopeMember, UserPublic)> for ApiScopeMember {
 #[serde(rename_all = "camelCase")]
 pub enum ApiAddScopeMemberRequest {
   GithubLogin(String),
-  Uuid(Uuid),
+  Id(Uuid),
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
index 94f6386c..cb53425c 100644
--- a/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
+++ b/frontend/routes/@[scope]/(_islands)/ScopeInviteForm.tsx
@@ -12,7 +12,7 @@ interface ScopeInviteFormProps {
 export function ScopeInviteForm(props: ScopeInviteFormProps) {
   const submitting = useSignal(false);
   const error = useSignal<string>("");
-  const kind = useSignal<"github" | "uuid">("github");
+  const kind = useSignal<"github" | "id">("github");
   const inputRef = useRef<HTMLInputElement>(null);
 
   const onSubmit = useCallback(
@@ -29,7 +29,7 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
         path`/scopes/${props.scope}/members`,
         {
           githubLogin: kind === "github" ? inviteValue : undefined,
-          uuid: kind === "uuid" ? inviteValue : undefined,
+          id: kind === "id" ? inviteValue : undefined,
         },
       ).then((res) => {
         submitting.value = false;
@@ -62,7 +62,7 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
             disabled={submitting}
             onChange={(e) => {
               if (kind.value !== e.currentTarget.value) {
-                kind.value = e.currentTarget.value as "github" | "uuid";
+                kind.value = e.currentTarget.value as "github" | "id";
                 if (inputRef?.current) {
                   inputRef.current.value = "";
                 }
@@ -70,7 +70,7 @@ export function ScopeInviteForm(props: ScopeInviteFormProps) {
             }}
           >
             <option value="github" selected>GitHub</option>
-            <option value="uuid">User ID</option>
+            <option value="id">User ID</option>
           </select>
           <input
             class="inline-block w-full max-w-sm px-3 input-container text-sm input rounded-l-none"