@proofkit/cli 1.1.8 → 1.2.0-beta.0

package/template/extras/fmaddon-auth/app/auth/reset-password/actions.ts

@@ -1,20 +1,23 @@
 "use server";
 
-import { actionClient } from "@/server/safe-action";
-import { resetPasswordSchema } from "./schema";
+import { verifyPasswordStrength } from "@/server/auth/utils/password";
 import {
   deletePasswordResetSessionTokenCookie,
   invalidateUserPasswordResetSessions,
+  validatePasswordResetSessionRequest,
 } from "@/server/auth/utils/password-reset";
-import { validatePasswordResetSessionRequest } from "@/server/auth/utils/password-reset";
-import { createSession } from "@/server/auth/utils/session";
-import { generateSessionToken } from "@/server/auth/utils/session";
-import { setSessionTokenCookie } from "@/server/auth/utils/session";
-import { verifyPasswordStrength } from "@/server/auth/utils/password";
-import { invalidateUserSessions } from "@/server/auth/utils/session";
+import {
+  createSession,
+  generateSessionToken,
+  invalidateUserSessions,
+  setSessionTokenCookie,
+} from "@/server/auth/utils/session";
 import { updateUserPassword } from "@/server/auth/utils/user";
+import { actionClient } from "@/server/safe-action";
 import { redirect } from "next/navigation";
 
