feat(worker): ✨ user operations

willin · Dec 28, 2023 · 7cf7133 · 7cf7133
1 parent 639ab4e
commit 7cf7133
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ Free IDaas And Single Sign-On Service
 - `/api/users` GET
 - `/api/users/:id` GET/PUT/POST
 - `/api/users/:id/forbidden` PUT/POST
+- `/api/users/:id/:provider` DELETE
 
 ## 赞助 Sponsor
 

diff --git a/apps/sso/src/routes/api/users.ts b/apps/sso/src/routes/api/users.ts
@@ -3,6 +3,7 @@ import { zBodyValidator } from '@hono-dev/zod-body-validator';
 import { Hono } from 'hono';
 // import { cache } from 'hono/cache';
 import { z } from 'zod';
+import { AvailableProviders } from '../../config';
 import { guard } from '../../middleware/guard';
 import { PaginationQuerySchema } from '../../types';
 
@@ -55,4 +56,50 @@ router.on(
   }
 );
 
+router.on(
+  ['POST', 'PUT'],
+  '/users/:id',
+  guard(),
+  zBodyValidator(
+    z.object({
+      username: z.string(),
+      display_name: z.string(),
+      avatar: z.string()
+    })
+  ),
+  async (c) => {
+    const s = c.get('services');
+    const viewer = c.get('viewer');
+    const id = c.req.param('id');
+    if (viewer.type !== 'admin' && viewer.id !== id) {
+      return c.json({ error: 'forbidden' }, 403);
+    }
+    const body = c.req.valid('form');
+    const result = await s.user.updateUser(id, body);
+    return c.json({ result });
+  }
+);
+
+router.delete(
+  '/users/:id/:provider',
+  guard(),
+  zValidator(
+    'param',
+    z.object({
+      id: z.string(),
+      provider: z.enum(AvailableProviders)
+    })
+  ),
+  async (c) => {
+    const s = c.get('services');
+    const { id, provider } = c.req.valid('param');
+    const viewer = c.get('viewer');
+    if (viewer.type !== 'admin' && viewer.id !== id) {
+      return c.json({ error: 'forbidden' }, 403);
+    }
+    const result = await s.user.unbindThirdUser(id, provider);
+    return c.json({ result });
+  }
+);
+
 export { router };
