@studiocms/google 0.1.0-beta.25 → 0.1.0-beta.26

package/dist/effect/google.d.ts

@@ -30,11 +30,11 @@ declare const GoogleUser_base: Schema.Class<GoogleUser, {
 export declare class GoogleUser extends GoogleUser_base {
 }
 declare const GoogleOAuthAPI_base: Effect.Service.Class<GoogleOAuthAPI, "GoogleOAuthAPI", {
-    readonly dependencies: readonly [import("effect/Layer").Layer<import("studiocms/lib/auth/session").Session, never, never>, import("effect/Layer").Layer<import("studiocms/lib/auth/verify-email").VerifyEmail, Error, never>, import("effect/Layer").Layer<import("studiocms/lib/auth/user").User, Error, never>, import("effect/Layer").Layer<Platform.HttpClient.HttpClient, never, never>];
+    readonly dependencies: readonly [import("effect/Layer").Layer<import("studiocms/lib/auth/verify-email").VerifyEmail, Error, never>, import("effect/Layer").Layer<Platform.HttpClient.HttpClient, never, never>];
     readonly effect: Effect.Effect<{
-        initSession: (context: APIContext) => Effect.Effect<Response, import("studiocms/lib/auth/session").SessionError, never>;
-        initCallback: (context: APIContext) => Effect.Effect<Response, Error | import("studiocms/sdk/effect/db").LibSQLDatabaseError | import("studiocms/sdk/errors").SDKCoreError, never>;
-    }, never, import("studiocms/lib/auth/session").Session | import("studiocms/lib/auth/verify-email").VerifyEmail | import("studiocms/lib/auth/user").User | Platform.HttpClient.HttpClient>;
+        initSession: (context: APIContext) => Effect.Effect<Response, import("@withstudiocms/auth-kit/errors").SessionError, never>;
+        initCallback: (context: APIContext) => Effect.Effect<Response, import("@withstudiocms/auth-kit/errors").SessionError, never>;
+    }, import("@withstudiocms/auth-kit/errors").SessionError | import("@withstudiocms/auth-kit/errors").UserError, import("studiocms/lib/auth/verify-email").VerifyEmail | Platform.HttpClient.HttpClient>;
 }>;
 /**
  * Provides Google OAuth authentication effects for the StudioCMS API.

package/dist/effect/google.js

@@ -4,6 +4,7 @@ import config from "studiocms:config";
 import { StudioCMSRoutes } from "studiocms:lib";
 import { SDKCore } from "studiocms:sdk";
 import { Google, generateCodeVerifier, generateState } from "arctic";
+import { LinkNewOAuthCookieName } from "studiocms/consts";
 import { Effect, genLogger, Platform, Schema } from "studiocms/effect";
 import { getCookie, getUrlParam, ValidateAuthCodeError } from "studiocms/oAuthUtils";
 class GoogleUser extends Schema.Class("GoogleUser")({
@@ -19,12 +20,7 @@ const GOOGLE = {
   REDIRECT_URI: getSecret("GOOGLE_REDIRECT_URI") ?? ""
 };
 class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
-  dependencies: [
-    Session.Default,
-    VerifyEmail.Default,
-    User.Default,
-    Platform.FetchHttpClient.layer
-  ],
+  dependencies: [VerifyEmail.Default, Platform.FetchHttpClient.layer],
   effect: genLogger("studiocms/routes/api/auth/google/effect")(function* () {
     const [
       sdk,
@@ -101,7 +97,7 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
           return redirect(StudioCMSRoutes.mainLinks.dashboardIndex);
         }
         const loggedInUser = yield* getUserData(context);
-        const linkNewOAuth = !!cookies.get(User.LinkNewOAuthCookieName)?.value;
+        const linkNewOAuth = !!cookies.get(LinkNewOAuthCookieName)?.value;
         if (loggedInUser.user && linkNewOAuth) {
           const existingUser2 = yield* sdk.GET.users.byId(loggedInUser.user.id);
           if (existingUser2) {
@@ -127,7 +123,12 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
             email: googleUser.email,
             name: googleUser.name,
             avatar: googleUser.picture,
-            createdAt: /* @__PURE__ */ new Date()
+            createdAt: /* @__PURE__ */ new Date(),
+            emailVerified: false,
+            notifications: null,
+            password: null,
+            updatedAt: /* @__PURE__ */ new Date(),
+            url: null
           },
           { provider: GoogleOAuthAPI.ProviderID, providerUserId: googleUserId }
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiocms/google",
-  "version": "0.1.0-beta.25",
+  "version": "0.1.0-beta.26",
   "description": "Add Google OAuth Support to your StudioCMS project with ease!",
   "author": {
     "name": "withstudiocms",
@@ -55,9 +55,9 @@
   },
   "peerDependencies": {
     "astro": "^5.12.9",
-    "effect": "^3.17.9",
+    "effect": "^3.17.13",
     "vite": "^6.3.4",
-    "studiocms": "0.1.0-beta.25"
+    "studiocms": "0.1.0-beta.26"
   },
   "scripts": {
     "build": "buildkit build 'src/**/*.{ts,astro,css,json,png}'",