+import { resetPasswordSchema } from "./schema";
+
 export const resetPasswordAction = actionClient
   .schema(resetPasswordSchema)
   .action(async ({ parsedInput }) => {

package/template/extras/fmaddon-auth/app/auth/reset-password/page.tsx

@@ -1,9 +1,10 @@
-import { Alert, Anchor, Container, Text, Title } from "@mantine/core";
-import ResetPasswordForm from "./reset-password-form";
 import { env } from "@/config/env";
 import { validatePasswordResetSessionRequest } from "@/server/auth/utils/password-reset";
+import { Alert, Anchor, Container, Text, Title } from "@mantine/core";
 import { redirect } from "next/navigation";
 
+import ResetPasswordForm from "./reset-password-form";
+
 export default async function Page() {
   const { session, user } = await validatePasswordResetSessionRequest();
   if (session === null) {

package/template/extras/fmaddon-auth/app/auth/reset-password/reset-password-form.tsx

@@ -1,15 +1,16 @@
 "use client";
 
-import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
-  TextInput,
   Button,
-  Stack,
   Paper,
-  Text,
   PasswordInput,
+  Stack,
+  Text,
+  TextInput,
 } from "@mantine/core";
+import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
+
 import { resetPasswordAction } from "./actions";
 import { resetPasswordSchema } from "./schema";
 

package/template/extras/fmaddon-auth/app/auth/reset-password/verify-email/actions.ts

@@ -1,14 +1,15 @@
 "use server";
 
-import { actionClient } from "@/server/safe-action";
-import { verifyEmailSchema } from "./schema";
 import {
   setPasswordResetSessionAsEmailVerified,
   validatePasswordResetSessionRequest,
 } from "@/server/auth/utils/password-reset";
 import { setUserAsEmailVerifiedIfEmailMatches } from "@/server/auth/utils/user";
+import { actionClient } from "@/server/safe-action";
 import { redirect } from "next/navigation";
 
+import { verifyEmailSchema } from "./schema";
+
 export const verifyEmailAction = actionClient
   .schema(verifyEmailSchema)
   .action(async ({ parsedInput }) => {

package/template/extras/fmaddon-auth/app/auth/reset-password/verify-email/page.tsx

@@ -1,9 +1,10 @@
-import { Alert, Anchor, Container, Text, Title } from "@mantine/core";
-import VerifyEmailForm from "./verify-email-form";
 import { env } from "@/config/env";
 import { validatePasswordResetSessionRequest } from "@/server/auth/utils/password-reset";
+import { Alert, Anchor, Container, Text, Title } from "@mantine/core";
 import { redirect } from "next/navigation";
 
+import VerifyEmailForm from "./verify-email-form";
+
 export default async function Page() {
   const { session } = await validatePasswordResetSessionRequest();
   if (session === null) {

package/template/extras/fmaddon-auth/app/auth/reset-password/verify-email/verify-email-form.tsx

@@ -1,8 +1,9 @@
 "use client";
 
-import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Stack, Paper, Text, PinInput } from "@mantine/core";
+import { Button, Paper, PinInput, Stack, Text } from "@mantine/core";
+import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
+
 import { verifyEmailAction } from "./actions";
 import { verifyEmailSchema } from "./schema";
 

package/template/extras/fmaddon-auth/app/auth/signup/actions.ts

@@ -1,20 +1,21 @@
 "use server";
 
-import { actionClient } from "@/server/safe-action";
-import { signupSchema } from "./schema";
-import { checkEmailAvailability, createUser } from "@/server/auth/utils/user";
+import {
+  createEmailVerificationRequest,
+  sendVerificationEmail,
+  setEmailVerificationRequestCookie,
+} from "@/server/auth/utils/email-verification";
 import { verifyPasswordStrength } from "@/server/auth/utils/password";
 import {
   createSession,
+  generateSessionToken,
   setSessionTokenCookie,
 } from "@/server/auth/utils/session";
-import { generateSessionToken } from "@/server/auth/utils/session";
+import { checkEmailAvailability, createUser } from "@/server/auth/utils/user";
+import { actionClient } from "@/server/safe-action";
 import { redirect } from "next/navigation";
-import {
-  createEmailVerificationRequest,
-  sendVerificationEmail,
-  setEmailVerificationRequestCookie,
-} from "@/server/auth/utils/email-verification";
+
+import { signupSchema } from "./schema";
 
 export const signupAction = actionClient
   .schema(signupSchema)

package/template/extras/fmaddon-auth/app/auth/signup/page.tsx

@@ -1,6 +1,7 @@
 import { getCurrentSession } from "@/server/auth/utils/session";
 import { Anchor, Container, Text, Title } from "@mantine/core";
 import { redirect } from "next/navigation";
+
 import SignupForm from "./signup-form";
 
 export default async function Page() {

package/template/extras/fmaddon-auth/app/auth/signup/signup-form.tsx

@@ -1,19 +1,20 @@
 "use client";
 
-import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
-import { signupAction } from "./actions";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { signupSchema } from "./schema";
 import {
   Anchor,
-  PasswordInput,
-  TextInput,
   Button,
   Group,
-  Stack,
   Paper,
+  PasswordInput,
+  Stack,
   Text,
+  TextInput,
 } from "@mantine/core";
+import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
+
+import { signupAction } from "./actions";
+import { signupSchema } from "./schema";
 
 export default function SignupForm() {
   const { form, handleSubmitWithAction, action } = useHookFormAction(

package/template/extras/fmaddon-auth/app/auth/verify-email/actions.ts

@@ -1,22 +1,21 @@
 "use server";
 
-import { getCurrentSession } from "@/server/auth/utils/session";
-import { actionClient } from "@/server/safe-action";
-import { emailVerificationSchema } from "./schema";
 import {
+  createEmailVerificationRequest,
   deleteEmailVerificationRequestCookie,
   deleteUserEmailVerificationRequest,
+  getUserEmailVerificationRequestFromRequest,
   sendVerificationEmail,
   setEmailVerificationRequestCookie,
 } from "@/server/auth/utils/email-verification";
-import {
-  createEmailVerificationRequest,
-  getUserEmailVerificationRequestFromRequest,
-} from "@/server/auth/utils/email-verification";
 import { invalidateUserPasswordResetSessions } from "@/server/auth/utils/password-reset";
+import { getRedirectCookie } from "@/server/auth/utils/redirect";
+import { getCurrentSession } from "@/server/auth/utils/session";
 import { updateUserEmailAndSetEmailAsVerified } from "@/server/auth/utils/user";
+import { actionClient } from "@/server/safe-action";
 import { redirect } from "next/navigation";
-import { getRedirectCookie } from "@/server/auth/utils/redirect";
+
+import { emailVerificationSchema } from "./schema";
 
 export const verifyEmailAction = actionClient
   .schema(emailVerificationSchema)

package/template/extras/fmaddon-auth/app/auth/verify-email/email-verification-form.tsx

@@ -1,10 +1,11 @@
 "use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Button, Paper, PinInput, Stack, Text } from "@mantine/core";
 import { useHookFormAction } from "@next-safe-action/adapter-react-hook-form/hooks";
-import { emailVerificationSchema } from "./schema";
+
 import { verifyEmailAction } from "./actions";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Paper, PinInput, Text } from "@mantine/core";
-import { Stack } from "@mantine/core";
+import { emailVerificationSchema } from "./schema";
 
 export default function LoginForm() {
   const { form, handleSubmitWithAction, action } = useHookFormAction(

package/template/extras/fmaddon-auth/app/auth/verify-email/page.tsx

@@ -1,10 +1,11 @@
+import { getUserEmailVerificationRequestFromRequest } from "@/server/auth/utils/email-verification";
+import { getRedirectCookie } from "@/server/auth/utils/redirect";
 import { getCurrentSession } from "@/server/auth/utils/session";
 import { Anchor, Container, Text, Title } from "@mantine/core";
 import { redirect } from "next/navigation";
+
 import EmailVerificationForm from "./email-verification-form";
 import ResendButton from "./resend-button";
-import { getUserEmailVerificationRequestFromRequest } from "@/server/auth/utils/email-verification";
-import { getRedirectCookie } from "@/server/auth/utils/redirect";
 
 export default async function Page() {
   const { user } = await getCurrentSession();
@@ -15,7 +16,8 @@ export default async function Page() {
 
   // TODO: Ideally we'd sent a new verification email automatically if the previous one is expired,
   // but we can't set cookies inside server components.
-  const verificationRequest = await getUserEmailVerificationRequestFromRequest();
+  const verificationRequest =
+    await getUserEmailVerificationRequestFromRequest();
   if (verificationRequest === null && user.emailVerified) {
     const redirectTo = await getRedirectCookie();
     return redirect(redirectTo);

package/template/extras/fmaddon-auth/app/auth/verify-email/resend-button.tsx

@@ -1,15 +1,17 @@
 "use client";
+
 import { Alert, Anchor, Button, Group, Stack, Text } from "@mantine/core";
-import { resendEmailVerificationAction } from "./actions";
 import { useAction } from "next-safe-action/hooks";
 
+import { resendEmailVerificationAction } from "./actions";
+
 export default function ResendButton() {
   const action = useAction(resendEmailVerificationAction);
   return (
     <Stack>
       <Group gap={4} justify="center" mt={5}>
         <Text c="dimmed" size="sm">
-        {"Didn't receive the email?"}
+          {"Didn't receive the email?"}
         </Text>
         <Button
           size="compact-sm"

package/template/extras/fmaddon-auth/components/auth/actions.ts

@@ -1,6 +1,9 @@
 "use server";
 
-import { getCurrentSession, invalidateSession } from "@/server/auth/utils/session";
+import {
+  getCurrentSession,
+  invalidateSession,
+} from "@/server/auth/utils/session";
 import { redirect } from "next/navigation";
 
 export async function currentSessionAction() {

package/template/extras/fmaddon-auth/components/auth/protect.tsx

@@ -1,4 +1,5 @@
 import { getCurrentSession } from "@/server/auth/utils/session";
+
 import AuthRedirect from "./redirect";
 
 /**
@@ -14,4 +15,4 @@ export default async function Protect({
   if (!session) return <AuthRedirect path="/auth/login" />;
   if (!user.emailVerified) return <AuthRedirect path="/auth/verify-email" />;
   return <>{children}</>;
-}
+}

package/template/extras/fmaddon-auth/components/auth/redirect.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { redirect } from "next/navigation";
 import { Center, Loader } from "@mantine/core";
-import { useEffect } from "react";
 import Cookies from "js-cookie";
+import { redirect } from "next/navigation";
+import { useEffect } from "react";
 
 /**
  * A client-side component that redirects to the given path, but saves the current path in the redirectTo cookie.

package/template/extras/fmaddon-auth/components/auth/use-user.ts

@@ -1,7 +1,8 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { currentSessionAction, logoutAction } from "./actions";
 import { Session } from "@/server/auth/utils/session";
 import { User } from "@/server/auth/utils/user";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+import { currentSessionAction, logoutAction } from "./actions";
 
 type LogoutAction = () => Promise<void>;
 type UseUserResult =

package/template/extras/fmaddon-auth/components/auth/user-menu.tsx

@@ -1,9 +1,10 @@
 "use client";
 
 import { Button, Menu, px, Skeleton } from "@mantine/core";
-import { useUser } from "./use-user";
-import Link from "next/link";
 import { IconChevronDown, IconLogout, IconUser } from "@tabler/icons-react";
+import Link from "next/link";
+
+import { useUser } from "./use-user";
 
 export default function UserMenu() {
   const { state, session, user, logout } = useUser();

package/template/extras/fmaddon-auth/middleware.ts

@@ -1,5 +1,4 @@
 import { NextResponse } from "next/server";
-
 import type { NextRequest } from "next/server";
 
 export async function middleware(request: NextRequest): Promise<NextResponse> {

package/template/extras/fmaddon-auth/server/auth/utils/email-verification.ts

@@ -1,10 +1,11 @@
-import { generateRandomOTP } from "./index";
 import { encodeBase32 } from "@oslojs/encoding";
 import { cookies } from "next/headers";
-import { getCurrentSession } from "./session";
+
 import { emailVerificationLayout } from "../db/client";
 import { TemailVerification } from "../db/emailVerification";
 import { sendEmail } from "../email";
+import { generateRandomOTP } from "./index";
+import { getCurrentSession } from "./session";
 
 /**
  * An Email Verification Request is a record in the email verification table that is created when a user requests to change their email address. It's like a temporary session which can expire if the user doesn't verify the new email address within a certain amount of time.
@@ -18,7 +19,7 @@ import { sendEmail } from "../email";
  */
 export async function getUserEmailVerificationRequest(
   userId: string,
-  id: string,
+  id: string
 ): Promise<TemailVerification | null> {
   const result = await emailVerificationLayout.maybeFindFirst({
     query: { id_user: `==${userId}`, id: `==${id}` },
@@ -34,7 +35,7 @@ export async function getUserEmailVerificationRequest(
  */
 export async function createEmailVerificationRequest(
   id_user: string,
-  email: string,
+  email: string
 ): Promise<TemailVerification> {
   deleteUserEmailVerificationRequest(id_user);
   const idBytes = new Uint8Array(20);
@@ -64,7 +65,7 @@ export async function createEmailVerificationRequest(
  * @param id_user - The ID of the user.
  */
 export async function deleteUserEmailVerificationRequest(
-  id_user: string,
+  id_user: string
 ): Promise<void> {
   const result = await emailVerificationLayout.maybeFindFirst({
     query: { id_user: `==${id_user}` },
@@ -81,7 +82,7 @@ export async function deleteUserEmailVerificationRequest(
  */
 export async function sendVerificationEmail(
   email: string,
-  code: string,
+  code: string
 ): Promise<void> {
   await sendEmail({ to: email, code, type: "verification" });
 }
@@ -91,7 +92,7 @@ export async function sendVerificationEmail(
  * @param request - The email verification request.
  */
 export async function setEmailVerificationRequestCookie(
-  request: TemailVerification,
+  request: TemailVerification
 ): Promise<void> {
   (await cookies()).set("email_verification", request.id, {
     httpOnly: true,

package/template/extras/fmaddon-auth/server/auth/utils/encryption.ts

@@ -1,6 +1,6 @@
-import { decodeBase64 } from "@oslojs/encoding";
 import { createCipheriv, createDecipheriv } from "crypto";
 import { DynamicBuffer } from "@oslojs/binary";
+import { decodeBase64 } from "@oslojs/encoding";
 
 const key = decodeBase64(process.env.ENCRYPTION_KEY ?? "");
 
@@ -40,7 +40,7 @@ export function decrypt(encrypted: Uint8Array): Uint8Array {
   decipher.setAuthTag(encrypted.slice(encrypted.byteLength - 16));
   const decrypted = new DynamicBuffer(0);
   decrypted.write(
-    decipher.update(encrypted.slice(16, encrypted.byteLength - 16)),
+    decipher.update(encrypted.slice(16, encrypted.byteLength - 16))
   );
   decrypted.write(decipher.final());
   return decrypted.bytes();

package/template/extras/fmaddon-auth/server/auth/utils/password-reset.ts

@@ -1,12 +1,13 @@
-import { encodeHexLowerCase } from "@oslojs/encoding";
-import { generateRandomOTP } from "./index";
 import { sha256 } from "@oslojs/crypto/sha2";
+import { encodeHexLowerCase } from "@oslojs/encoding";
 import { cookies } from "next/headers";
+
 import { passwordResetLayout } from "../db/client";
 import { TpasswordReset } from "../db/passwordReset";
-
-import type { User } from "./user";
 import { sendEmail } from "../email";
+import { generateRandomOTP } from "./index";
+import type { User } from "./user";
+
 type PasswordResetSession = Omit<
   TpasswordReset,
   | "proofkit_auth_users::email"

package/template/extras/fmaddon-auth/server/auth/utils/redirect.ts

@@ -5,4 +5,4 @@ export async function getRedirectCookie() {
   const redirectTo = cookieStore.get("redirectTo")?.value;
   cookieStore.delete("redirectTo");
   return redirectTo ?? "/";
-}
+}

package/template/extras/fmaddon-auth/server/auth/utils/session.ts

@@ -1,14 +1,14 @@
+import { sha256 } from "@oslojs/crypto/sha2";
 import {
   encodeBase32LowerCaseNoPadding,
   encodeHexLowerCase,
 } from "@oslojs/encoding";
-import { sha256 } from "@oslojs/crypto/sha2";
 import { cookies } from "next/headers";
 import { cache } from "react";
-import type { User } from "./user";
 
 import { sessionsLayout } from "../db/client";
 import { Tsessions as _Session } from "../db/sessions";
+import type { User } from "./user";
 
 /**
  * Generate a random session token with sufficient entropy for a session ID.
@@ -29,7 +29,7 @@ export function generateSessionToken(): string {
  */
 export async function createSession(
   token: string,
-  userId: string,
+  userId: string
 ): Promise<Session> {
   const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
   const session: Session = {
@@ -70,7 +70,7 @@ export async function invalidateSession(sessionId: string): Promise<void> {
  * @returns The session, or null if it doesn't exist.
  */
 export async function validateSessionToken(
-  token: string,
+  token: string
 ): Promise<SessionValidationResult> {
   const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
 
@@ -133,7 +133,7 @@ export const getCurrentSession = cache(
     }
     const result = await validateSessionToken(token);
     return result;
-  },
+  }
 );
 
 /**
@@ -156,7 +156,7 @@ export async function invalidateUserSessions(userId: string): Promise<void> {
  */
 export async function setSessionTokenCookie(
   token: string,
-  expiresAt: Date,
+  expiresAt: Date
 ): Promise<void> {
   (await cookies()).set("session", token, {
     httpOnly: true,
@@ -167,7 +167,6 @@ export async function setSessionTokenCookie(
   });
 }
 
-
 /**
  * Delete the session cookie.
  */

package/template/extras/fmaddon-auth/server/auth/utils/user.ts

@@ -1,5 +1,6 @@
 import { usersLayout } from "../db/client";
 import { Tusers as _User } from "../db/users";
+import { hashPassword, verifyPasswordHash } from "./password";
 
 export type User = Partial<
   Omit<_User, "id" | "password_hash" | "recovery_code" | "emailVerified">
@@ -9,8 +10,6 @@ export type User = Partial<
   emailVerified: boolean;
 };
 
-import { hashPassword, verifyPasswordHash } from "./password";
-
 /** An internal helper function to fetch a user from the database. */
 async function fetchUser(userId: string) {
   const { data } = await usersLayout.findOne({

package/template/extras/src/app/next-auth/signin/page.tsx

@@ -75,7 +75,8 @@ export default async function SignInPage(props: {
       )}
 
       <Text size="sm" c="dimmed">
-        {"Don't have an account? "}<Link href="/auth/signup">Sign up</Link>
+        {"Don't have an account? "}
+        <Link href="/auth/signup">Sign up</Link>
       </Text>
     </Stack>
   );

package/template/fm-addon/ProofKitAuth/info.json

@@ -1,11 +1,8 @@
 {
-	"GUID" : "77BDB4D6-5CF8-4740-AB5F-19837A831C21",
-	"Clients" :
-		[
-			"ProofKit"
-		],
-	"Attribution" : "Proof+Geist",
-	"URL" : "https://proofkit.dev/auth/fm-addon",
-	"Icon_Color" : "#7F7F7F",
-	"Version" : "1.0"
+  "GUID": "77BDB4D6-5CF8-4740-AB5F-19837A831C21",
+  "Clients": ["ProofKit"],
+  "Attribution": "Proof+Geist",
+  "URL": "https://proofkit.dev/auth/fm-addon",
+  "Icon_Color": "#7F7F7F",
+  "Version": "1.0"
 }

package/template/fm-addon/ProofKitAuth/info_de.json

@@ -1,18 +1,11 @@
 {
-	"Title" : "FileMaker Add-on Auth",
+  "Title": "FileMaker Add-on Auth",
 
-	"Description" : "*** DESCRIPTION MISSING *** - DNL",
+  "Description": "*** DESCRIPTION MISSING *** - DNL",
 
-	"Category" : "Web",
+  "Category": "Web",
 
-	"Features" :
-		[
-			
-		],
+  "Features": [],
 
-	"Optimized" :
-		[
-			"Desktop", "Tablet", "Mobile"
-
-		]
+  "Optimized": ["Desktop", "Tablet", "Mobile"]
 }

package/template/fm-addon/ProofKitAuth/info_es.json

@@ -1,18 +1,11 @@
 {
-	"Title" : "FileMaker Add-on Auth",
+  "Title": "FileMaker Add-on Auth",
 
-	"Description" : "*** DESCRIPTION MISSING *** - DNL",
+  "Description": "*** DESCRIPTION MISSING *** - DNL",
 
-	"Category" : "Web",
+  "Category": "Web",
 
-	"Features" :
-		[
-			
-			],
+  "Features": [],
 
-	"Optimized" :
-		[
-			"Desktop", "Tablet", "Mobile"
-
-		]
+  "Optimized": ["Desktop", "Tablet", "Mobile"]
 }

package/template/fm-addon/ProofKitAuth/info_fr.json

@@ -1,18 +1,11 @@
 {
-	"Title" : "FileMaker Add-on Auth",
+  "Title": "FileMaker Add-on Auth",
 
-	"Description" : "*** DESCRIPTION MISSING *** - DNL",
+  "Description": "*** DESCRIPTION MISSING *** - DNL",
 
-	"Category" : "Web",
+  "Category": "Web",
 
-	"Features" :
-		[
-			
-		],
+  "Features": [],
 
-	"Optimized" :
-		[
-			"Desktop", "Tablet", "Mobile"
-
-		]
+  "Optimized": ["Desktop", "Tablet", "Mobile"]
 }

package/template/fm-addon/ProofKitAuth/info_it.json

@@ -1,18 +1,11 @@
 {
-	"Title" : "FileMaker Add-on Auth",
+  "Title": "FileMaker Add-on Auth",
 
-	"Description" : "*** DESCRIPTION MISSING *** - DNL",
+  "Description": "*** DESCRIPTION MISSING *** - DNL",
 
-	"Category" : "Web",
+  "Category": "Web",
 
-	"Features" :
-		[
-			
-		],
+  "Features": [],
 
-	"Optimized" :
-		[
-			"Desktop", "Tablet", "Mobile"
-
-		]
+  "Optimized": ["Desktop", "Tablet", "Mobile"]
 }