@arch-cadre/auth-google 1.0.6 → 1.0.8

package/dist/actions/auth.cjs

@@ -8,7 +8,7 @@ exports.loginWithGoogle = loginWithGoogle;
 var _arctic = require("arctic");
 var _headers = require("next/headers");
 var _navigation = require("next/navigation");
-var _settings = require("./settings.cjs");
+var _settings = require("./settings.js");
 async function loginWithGoogle() {
   const config = await (0, _settings.getGoogleConfig)();
   if (!config.clientId || !config.clientSecret) {

package/dist/actions/auth.mjs

@@ -2,7 +2,7 @@
 import { Google, generateCodeVerifier, generateState } from "arctic";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
-import { getGoogleConfig } from "./settings.mjs";
+import { getGoogleConfig } from "./settings.js";
 export async function loginWithGoogle() {
   const config = await getGoogleConfig();
   if (!config.clientId || !config.clientSecret) {

package/dist/index.cjs

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 var _manifest = _interopRequireDefault(require("../manifest.json"));
-var _navigation = require("./navigation.cjs");
-var _routes = require("./routes.cjs");
-var _googleButton = require("./ui/google-button.cjs");
+var _navigation = require("./navigation.js");
+var _routes = require("./routes.js");
+var _googleButton = require("./ui/google-button.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const googleAuthModule = {
   manifest: _manifest.default,

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import manifest from "../manifest.json";
-import { navigation } from "./navigation.mjs";
-import { apiRoutes, privateRoutes } from "./routes.mjs";
-import { GoogleLoginButton } from "./ui/google-button.mjs";
+import { navigation } from "./navigation.js";
+import { apiRoutes, privateRoutes } from "./routes.js";
+import { GoogleLoginButton } from "./ui/google-button.js";
 const googleAuthModule = {
   manifest,
   routes: {

package/dist/routes.cjs

@@ -9,9 +9,9 @@ var _server = require("@arch-cadre/core/server");
 var _arctic = require("arctic");
 var _dynamic = _interopRequireDefault(require("next/dynamic"));
 var _headers = require("next/headers");
-var _settings = require("./actions/settings.cjs");
+var _settings = require("./actions/settings.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const GoogleAuthSettingsPage = (0, _dynamic.default)(() => Promise.resolve().then(() => require("./ui/settings-page.cjs")));
+const GoogleAuthSettingsPage = (0, _dynamic.default)(() => Promise.resolve().then(() => require("./ui/settings-page.js")));
 async function getGoogleClient() {
   const config = await (0, _settings.getGoogleConfig)();
   return new _arctic.Google(config.clientId, config.clientSecret, config.redirectUri);

package/dist/routes.mjs

@@ -10,8 +10,8 @@ import {
 import { decodeIdToken, Google } from "arctic";
 import dynamic from "next/dynamic";
 import { cookies } from "next/headers";
-import { getGoogleConfig } from "./actions/settings.mjs";
-const GoogleAuthSettingsPage = dynamic(() => import("./ui/settings-page.mjs"));
+import { getGoogleConfig } from "./actions/settings.js";
+const GoogleAuthSettingsPage = dynamic(() => import("./ui/settings-page.js"));
 async function getGoogleClient() {
   const config = await getGoogleConfig();
   return new Google(config.clientId, config.clientSecret, config.redirectUri);

package/dist/ui/google-button.cjs

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GoogleLoginButton = GoogleLoginButton;
-var _client = require("@arch-cadre/intl/client");
+var _intl = require("@arch-cadre/intl");
 var _ui = require("@arch-cadre/ui");
 var React = _interopRequireWildcard(require("react"));
-var _auth = require("../actions/auth.cjs");
+var _auth = require("../actions/auth.js");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function GoogleLoginButton() {
   const {
     t
-  } = (0, _client.useTranslation)();
+  } = (0, _intl.useTranslation)();
   return /* @__PURE__ */React.createElement(_ui.Button, {
     type: "button",
     variant: "outline",

package/dist/ui/google-button.mjs

@@ -1,8 +1,8 @@
 "use client";
-import { useTranslation } from "@arch-cadre/intl/client";
+import { useTranslation } from "@arch-cadre/intl";
 import { Button } from "@arch-cadre/ui";
 import * as React from "react";
-import { loginWithGoogle } from "../actions/auth.mjs";
+import { loginWithGoogle } from "../actions/auth.js";
 export function GoogleLoginButton() {
   const { t } = useTranslation();
   return /* @__PURE__ */ React.createElement(

package/dist/ui/settings-page.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 module.exports = GoogleAuthSettingsPage;
-var _client = require("@arch-cadre/intl/client");
+var _intl = require("@arch-cadre/intl");
 var _button = require("@arch-cadre/ui/components/button");
 var _card = require("@arch-cadre/ui/components/card");
 var _input = require("@arch-cadre/ui/components/input");
@@ -13,13 +13,13 @@ var _label = require("@arch-cadre/ui/components/label");
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _sonner = require("sonner");
-var _settings = require("../actions/settings.cjs");
+var _settings = require("../actions/settings.js");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function GoogleAuthSettingsPage() {
   const {
     t
-  } = (0, _client.useTranslation)();
+  } = (0, _intl.useTranslation)();
   const [config, setConfig] = (0, _react.useState)({
     clientId: "",
     clientSecret: "",

package/dist/ui/settings-page.mjs

@@ -1,5 +1,5 @@
 "use client";
-import { useTranslation } from "@arch-cadre/intl/client";
+import { useTranslation } from "@arch-cadre/intl";
 import { Button } from "@arch-cadre/ui/components/button";
 import {
   Card,
@@ -16,7 +16,7 @@ import { toast } from "sonner";
 import {
   getGoogleConfig,
   updateGoogleConfig
-} from "../actions/settings.mjs";
+} from "../actions/settings.js";
 export default function GoogleAuthSettingsPage() {
   const { t } = useTranslation();
   const [config, setConfig] = useState({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arch-cadre/auth-google",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Google Auth module for Kryo framework",
   "type": "module",
   "exports": {
@@ -13,6 +13,7 @@
   },
   "files": [
     "dist",
+    "src",
     "locales",
     "manifest.json"
   ],
@@ -25,9 +26,9 @@
     "build": "unbuild"
   },
   "dependencies": {
-    "@arch-cadre/modules": "^0.0.20",
+    "@arch-cadre/modules": "^0.0.78",
     "@hookform/resolvers": "^3.10.0",
-    "@arch-cadre/ui": "^0.0.20",
+    "@arch-cadre/ui": "^0.0.52",
     "arctic": "^3.7.0",
     "lucide-react": "^0.475.0",
     "react-hook-form": "^7.54.2",
@@ -35,8 +36,8 @@
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@arch-cadre/core": "^0.0.20",
-    "@arch-cadre/intl": "^0.0.20",
+    "@arch-cadre/core": "^0.0.52",
+    "@arch-cadre/intl": "^0.0.52",
     "@types/react": "^19",
     "next": "16.1.1",
     "react": "^19.0.0",
@@ -44,9 +45,9 @@
     "unbuild": "^3.6.1"
   },
   "peerDependencies": {
-    "@arch-cadre/core": "^0.0.20",
-    "@arch-cadre/ui": "^0.0.20",
-    "next": ">=13.0.0",
+    "@arch-cadre/core": "^0.0.52",
+    "@arch-cadre/ui": "^0.0.52",
+    "next": ">=15.0.0",
     "react": "^19.0.0"
   },
   "main": "./dist/index.mjs"

package/src/actions/auth.ts

@@ -0,0 +1,48 @@
+"use server";
+
+import { Google, generateCodeVerifier, generateState } from "arctic";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { getGoogleConfig } from "./settings.js";
+
+export async function loginWithGoogle() {
+  const config = await getGoogleConfig();
+
+  if (!config.clientId || !config.clientSecret) {
+    throw new Error("Google Auth is not configured. Please visit settings.");
+  }
+
+  const google = new Google(
+    config.clientId,
+    config.clientSecret,
+    config.redirectUri,
+  );
+  const state = generateState();
+  const codeVerifier = generateCodeVerifier();
+
+  const url = google.createAuthorizationURL(state, codeVerifier, [
+    "openid",
+    "profile",
+    "email",
+  ]);
+
+  const cookieStore = await cookies();
+
+  cookieStore.set("google_oauth_state", state, {
+    path: "/",
+    secure: process.env.NODE_ENV === "production",
+    httpOnly: true,
+    maxAge: 60 * 10,
+    sameSite: "lax",
+  });
+
+  cookieStore.set("google_code_verifier", codeVerifier, {
+    path: "/",
+    secure: process.env.NODE_ENV === "production",
+    httpOnly: true,
+    maxAge: 60 * 10,
+    sameSite: "lax",
+  });
+
+  return redirect(url.toString());
+}

package/src/actions/settings.ts

@@ -0,0 +1,31 @@
+"use server";
+
+import {
+  getKryoPathPrefix,
+  getModuleConfig,
+  updateModuleConfig,
+} from "@arch-cadre/modules/server";
+import { revalidatePath } from "next/cache";
+
+export interface GoogleAuthConfig {
+  clientId: string;
+  clientSecret: string;
+  redirectUri: string;
+}
+
+export async function getGoogleConfig() {
+  const config = await getModuleConfig<GoogleAuthConfig>("google-auth");
+  return (
+    config ?? {
+      clientId: "",
+      clientSecret: "",
+      redirectUri: "http://localhost:3000/api/auth/google/callback",
+    }
+  );
+}
+
+export async function updateGoogleConfig(config: GoogleAuthConfig) {
+  await updateModuleConfig("google-auth", config);
+  revalidatePath(`${getKryoPathPrefix()}/google-auth/settings`);
+  return { success: true };
+}

package/src/index.ts

@@ -0,0 +1,34 @@
+import type { IModule } from "@arch-cadre/modules";
+import manifest from "../manifest.json";
+import { navigation } from "./navigation.js";
+import { apiRoutes, privateRoutes } from "./routes.js";
+import { GoogleLoginButton } from "./ui/google-button.js";
+
+const googleAuthModule: IModule = {
+  manifest,
+
+  routes: {
+    private: privateRoutes,
+    api: apiRoutes,
+  },
+
+  extensions: [
+    {
+      id: "google-login-signin",
+      targetModule: "auth",
+      point: "signin:extra-buttons",
+      component: GoogleLoginButton,
+      priority: 10,
+    },
+    {
+      id: "google-login-signup",
+      targetModule: "auth",
+      point: "signup:extra-buttons",
+      component: GoogleLoginButton,
+      priority: 10,
+    },
+  ],
+  navigation,
+};
+
+export default googleAuthModule;

package/src/intl.d.ts

@@ -0,0 +1,9 @@
+import type messages from "../locales/en/global.json";
+
+type JsonDataType = typeof messages;
+
+declare module "@arch-cadre/intl" {
+  export interface IntlMessages extends JsonDataType {}
+}
+
+export {};

package/src/navigation.ts

@@ -0,0 +1,15 @@
+import { i18n } from "@arch-cadre/intl";
+import type { ModuleNavigation } from "@arch-cadre/modules";
+
+export const navigation: ModuleNavigation = {
+  admin: {
+    [i18n("Security")]: [
+      {
+        id: "google-auth-settings",
+        title: i18n("Google Auth"),
+        url: "/google-auth/settings",
+        icon: "solar:lock-keyhole-bold-duotone",
+      },
+    ],
+  },
+};

package/src/routes.ts

@@ -0,0 +1,105 @@
+import { eventBus } from "@arch-cadre/core";
+import {
+  createOAuthUser,
+  createSession,
+  generateSessionToken,
+  getUserFromEmail,
+  performFullUserAugmentation,
+  setSessionTokenCookie,
+} from "@arch-cadre/core/server";
+import type {
+  ApiRouteDefinition,
+  PrivateRouteDefinition,
+} from "@arch-cadre/modules";
+import { decodeIdToken, Google } from "arctic";
+import dynamic from "next/dynamic";
+import { cookies } from "next/headers";
+import { getGoogleConfig } from "./actions/settings.js";
+
+const GoogleAuthSettingsPage = dynamic(() => import("./ui/settings-page.js"));
+
+async function getGoogleClient() {
+  const config = await getGoogleConfig();
+  return new Google(config.clientId, config.clientSecret, config.redirectUri);
+}
+
+export const privateRoutes: PrivateRouteDefinition[] = [
+  {
+    path: "/google-auth/settings", // Będzie widoczne pod /module/google-auth/settings
+    component: GoogleAuthSettingsPage,
+    auth: true,
+  },
+];
+
+export const apiRoutes: ApiRouteDefinition[] = [
+  {
+    path: "/api/auth/google/callback",
+    handler: async (request: Request) => {
+      const google = await getGoogleClient();
+      const url = new URL(request.url);
+      const code = url.searchParams.get("code");
+      const state = url.searchParams.get("state");
+
+      const cookieStore = await cookies();
+      const storedState = cookieStore.get("google_oauth_state")?.value;
+      const codeVerifier = cookieStore.get("google_code_verifier")?.value;
+
+      if (
+        !code ||
+        !state ||
+        !storedState ||
+        !codeVerifier ||
+        state !== storedState
+      ) {
+        return new Response("Invalid state or code", { status: 400 });
+      }
+
+      try {
+        const tokens = await google.validateAuthorizationCode(
+          code,
+          codeVerifier,
+        );
+        const idToken = tokens.idToken();
+        const claims = decodeIdToken(idToken) as {
+          email: string;
+          name: string;
+          picture?: string;
+        };
+
+        let user = await getUserFromEmail(claims.email);
+
+        if (!user) {
+          user = await createOAuthUser(
+            claims.email,
+            claims.name,
+            claims.picture,
+          );
+        }
+
+        const sessionToken = await generateSessionToken();
+        const session = await createSession(sessionToken, user.id, {});
+        await setSessionTokenCookie(sessionToken, session.expiresAt);
+
+        const fullUser = await performFullUserAugmentation(user);
+        await eventBus.publish("auth:login", {
+          email: user.email,
+          userId: user.id,
+        });
+        await eventBus.publish("auth:session-created", {
+          session,
+          user: fullUser,
+        });
+
+        return new Response(null, {
+          status: 302,
+          headers: {
+            Location: "/",
+          },
+        });
+      } catch (error) {
+        console.error("[GoogleAuth] Error during callback:", error);
+        return new Response("Authentication failed", { status: 500 });
+      }
+    },
+  },
+];

package/src/ui/google-button.tsx

@@ -0,0 +1,33 @@
+"use client";
+import { useTranslation } from "@arch-cadre/intl";
+
+import { Button } from "@arch-cadre/ui";
+import * as React from "react";
+import { loginWithGoogle } from "../actions/auth.js";
+
+export function GoogleLoginButton() {
+  const { t } = useTranslation();
+
+  return (
+    <Button
+      type="button"
+      variant="outline"
+      className="w-full gap-2"
+      onClick={() => loginWithGoogle()}
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 24 24"
+        className="size-4"
+      >
+        <title>{t("Continue with Google")}</title>
+        <path
+          d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"
+          fill="currentColor"
+        />
+      </svg>
+
+      {t("Continue with Google")}
+    </Button>
+  );
+}

package/src/ui/settings-page.tsx

@@ -0,0 +1,118 @@
+"use client";
+import { useTranslation } from "@arch-cadre/intl";
+import { Button } from "@arch-cadre/ui/components/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@arch-cadre/ui/components/card";
+import { Input } from "@arch-cadre/ui/components/input";
+import { Label } from "@arch-cadre/ui/components/label";
+import * as React from "react";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
+import {
+  type GoogleAuthConfig,
+  getGoogleConfig,
+  updateGoogleConfig,
+} from "../actions/settings.js";
+
+export default function GoogleAuthSettingsPage() {
+  const { t } = useTranslation();
+
+  const [config, setConfig] = useState<GoogleAuthConfig>({
+    clientId: "",
+    clientSecret: "",
+    redirectUri: "",
+  });
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    getGoogleConfig().then((data) => {
+      setConfig(data);
+      setLoading(false);
+    });
+  }, []);
+
+  const handleSave = async (e: React.FormEvent) => {
+    e.preventDefault();
+    try {
+      await updateGoogleConfig(config);
+      toast.success(t("Settings saved successfully"));
+    } catch {
+      toast.error(
+        t(
+          "Failed to save settings. Please check your configuration and try again.",
+        ),
+      );
+    }
+  };
+
+  if (loading) return <div>{t("Google Auth")}</div>;
+
+  return (
+    <div className="container mx-auto py-10 max-w-2xl">
+      <Card>
+        <CardHeader>
+          <div>{t("Google Auth")}</div>
+          <div>{t("")}</div>
+
+          <CardTitle>{t("Google Authentication Settings")}</CardTitle>
+          <CardDescription>
+            {t(
+              "Configure your Google OAuth2 credentials. You can find these in the Google Cloud Console.",
+            )}
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <form onSubmit={handleSave} className="space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="clientId">{t("Client ID")}</Label>
+              <Input
+                id="clientId"
+                value={config.clientId}
+                onChange={(e) =>
+                  setConfig({ ...config, clientId: e.target.value })
+                }
+                placeholder="xxx.apps.googleusercontent.com"
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="clientSecret">{t("Client Secret")}</Label>
+              <Input
+                id="clientSecret"
+                type="password"
+                value={config.clientSecret}
+                onChange={(e) =>
+                  setConfig({ ...config, clientSecret: e.target.value })
+                }
+                placeholder="••••••••"
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="redirectUri">{t("Redirect URI")}</Label>
+              <Input
+                id="redirectUri"
+                value={config.redirectUri}
+                onChange={(e) =>
+                  setConfig({ ...config, redirectUri: e.target.value })
+                }
+                placeholder="http://localhost:3000/api/auth/google/callback"
+              />
+              <p className="text-[10px] text-muted-foreground italic">
+                {t(
+                  "Must match exactly with Google Cloud Console configuration.",
+                )}
+              </p>
+            </div>
+            <Button type="submit" className="w-full">
+              {t("Save Configuration")}
+            </Button>
+          </form>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}