@studiocms/google 0.1.0-beta.30 → 0.1.0

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/verify-email").VerifyEmail, 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, import("studiocms/sdk/base").DBClientInitializationError | import("studiocms/sdk/base").SDKInitializationError | import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("effect/Cause").UnknownException | import("effect/ConfigError").ConfigError | import("@withstudiocms/effect/smtp").SMTPError, never>, import("effect/Layer").Layer<Platform.HttpClient.HttpClient, never, never>];
     readonly effect: Effect.Effect<{
-        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>;
+        initSession: (context: APIContext) => Effect.Effect<Response, import("effect/ConfigError").ConfigError | import("@withstudiocms/auth-kit/errors").SessionError, never>;
+        initCallback: (context: APIContext) => Effect.Effect<Response, any, never>;
+    }, import("studiocms/sdk/base").DBClientInitializationError | import("studiocms/sdk/base").SDKInitializationError | import("effect/ConfigError").ConfigError | 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

@@ -15,9 +15,9 @@ class GoogleUser extends Schema.Class("GoogleUser")({
 }) {
 }
 const GOOGLE = {
-  CLIENT_ID: getSecret("GOOGLE_CLIENT_ID") ?? "",
-  CLIENT_SECRET: getSecret("GOOGLE_CLIENT_SECRET") ?? "",
-  REDIRECT_URI: getSecret("GOOGLE_REDIRECT_URI") ?? ""
+  CLIENT_ID: getSecret("CMS_GOOGLE_CLIENT_ID") ?? "",
+  CLIENT_SECRET: getSecret("CMS_GOOGLE_CLIENT_SECRET") ?? "",
+  REDIRECT_URI: getSecret("CMS_GOOGLE_REDIRECT_URI") ?? ""
 };
 class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
   dependencies: [VerifyEmail.Default, Platform.FetchHttpClient.layer],
@@ -41,13 +41,11 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
         }
       }).pipe(
         Effect.flatMap(Platform.HttpClientResponse.schemaBodyJson(GoogleUser)),
-        Effect.catchAll(
-          (error) => Effect.fail(
-            new ValidateAuthCodeError({
-              provider: GoogleOAuthAPI.ProviderID,
-              message: `Failed to fetch user info: ${error.message}`
-            })
-          )
+        Effect.mapError(
+          (error) => new ValidateAuthCodeError({
+            provider: GoogleOAuthAPI.ProviderID,
+            message: `Failed to fetch user info: ${error.message}`
+          })
         )
       );
     });
@@ -78,10 +76,10 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
         }
         const googleUser = yield* validateAuthCode(code, codeVerifier);
         const { sub: googleUserId, name: googleUsername } = googleUser;
-        const existingOAuthAccount = yield* sdk.AUTH.oAuth.searchProvidersForId(
-          GoogleOAuthAPI.ProviderID,
-          googleUserId
-        );
+        const existingOAuthAccount = yield* sdk.AUTH.oAuth.searchProvidersForId({
+          providerId: GoogleOAuthAPI.ProviderID,
+          userId: googleUserId
+        });
         if (existingOAuthAccount) {
           const user = yield* sdk.GET.users.byId(existingOAuthAccount.userId);
           if (!user) {
@@ -123,11 +121,11 @@ class GoogleOAuthAPI extends Effect.Service()("GoogleOAuthAPI", {
             email: googleUser.email,
             name: googleUser.name,
             avatar: googleUser.picture,
-            createdAt: /* @__PURE__ */ new Date(),
+            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
             emailVerified: false,
             notifications: null,
             password: null,
-            updatedAt: /* @__PURE__ */ new Date(),
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
             url: null
           },
           { provider: GoogleOAuthAPI.ProviderID, providerUserId: googleUserId }

package/dist/index.js

@@ -8,7 +8,7 @@ function studiocmsGoogle() {
     name: "StudioCMS Google Plugin",
     studiocmsMinimumVersion: "0.1.0-beta.22",
     hooks: {
-      "studiocms:config:setup": ({ setAuthService }) => {
+      "studiocms:auth": ({ setAuthService }) => {
         setAuthService({
           oAuthProvider: {
             name: "google",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiocms/google",
-  "version": "0.1.0-beta.30",
+  "version": "0.1.0",
   "description": "Add Google OAuth Support to your StudioCMS project with ease!",
   "author": {
     "name": "withstudiocms",
@@ -55,14 +55,16 @@
   },
   "peerDependencies": {
     "astro": "^5.12.9",
-    "effect": "^3.19.2",
+    "effect": "^3.19.14",
     "vite": "^6.3.4",
-    "studiocms": "0.1.0-beta.30"
+    "studiocms": "0.1.0"
   },
   "scripts": {
     "build": "buildkit build 'src/**/*.{ts,astro,css,json,png}'",
     "dev": "buildkit dev 'src/**/*.{ts,astro,css,json,png}'",
     "typecheck": "tspc -p tsconfig.tspc.json",
+    "effect-check": "pnpm effect-language-service diagnostics --project tsconfig.tspc.json",
+    "ci:effect-check": "pnpm effect-check --format github-actions",
     "test": "vitest"
   }
 }