simple-module-users 0.0.9__tar.gz → 0.0.11__tar.gz

{simple_module_users-0.0.9 → simple_module_users-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_module_users
-Version: 0.0.9
+Version: 0.0.11
 Summary: Email + password user management, admin invites, RBAC-ready — replaces Keycloak for simple_module apps
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -24,11 +24,11 @@ Requires-Python: >=3.12
 Requires-Dist: aiosmtplib>=3.0
 Requires-Dist: cachetools>=5.3
 Requires-Dist: fastapi-users[sqlalchemy]<16,>=15
-Requires-Dist: simple-module-auth==0.0.9
-Requires-Dist: simple-module-core==0.0.9
-Requires-Dist: simple-module-db==0.0.9
-Requires-Dist: simple-module-hosting==0.0.9
-Requires-Dist: simple-module-settings==0.0.9
+Requires-Dist: simple-module-auth==0.0.11
+Requires-Dist: simple-module-core==0.0.11
+Requires-Dist: simple-module-db==0.0.11
+Requires-Dist: simple-module-hosting==0.0.11
+Requires-Dist: simple-module-settings==0.0.11
 Requires-Dist: typer>=0.12
 Description-Content-Type: text/markdown
 

{simple_module_users-0.0.9 → simple_module_users-0.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_users"
-version = "0.0.9"
+version = "0.0.11"
 description = "Email + password user management, admin invites, RBAC-ready — replaces Keycloak for simple_module apps"
 readme = "README.md"
 license = "MIT"
@@ -21,11 +21,11 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "simple_module_core==0.0.9",
-    "simple_module_db==0.0.9",
-    "simple_module_hosting==0.0.9",
-    "simple_module_settings==0.0.9",
-    "simple_module_auth==0.0.9",
+    "simple_module_core==0.0.11",
+    "simple_module_db==0.0.11",
+    "simple_module_hosting==0.0.11",
+    "simple_module_settings==0.0.11",
+    "simple_module_auth==0.0.11",
     # Pinned to a narrow range: `deps.py` relies on mutating CookieTransport
     # fields after construction (see reconfigure_cookie_transport in backend.py).
     # Bumping the major version requires re-checking those field names.

simple_module_users-0.0.11/users/components/RolesTab.tsx

@@ -0,0 +1,77 @@
+import { Link } from '@inertiajs/react';
+import { Badge } from '@simple-module-py/ui/components/ui/badge';
+import { Button } from '@simple-module-py/ui/components/ui/button';
+import { Card, CardContent } from '@simple-module-py/ui/components/ui/card';
+import { TabsContent } from '@simple-module-py/ui/components/ui/tabs';
+import { Pencil, ShieldCheck, Users } from 'lucide-react';
+
+export interface RoleItem {
+  id: string;
+  name: string;
+  description?: string | null;
+  user_count: number;
+}
+
+const SYSTEM_ROLES = new Set(['Owner', 'Admin', 'Viewer']);
+
+export function RolesTab({ roles }: { roles: RoleItem[] }) {
+  return (
+    <TabsContent value="roles">
+      {roles.length === 0 ? (
+        <Card className="border-border">
+          <CardContent className="flex flex-col items-center gap-2 py-16 text-muted-foreground">
+            <ShieldCheck className="size-8" />
+            <p>No roles defined</p>
+          </CardContent>
+        </Card>
+      ) : (
+        <div className="grid gap-3 sm:grid-cols-2">
+          {roles.map((role) => {
+            const isSystem = SYSTEM_ROLES.has(role.name);
+            return (
+              <Card key={role.id} className="border-border">
+                <CardContent className="pt-5">
+                  <div className="flex items-start gap-3">
+                    <span className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-primary-600/10 text-primary-700">
+                      {isSystem ? (
+                        <ShieldCheck className="h-[18px] w-[18px]" aria-hidden="true" />
+                      ) : (
+                        <Users className="h-[18px] w-[18px]" aria-hidden="true" />
+                      )}
+                    </span>
+                    <div className="flex-1 min-w-0">
+                      <div className="flex items-center gap-2">
+                        <h3 className="text-[15px] font-bold tracking-tight font-[var(--font-display)] text-foreground">
+                          {role.name}
+                        </h3>
+                        {isSystem && (
+                          <Badge
+                            variant="outline"
+                            className="border-border bg-secondary text-[10px] text-muted-foreground"
+                          >
+                            system
+                          </Badge>
+                        )}
+                      </div>
+                      <p className="mt-1 text-xs text-muted-foreground line-clamp-2">
+                        {role.description || 'No description.'}
+                      </p>
+                      <div className="mt-2 font-mono text-[11px] text-muted-foreground">
+                        {role.user_count} {role.user_count === 1 ? 'member' : 'members'}
+                      </div>
+                    </div>
+                    <Button asChild variant="ghost" size="icon-sm">
+                      <Link href={`/permissions/roles/${role.id}/edit`} aria-label="Edit role">
+                        <Pencil />
+                      </Link>
+                    </Button>
+                  </div>
+                </CardContent>
+              </Card>
+            );
+          })}
+        </div>
+      )}
+    </TabsContent>
+  );
+}

simple_module_users-0.0.11/users/components/UserRow.tsx

@@ -0,0 +1,80 @@
+import { Link } from '@inertiajs/react';
+import { Badge } from '@simple-module-py/ui/components/ui/badge';
+import { Button } from '@simple-module-py/ui/components/ui/button';
+import { TableCell, TableRow } from '@simple-module-py/ui/components/ui/table';
+import { Pencil } from 'lucide-react';
+
+export interface UserListItem {
+  id: string;
+  email: string;
+  full_name: string | null;
+  is_active: boolean;
+  is_verified: boolean;
+  last_login_at: string | null;
+  created_at: string | null;
+  roles: string[];
+}
+
+function Avatar({ initial }: { initial: string }) {
+  return (
+    <span className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-gradient-to-br from-primary-600 to-primary-800 text-[13px] font-bold text-white font-[var(--font-display)]">
+      {initial}
+    </span>
+  );
+}
+
+function StatusBadge({ user }: { user: UserListItem }) {
+  if (!user.is_active) {
+    return (
+      <Badge variant="outline" className="border-border bg-secondary text-muted-foreground">
+        disabled
+      </Badge>
+    );
+  }
+  if (!user.is_verified) {
+    return (
+      <Badge variant="outline" className="border-blue-200 bg-blue-50 text-blue-700">
+        invited
+      </Badge>
+    );
+  }
+  return (
+    <Badge variant="outline" className="border-primary-200 bg-primary-50 text-primary-700">
+      active
+    </Badge>
+  );
+}
+
+export function UserRow({ user }: { user: UserListItem }) {
+  return (
+    <TableRow className="hover:bg-secondary/40">
+      <TableCell className="py-3">
+        <div className="flex items-center gap-3">
+          <Avatar initial={(user.full_name || user.email).charAt(0).toUpperCase()} />
+          <div className="min-w-0">
+            <div className="truncate text-sm font-semibold text-foreground">
+              {user.full_name || user.email.split('@')[0]}
+            </div>
+            <div className="truncate text-[12px] text-muted-foreground">{user.email}</div>
+          </div>
+        </div>
+      </TableCell>
+      <TableCell className="hidden sm:table-cell text-sm text-muted-foreground">
+        {user.roles.length > 0 ? user.roles.join(', ') : '—'}
+      </TableCell>
+      <TableCell className="hidden sm:table-cell">
+        <StatusBadge user={user} />
+      </TableCell>
+      <TableCell className="hidden lg:table-cell text-sm text-muted-foreground">
+        {user.last_login_at ? new Date(user.last_login_at).toLocaleDateString() : '—'}
+      </TableCell>
+      <TableCell className="text-right">
+        <Button asChild variant="ghost" size="icon-sm">
+          <Link href={`/users/admin/${user.id}`}>
+            <Pencil />
+          </Link>
+        </Button>
+      </TableCell>
+    </TableRow>
+  );
+}

{simple_module_users-0.0.9 → simple_module_users-0.0.11}/users/endpoints/views.py

@@ -159,11 +159,13 @@ async def admin_index(
         order=clean_order,
     )
     roles = await service.list_roles()
+    aggregates = await service.count_user_states()
     return await inertia.render(
         _PAGE_ADMIN_INDEX,
         {
             "users": [u.model_dump(mode="json") for u in users],
             "pagination": {"page": page, "per_page": per_page, "total": total},
+            "aggregates": aggregates,
             "query": q or "",
             "roles": [r.model_dump(mode="json") for r in roles],
             "filters": {

{simple_module_users-0.0.9 → simple_module_users-0.0.11}/users/pages/AcceptInvite.tsx

@@ -1,15 +1,9 @@
 import { router, usePage } from '@inertiajs/react';
 import { Button } from '@simple-module-py/ui/components/ui/button';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@simple-module-py/ui/components/ui/card';
 import { Input } from '@simple-module-py/ui/components/ui/input';
 import { Label } from '@simple-module-py/ui/components/ui/label';
 import { AuthCardShell } from '@simple-module-py/ui/layouts/AuthCardShell';
+import { CheckCircle2 } from 'lucide-react';
 import { useState } from 'react';
 
 interface Props {
@@ -61,44 +55,56 @@ function AcceptInvite() {
 
   return (
     <AuthCardShell>
-      <Card className="w-full max-w-sm">
-        <CardHeader className="space-y-1">
-          <CardTitle className="text-2xl">Accept invitation</CardTitle>
-          <CardDescription>Set a password to activate your account</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <form onSubmit={handleSubmit} className="space-y-4">
-            <div className="space-y-2">
-              <Label htmlFor="password">Password</Label>
-              <Input
-                id="password"
-                type="password"
-                value={password}
-                onChange={(e) => setPassword(e.target.value)}
-                required
-                autoComplete="new-password"
-              />
-            </div>
-            <div className="space-y-2">
-              <Label htmlFor="confirm">Confirm password</Label>
-              <Input
-                id="confirm"
-                type="password"
-                value={confirm}
-                onChange={(e) => setConfirm(e.target.value)}
-                required
-                autoComplete="new-password"
-              />
-            </div>
+      <div className="flex items-start gap-3 rounded-xl border border-primary-200 bg-primary-50 p-3 text-sm text-primary-800">
+        <CheckCircle2 className="mt-0.5 h-4 w-4 shrink-0" aria-hidden="true" />
+        <div>
+          <p className="font-semibold">You've been invited</p>
+          <p className="mt-0.5">Pick a password and you'll be signed in.</p>
+        </div>
+      </div>
+      <h1 className="mt-5 mb-1.5 text-[22px] font-bold tracking-tight font-[var(--font-display)] text-foreground">
+        Set your password
+      </h1>
+      <form onSubmit={handleSubmit} className="space-y-3.5">
+        <div className="space-y-1.5">
+          <Label htmlFor="password" className="text-sm font-medium text-muted-foreground">
+            Password
+          </Label>
+          <Input
+            id="password"
+            type="password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            placeholder="8+ characters"
+            required
+            autoComplete="new-password"
+          />
+        </div>
+        <div className="space-y-1.5">
+          <Label htmlFor="confirm" className="text-sm font-medium text-muted-foreground">
+            Confirm password
+          </Label>
+          <Input
+            id="confirm"
+            type="password"
+            value={confirm}
+            onChange={(e) => setConfirm(e.target.value)}
+            required
+            autoComplete="new-password"
+          />
+        </div>
 
-            {error && <p className="text-sm text-destructive">{error}</p>}
+        {error && <p className="text-sm text-destructive">{error}</p>}
 
-            <Button type="submit" className="w-full" disabled={loading || !token}>
-              {loading ? 'Activating…' : 'Activate account'}
-            </Button>
-          </form>
-        </CardContent>
-      </Card>
+        <Button type="submit" size="lg" className="w-full" disabled={loading || !token}>
+          {loading ? 'Activating…' : 'Set password & sign in'}
+        </Button>
+      </form>
+      {token && (
+        <p className="mt-4 text-center font-mono text-[11px] text-muted-foreground">
+          token={token.slice(0, 16)}…
+        </p>
+      )}
     </AuthCardShell>
   );
 }

simple_module_users-0.0.11/users/pages/ForgotPassword.tsx

@@ -0,0 +1,86 @@
+import { Button } from '@simple-module-py/ui/components/ui/button';
+import { Input } from '@simple-module-py/ui/components/ui/input';
+import { Label } from '@simple-module-py/ui/components/ui/label';
+import { AuthCardShell } from '@simple-module-py/ui/layouts/AuthCardShell';
+import { CheckCircle2 } from 'lucide-react';
+import { useState } from 'react';
+
+function ForgotPassword() {
+  const [email, setEmail] = useState('');
+  const [submitted, setSubmitted] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    setLoading(true);
+    fetch('/api/users/auth/forgot-password', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ email }),
+    }).finally(() => {
+      // Anti-enumeration: always show the same confirmation regardless of
+      // whether the email exists (fastapi-users returns 202 either way).
+      setLoading(false);
+      setSubmitted(true);
+    });
+  };
+
+  if (submitted) {
+    return (
+      <AuthCardShell>
+        <div className="flex items-start gap-3 rounded-xl border border-primary-200 bg-primary-50 p-3 text-sm text-primary-800">
+          <CheckCircle2 className="mt-0.5 h-4 w-4 shrink-0" aria-hidden="true" />
+          <div>
+            <p className="font-semibold">Check your inbox</p>
+            <p className="mt-0.5">
+              If <strong>{email}</strong> has an account, a reset link is on its way. The console
+              mailer logs it to stdout.
+            </p>
+          </div>
+        </div>
+        <a
+          href="/users/login"
+          className="mt-4 block text-center text-sm font-semibold text-primary-700 hover:text-primary-800"
+        >
+          Back to log in
+        </a>
+      </AuthCardShell>
+    );
+  }
+
+  return (
+    <AuthCardShell>
+      <h1 className="mb-1.5 text-[22px] font-bold tracking-tight font-[var(--font-display)] text-foreground">
+        Forgot password
+      </h1>
+      <p className="mb-5 text-sm text-muted-foreground">We'll email you a one-time reset link.</p>
+      <form onSubmit={handleSubmit} className="space-y-3.5">
+        <div className="space-y-1.5">
+          <Label htmlFor="email" className="text-sm font-medium text-muted-foreground">
+            Email
+          </Label>
+          <Input
+            id="email"
+            type="email"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            placeholder="you@example.com"
+            required
+            autoComplete="email"
+          />
+        </div>
+        <Button type="submit" size="lg" className="w-full" disabled={loading}>
+          {loading ? 'Sending…' : 'Send reset link'}
+        </Button>
+      </form>
+      <p className="mt-5 text-center text-xs text-muted-foreground">
+        Remembered?{' '}
+        <a href="/users/login" className="font-semibold text-primary-700 hover:text-primary-800">
+          Log in
+        </a>
+      </p>
+    </AuthCardShell>
+  );
+}
+
+export default ForgotPassword;

simple_module_users-0.0.11/users/pages/Login.tsx

@@ -0,0 +1,188 @@
+import { router, usePage } from '@inertiajs/react';
+import { Button } from '@simple-module-py/ui/components/ui/button';
+import { Input } from '@simple-module-py/ui/components/ui/input';
+import { Label } from '@simple-module-py/ui/components/ui/label';
+import { AuthCardShell } from '@simple-module-py/ui/layouts/AuthCardShell';
+import { AlertTriangle } from 'lucide-react';
+import { useState } from 'react';
+
+interface DevAccount {
+  label: string;
+  email: string;
+  password: string;
+}
+
+interface Props {
+  allow_signup: boolean;
+  dev_accounts: DevAccount[];
+  login_redirect_url: string;
+}
+
+function Login() {
+  const { allow_signup, dev_accounts, login_redirect_url } = usePage<{ props: Props }>()
+    .props as unknown as Props;
+
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const [needsVerification, setNeedsVerification] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const nextUrl =
+    typeof window !== 'undefined'
+      ? new URLSearchParams(window.location.search).get('next') || login_redirect_url
+      : login_redirect_url;
+
+  const submitLogin = (username: string, pwd: string) => {
+    setError(null);
+    setNeedsVerification(false);
+    setLoading(true);
+    const body = new URLSearchParams({ username, password: pwd });
+    fetch('/api/users/auth/login', {
+      method: 'POST',
+      body,
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    })
+      .then(async (res) => {
+        if (res.status === 204) {
+          router.visit(nextUrl);
+        } else if (res.status === 429) {
+          setError('Too many attempts. Please try again in a few minutes.');
+        } else {
+          const data = await res.json().catch(() => ({}));
+          const detail = typeof data?.detail === 'string' ? data.detail : '';
+          if (detail === 'LOGIN_USER_NOT_VERIFIED') {
+            setNeedsVerification(true);
+          } else {
+            setError('Invalid email or password.');
+          }
+        }
+      })
+      .catch(() => setError('An error occurred. Please try again.'))
+      .finally(() => setLoading(false));
+  };
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    submitLogin(email, password);
+  };
+
+  const handleResendVerification = () => {
+    fetch('/api/users/auth/request-verify-token', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ email }),
+    }).then(() => {
+      setError('Verification email resent. Please check your inbox.');
+      setNeedsVerification(false);
+    });
+  };
+
+  return (
+    <AuthCardShell>
+      <h1 className="mb-1.5 text-[22px] font-bold tracking-tight font-[var(--font-display)] text-foreground">
+        Welcome back
+      </h1>
+      <p className="mb-5 text-sm text-muted-foreground">Log in to your workspace.</p>
+      <form onSubmit={handleSubmit} className="space-y-3.5">
+        <div className="space-y-1.5">
+          <Label htmlFor="email" className="text-sm font-medium text-muted-foreground">
+            Email
+          </Label>
+          <Input
+            id="email"
+            type="email"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            placeholder="you@example.com"
+            required
+            autoComplete="email"
+          />
+        </div>
+        <div className="space-y-1.5">
+          <div className="flex items-baseline justify-between">
+            <Label htmlFor="password" className="text-sm font-medium text-muted-foreground">
+              Password
+            </Label>
+            <a
+              href="/users/forgot-password"
+              className="text-xs font-semibold text-primary-700 hover:text-primary-800"
+            >
+              Forgot?
+            </a>
+          </div>
+          <Input
+            id="password"
+            type="password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            required
+            autoComplete="current-password"
+          />
+        </div>
+
+        {error && <p className="text-sm text-destructive">{error}</p>}
+
+        {needsVerification && (
+          <div className="flex items-start gap-2 rounded-xl border border-amber-200 bg-amber-50 p-3 text-sm text-amber-800">
+            <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" aria-hidden="true" />
+            <div>
+              <p className="font-semibold">Verify your email</p>
+              <button
+                type="button"
+                onClick={handleResendVerification}
+                className="mt-0.5 underline hover:no-underline"
+              >
+                Resend verification email
+              </button>
+            </div>
+          </div>
+        )}
+
+        <Button type="submit" size="lg" className="w-full" disabled={loading}>
+          {loading ? 'Signing in…' : 'Log in'}
+        </Button>
+      </form>
+
+      {allow_signup && (
+        <p className="mt-5 text-center text-xs text-muted-foreground">
+          Don't have an account?{' '}
+          <a
+            href="/users/register"
+            className="font-semibold text-primary-700 hover:text-primary-800"
+          >
+            Sign up
+          </a>
+        </p>
+      )}
+
+      {dev_accounts && dev_accounts.length > 0 && (
+        <div className="mt-5 border-t border-border pt-4">
+          <p className="mb-2 text-center font-mono text-[11px] text-muted-foreground">
+            Dev quick-login
+          </p>
+          <div className="flex flex-wrap justify-center gap-2">
+            {dev_accounts.map((acct) => (
+              <Button
+                key={acct.email}
+                type="button"
+                variant="outline"
+                size="sm"
+                disabled={loading}
+                onClick={() => {
+                  setEmail(acct.email);
+                  setPassword(acct.password);
+                  submitLogin(acct.email, acct.password);
+                }}
+              >
+                {acct.label}
+              </Button>
+            ))}
+          </div>
+        </div>
+      )}
+    </AuthCardShell>
+  );
+}
+
+export default Login;