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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,5 @@
1
- import { HttpClient } from '@effect/platform';
2
1
  import type { APIContext } from 'astro';
3
- import { Effect, Schema } from 'studiocms/effect';
2
+ import { Effect, Platform, Schema } from 'studiocms/effect';
4
3
  declare const GitHubUser_base: Schema.Class<GitHubUser, {
5
4
  id: typeof Schema.Number;
6
5
  html_url: typeof Schema.String;
@@ -46,11 +45,11 @@ declare const GitHubUser_base: Schema.Class<GitHubUser, {
46
45
  export declare class GitHubUser extends GitHubUser_base {
47
46
  }
48
47
  declare const GitHubOAuthAPI_base: Effect.Service.Class<GitHubOAuthAPI, "GitHubOAuthAPI", {
49
- 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>];
48
+ 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>];
50
49
  readonly effect: Effect.Effect<{
51
50
  initSession: (context: APIContext) => Effect.Effect<Response, import("studiocms/lib/auth/session").SessionError, never>;
52
- initCallback: (context: APIContext) => Effect.Effect<Response, import("studiocms/sdk/effect/db").LibSQLDatabaseError | import("studiocms/sdk/errors").SDKCoreError | Error, never>;
53
- }, never, import("studiocms/lib/auth/session").Session | import("studiocms/lib/auth/verify-email").VerifyEmail | import("studiocms/lib/auth/user").User | HttpClient.HttpClient>;
51
+ initCallback: (context: APIContext) => Effect.Effect<Response, Error | import("studiocms/sdk/effect/db").LibSQLDatabaseError | import("studiocms/sdk/errors").SDKCoreError, never>;
52
+ }, never, import("studiocms/lib/auth/session").Session | import("studiocms/lib/auth/verify-email").VerifyEmail | import("studiocms/lib/auth/user").User | Platform.HttpClient.HttpClient>;
54
53
  }>;
