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

package/dist/effect/google.d.ts

@@ -1,6 +1,5 @@
-import { HttpClient } from '@effect/platform';
 import type { APIContext } from 'astro';
-import { Effect, Schema } from 'studiocms/effect';
+import { Effect, Platform, Schema } from 'studiocms/effect';
 declare const GoogleUser_base: Schema.Class<GoogleUser, {
     sub: typeof Schema.String;
     picture: typeof Schema.String;
@@ -31,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, import("studiocms/lib/effects/smtp").SMTPError | import("effect/Cause").UnknownException, never>, import("effect/Layer").Layer<import("studiocms/lib/auth/user").User, import("studiocms/lib/effects/smtp").SMTPError | import("effect/Cause").UnknownException, never>, import("effect/Layer").Layer<HttpClient.HttpClient, never, never>];
+    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 effect: Effect.Effect<{
         initSession: (context: APIContext) => Effect.Effect<Response, import("studiocms/lib/auth/session").SessionError, never>;
-        initCallback: (context: APIContext) => Effect.Effect<Response, import("studiocms/sdk/effect/db").LibSQLDatabaseError | import("studiocms/sdk/errors").SDKCoreError | Error, never>;
-    }, never, import("studiocms/lib/auth/session").Session | import("studiocms/lib/auth/verify-email").VerifyEmail | import("studiocms/lib/auth/user").User | HttpClient.HttpClient>;
+        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>;
 }>;
 /**
  * Provides Google OAuth authentication effects for the StudioCMS API.

package/dist/effect/google.js

@@ -3,9 +3,8 @@ import { Session, User, VerifyEmail } from "studiocms:auth/lib";
 import config from "studiocms:config";
 import { StudioCMSRoutes } from "studiocms:lib";
 import { SDKCore } from "studiocms:sdk";
-import { FetchHttpClient, HttpClient, HttpClientResponse } from "@effect/platform";
 import { Google, generateCodeVerifier, generateState } from "arctic";
-import { Effect, genLogger, Schema } from "studiocms/effect";
+import { Effect, genLogger, Platform, Schema } from "studiocms/effect";
 import { getCookie, getUrlParam, ValidateAuthCodeError } from "studiocms/oAuthUtils";
 class GoogleUser extends Schema.Class("GoogleUser")({
   sub: Schema.String,
@@ -20,7 +19,12 @@ const GOOGLE = {
   REDIRECT_URI: getSecret("GOOGLE_REDIRECT_URI") ?? ""
 };
 class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
-  dependencies: [Session.Default, VerifyEmail.Default, User.Default, FetchHttpClient.layer],
+  dependencies: [
+    Session.Default,
+    VerifyEmail.Default,
+    User.Default,
+    Platform.FetchHttpClient.layer
+  ],
   effect: genLogger("studiocms/routes/api/auth/google/effect")(function* () {
     const [
       sdk,
@@ -28,7 +32,7 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
       { setOAuthSessionTokenCookie, createUserSession },
       { isEmailVerified, sendVerificationEmail },
       { getUserData, createOAuthUser }
-    ] = yield* Effect.all([SDKCore, HttpClient.HttpClient, Session, VerifyEmail, User]);
+    ] = yield* Effect.all([SDKCore, Platform.HttpClient.HttpClient, Session, VerifyEmail, User]);
     const { CLIENT_ID, CLIENT_SECRET, REDIRECT_URI } = GOOGLE;
     const google = new Google(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
     const validateAuthCode = (code, codeVerifier) => genLogger("studiocms/routes/api/auth/google/effect.validateAuthCode")(function* () {
@@ -40,7 +44,7 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
           Authorization: `Bearer ${tokens.accessToken}`
         }
       }).pipe(
-        Effect.flatMap(HttpClientResponse.schemaBodyJson(GoogleUser)),
+        Effect.flatMap(Platform.HttpClientResponse.schemaBodyJson(GoogleUser)),
         Effect.catchAll(
           (error) => Effect.fail(
             new ValidateAuthCodeError({
@@ -118,7 +122,6 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
         }
         const newUser = yield* createOAuthUser(
           {
-            // @ts-expect-error drizzle broke the id variable...
             id: crypto.randomUUID(),
             username: googleUsername,
             email: googleUser.email,

package/dist/endpoint.d.ts

@@ -5,7 +5,7 @@ import type { APIRoute } from 'astro';
  * This function uses the Effect system to compose asynchronous operations,
  * retrieving the `initSession` method from the `GoogleOAuthAPI` and invoking it
  * with the provided API context. The result is converted to a vanilla response
- * using `convertToVanilla`.
+ * using `runEffect`.
  *
  * @param context - The API context containing request and environment information.
  * @returns A promise resolving to the API response after session initialization.

package/dist/endpoint.js

@@ -1,12 +1,12 @@
-import { convertToVanilla, Effect } from "studiocms/effect";
+import { Effect, runEffect } from "studiocms/effect";
 import { GoogleOAuthAPI } from "./effect/google.js";
-const initSession = async (context) => await convertToVanilla(
+const initSession = async (context) => await runEffect(
   Effect.gen(function* () {
     const { initSession: initSession2 } = yield* GoogleOAuthAPI;
     return yield* initSession2(context);
   }).pipe(Effect.provide(GoogleOAuthAPI.Default))
 );
-const initCallback = async (context) => await convertToVanilla(
+const initCallback = async (context) => await runEffect(
   Effect.gen(function* () {
     const { initCallback: initCallback2 } = yield* GoogleOAuthAPI;
     return yield* initCallback2(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiocms/google",
-  "version": "0.1.0-beta.23",
+  "version": "0.1.0-beta.25",
   "description": "Add Google OAuth Support to your StudioCMS project with ease!",
   "author": {
     "name": "withstudiocms",
@@ -23,12 +23,10 @@
     "astrocms",
     "astrodb",
     "astrostudio",
-    "astro-integration",
     "astro-studio",
     "astro-studiocms",
     "cms",
     "studiocms",
-    "withastro",
     "plugin",
     "studiocms-plugin"
   ],
@@ -49,18 +47,17 @@
   },
   "type": "module",
   "dependencies": {
-    "astro-integration-kit": "^0.18",
+    "astro-integration-kit": "^0.19.0",
     "arctic": "^3.7.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.90.0",
-    "astro": "^5.12.6",
-    "effect": "^3.17.3",
+    "astro": "^5.12.9",
+    "effect": "^3.17.9",
     "vite": "^6.3.4",
-    "studiocms": "0.1.0-beta.23"
+    "studiocms": "0.1.0-beta.25"
   },
   "scripts": {
     "build": "buildkit build 'src/**/*.{ts,astro,css,json,png}'",