diff --git a/apps/sso/src/routes/auth/afdian.ts b/apps/sso/src/routes/auth/afdian.ts
@@ -26,7 +26,7 @@ router.get('/afdian/*', async (c) => {
     // Bind thid login method to the user
     if (!bindedUid) {
       await s.user.bindThirdUser(viewer.id, 'afdian', formattedUser);
-      return c.redirect('/dashboard');
+      return callbackOrBindRedirect(c, '/dashboard');
     }
   }
   // Register the user

diff --git a/apps/sso/src/routes/auth/alipay.ts b/apps/sso/src/routes/auth/alipay.ts
@@ -27,7 +27,7 @@ router.get('/alipay/*', async (c) => {
     // Bind thid login method to the user
     if (!bindedUid) {
       await s.user.bindThirdUser(viewer.id, 'alipay', formattedUser);
-      return c.redirect('/dashboard');
+      return callbackOrBindRedirect(c, '/dashboard');
     }
   }
   // Register the user

diff --git a/apps/sso/src/routes/auth/github.ts b/apps/sso/src/routes/auth/github.ts
@@ -27,7 +27,7 @@ router.get('/github/*', async (c) => {
     // Bind thid login method to the user
     if (!bindedUid) {
       await s.user.bindThirdUser(viewer.id, 'github', formattedUser);
-      return c.redirect('/dashboard');
+      return callbackOrBindRedirect(c, '/dashboard');
     }
   }
   // Register the user

diff --git a/apps/website/src/app.d.ts b/apps/website/src/app.d.ts
@@ -8,7 +8,9 @@ import type { App as Apps, User, ThirdUser } from '$lib/types';
 declare global {
   namespace App {
     // interface Error {}
-    // interface Locals {}
+    interface Locals {
+      user: User & { thirdparty: ThirdUser[] };
+    }
     interface PageData {
       user: User & { thirdparty: ThirdUser[] };
       apps: Apps[];

diff --git a/apps/website/src/routes/[[lang=locale]]/dashboard/me/+page.server.ts b/apps/website/src/routes/[[lang=locale]]/dashboard/me/+page.server.ts
@@ -0,0 +1,31 @@
+import type { Actions } from './$types';
+
+export const actions: Actions = {
+  save: async ({ request, fetch }) => {
+    const form = await request.formData();
+    const body = Object.fromEntries(form.entries());
+    const { id, ...rest } = body;
+    const res = await fetch(`/api/users/${id}`, {
+      method: 'PUT',
+      body: JSON.stringify(rest),
+      headers: {
+        'content-type': 'application/json'
+      }
+    });
+    const result = await res.json();
+    return result;
+  },
+  unbind: async ({ request, fetch }) => {
+    const form = await request.formData();
+    const body = Object.fromEntries(form.entries());
+    const res = await fetch(`/api/users/${body.id}/${body.provider}`, {
+      method: 'DELETE',
+      body: JSON.stringify({}),
+      headers: {
+        'content-type': 'application/json'
+      }
+    });
+    const result = await res.json();
+    return result;
+  }
+};
diff --git a/apps/website/src/routes/[[lang=locale]]/dashboard/me/+page.svelte b/apps/website/src/routes/[[lang=locale]]/dashboard/me/+page.svelte
@@ -30,9 +30,17 @@
       loading = false;
     };
   }
+
+  function confirmOperation(e: Event) {
+    if (!confirm($t('common.confirm'))) {
+      e.preventDefault();
+      return false;
+    }
+  }
 </script>
 
 <form action="?/save" method="POST" use:enhance={handleSubmit}>
+  <input type='hidden' name='id' value={$page.data.user.id} />
   <div class="form-control w-full my-2">
     <label class="label">
       <span class="label-text">{$t('user.username')}</span>
@@ -86,8 +94,10 @@
         <p>{$t('common.created_at')}: {thirdUser.created_at}</p>
         <div class='card-actions justify-end'>
           <form action="?/unbind" method="POST" use:enhance={handleSubmit}>
+            <input type='hidden' name='id' value={$page.data.user.id} />
             <div class='form-control w-full my-2'>
-              <button type='submit' name='provider' value={thirdUser.provider} class='btn btn-primary'
+              <button type='submit' name='provider' value={thirdUser.provider} class='btn btn-secondary'
+              on:click={confirmOperation}
               disabled={loading ||$page.data.user?.thirdparty?.length === 1}
               class:btn-disabled={loading ||$page.data.user?.thirdparty?.length === 1}
               >
@@ -110,14 +120,11 @@
       <div class='card-body'>
         <h2 class='card-title capitalize'>{getProviderName(provider)}</h2>
         <div class='card-actions justify-end'>
-          <form action="?/bind" method="POST" use:enhance={handleSubmit}>
+          <form>
             <div class='form-control w-full my-2'>
-              <button type='submit' name='provider' value={provider} class='btn btn-primary'
-              disabled={loading}
-              class:btn-disabled={loading}
-              >
+              <a class='btn btn-primary' href={`/auth/${provider}?returnTo=${$page.url.pathname}`}>
                 {$t('user.bind')}
-              </button>
+              </a>
             </div>
           </form>
         </div>

diff --git a/apps/website/src/routes/[[lang=locale]]/dashboard/user/+page.svelte b/apps/website/src/routes/[[lang=locale]]/dashboard/user/+page.svelte
@@ -67,12 +67,12 @@
           <td>
             <div class="avatar">
               <div class="w-8 rounded">
-                <img src={user.avatar} alt={user.displayName} />
+                <img src={user.avatar} alt={user.display_name} />
               </div>
             </div>
           </td>
           <td>{user.username}</td>
-          <td>{user.displayName}</td>
+          <td>{user.display_name}</td>
           <td>{$t(`user.${user.type}`)}</td>
           <td>{user.created_at}</td>
           <td>

diff --git a/apps/website/src/routes/[[lang=locale]]/dashboard/user/edit/[id]/+page.server.ts b/apps/website/src/routes/[[lang=locale]]/dashboard/user/edit/[id]/+page.server.ts
@@ -0,0 +1,32 @@
+import type { Actions } from './$types';
+
+export const actions: Actions = {
+  save: async ({ request, fetch, params }) => {
+    const form = await request.formData();
+    const body = Object.fromEntries(form.entries());
+    const res = await fetch(`/api/users/${params.id}`, {
+      method: 'PUT',
+      body: JSON.stringify(body),
+      headers: {
+        'content-type': 'application/json'
+      }
+    });
+    const result = await res.json();
+    return result;
+  },
+  unbind: async ({ request, fetch, params }) => {
+    const form = await request.formData();
+    const body = Object.fromEntries(form.entries());
+    console.log(body);
+    const res = await fetch(`/api/users/${params.id}/${body.provider}`, {
+      method: 'DELETE',
+      body: JSON.stringify({}),
+      headers: {
+        'content-type': 'application/json'
+      }
+    });
+    const result = await res.json();
+    console.log(JSON.stringify(result, null, 2));
+    return result;
+  }
+};
diff --git a/apps/website/src/routes/[[lang=locale]]/dashboard/user/edit/[id]/+page.svelte b/apps/website/src/routes/[[lang=locale]]/dashboard/user/edit/[id]/+page.svelte
@@ -23,6 +23,13 @@
       loading = false;
     };
   }
+
+  function confirmOperation(e: Event) {
+    if (!confirm($t('common.confirm'))) {
+      e.preventDefault();
+      return false;
+    }
+  }
 </script>
 
 <form action="?/save" method="POST" use:enhance={handleSubmit}>
@@ -90,6 +97,7 @@
         <form action="?/unbind" method="POST" use:enhance={handleSubmit}>
           <div class='form-control w-full my-2'>
             <button type='submit' name='provider' value={thirdUser.provider} class='btn btn-primary'
+            onclick={confirmOperation}
             disabled={loading ||$page.data.user?.thirdparty?.length === 1}
             class:btn-disabled={loading ||$page.data.user?.thirdparty?.length === 1}
             >