55
54
  /**
56
55
  * Provides GitHub OAuth authentication effects for the StudioCMS API.
@@ -3,9 +3,8 @@ import { Session, User, VerifyEmail } from "studiocms:auth/lib";
3
3
  import config from "studiocms:config";
4
4
  import { StudioCMSRoutes } from "studiocms:lib";
5
5
  import { SDKCore } from "studiocms:sdk";
6
- import { FetchHttpClient, HttpClient, HttpClientResponse } from "@effect/platform";
7
6
  import { GitHub, generateState } from "arctic";
8
- import { Effect, genLogger, Schema } from "studiocms/effect";
7
+ import { Effect, genLogger, Platform, Schema } from "studiocms/effect";
9
8
  import { getCookie, getUrlParam, ValidateAuthCodeError } from "studiocms/oAuthUtils";
10
9
  class GitHubUser extends Schema.Class("GitHubUser")({
11
10
  id: Schema.Number,
@@ -23,7 +22,12 @@ const GITHUB = {
23
22
  REDIRECT_URI: getSecret("GITHUB_REDIRECT_URI") ?? null
24
23
  };
25
24
  class GitHubOAuthAPI extends Effect.Service()("GitHubOAuthAPI", {
26
- dependencies: [Session.Default, VerifyEmail.Default, User.Default, FetchHttpClient.layer],
25
+ dependencies: [
26
+ Session.Default,
27
+ VerifyEmail.Default,
28
+ User.Default,
29
+ Platform.FetchHttpClient.layer
30
+ ],
27
31
  effect: genLogger("studiocms/routes/api/auth/github/effect")(function* () {
28
32
  const [
29
33
  sdk,
@@ -31,7 +35,7 @@ class GitHubOAuthAPI extends Effect.Service()("GitHubOAuthAPI", {
31
35
  { setOAuthSessionTokenCookie, createUserSession },
32
36
  { isEmailVerified, sendVerificationEmail },
33
37
  { getUserData, createOAuthUser }
34
- ] = yield* Effect.all([SDKCore, HttpClient.HttpClient, Session, VerifyEmail, User]);
38
+ ] = yield* Effect.all([SDKCore, Platform.HttpClient.HttpClient, Session, VerifyEmail, User]);
35
39
  const { CLIENT_ID, CLIENT_SECRET, REDIRECT_URI } = GITHUB;
36
40
  const github = new GitHub(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
37
41
  const validateAuthCode = (code) => genLogger("studiocms/routes/api/auth/github/effect.validateAuthCode")(function* () {
@@ -41,7 +45,7 @@ class GitHubOAuthAPI extends Effect.Service()("GitHubOAuthAPI", {
41
45
  Authorization: `Bearer ${tokens.accessToken}`
42
46
  }
43
47
  }).pipe(
44
- Effect.flatMap(HttpClientResponse.schemaBodyJson(GitHubUser)),
48
+ Effect.flatMap(Platform.HttpClientResponse.schemaBodyJson(GitHubUser)),
45
49
  Effect.catchAll(
46
50
  (error) => Effect.fail(
47
51
  new ValidateAuthCodeError({
@@ -112,7 +116,6 @@ class GitHubOAuthAPI extends Effect.Service()("GitHubOAuthAPI", {
112
116
  }
113
117
  const newUser = yield* createOAuthUser(
114
118
  {
115
- // @ts-expect-error drizzle broke the id variable...
116
119
  id: crypto.randomUUID(),
117
120
  username: githubUsername,
118
121
  email: githubUser.email,
@@ -5,7 +5,7 @@ import type { APIRoute } from 'astro';
5
5
  * This function uses the Effect system to compose asynchronous operations,
6
6
  * retrieving the `initSession` method from the `GitHubOAuthAPI` and invoking it
7
7
  * with the provided API context. The result is converted to a vanilla response
8
- * using `convertToVanilla`.
8
+ * using `runEffect`.
9
9
  *
10
10
  * @param context - The API context containing request and environment information.
11
11
  * @returns A promise resolving to the API response after session initialization.
package/dist/endpoint.js CHANGED
@@ -1,12 +1,12 @@
1
- import { convertToVanilla, Effect } from "studiocms/effect";
1
+ import { Effect, runEffect } from "studiocms/effect";
2
2
  import { GitHubOAuthAPI } from "./effect/github.js";
3
- const initSession = async (context) => await convertToVanilla(
3
+ const initSession = async (context) => await runEffect(
4
4
  Effect.gen(function* () {
5
5
  const { initSession: initSession2 } = yield* GitHubOAuthAPI;
6
6
  return yield* initSession2(context);
7
7
  }).pipe(Effect.provide(GitHubOAuthAPI.Default))
8
8
  );
9
- const initCallback = async (context) => await convertToVanilla(
9
+ const initCallback = async (context) => await runEffect(
10
10
  Effect.gen(function* () {
11
11
  const { initCallback: initCallback2 } = yield* GitHubOAuthAPI;
12
12
  return yield* initCallback2(context);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@studiocms/github",
3
- "version": "0.1.0-beta.23",
3
+ "version": "0.1.0-beta.25",
4
4
  "description": "Add GitHub OAuth Support to your StudioCMS project.",
5
5
  "author": {
6
6
  "name": "withstudiocms",
@@ -23,12 +23,10 @@
23
23
  "astrocms",
24
24
  "astrodb",
25
25
  "astrostudio",
26
- "astro-integration",
27
26
  "astro-studio",
28
27
  "astro-studiocms",
29
28
  "cms",
30
29
  "studiocms",
31
- "withastro",
32
30
  "plugin",
33
31
  "studiocms-plugin"
34
32
  ],
@@ -49,18 +47,17 @@
49
47
  },
50
48
  "type": "module",
51
49
  "dependencies": {
52
- "astro-integration-kit": "^0.18",
50
+ "astro-integration-kit": "^0.19.0",
53
51
  "arctic": "^3.7.0"
54
52
  },
55
53
  "devDependencies": {
56
54
  "@types/node": "^22.0.0"
57
55
  },
58
56
  "peerDependencies": {
59
- "@effect/platform": "^0.90.0",
60
- "astro": "^5.12.6",
61
- "effect": "^3.17.3",
57
+ "astro": "^5.12.9",
58
+ "effect": "^3.17.9",
62
59
  "vite": "^6.3.4",
63
- "studiocms": "0.1.0-beta.23"
60
+ "studiocms": "0.1.0-beta.25"
64
61
  },
65
62
  "scripts": {
66
63
  "build": "buildkit build 'src/**/*.{ts,astro,css,json,png}'",