@hexclave/shared 1.0.19 → 1.0.21

package/dist/utils/oauth.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.js","names":[],"sources":["../../src/utils/oauth.tsx"],"sourcesContent":["export const standardProviders = [\"google\", \"github\", \"microsoft\", \"spotify\", \"facebook\", \"discord\", \"gitlab\", \"bitbucket\", \"linkedin\", \"apple\", \"x\", \"twitch\"] as const;\n// No more shared providers should be added except for special cases\nexport const sharedProviders = [\"google\", \"github\", \"microsoft\", \"spotify\"] as const;\nexport const allProviders = standardProviders;\nexport const publishableClientKeyNotNecessarySentinel = \"__stack_public_client__\";\n\nexport type ProviderType = typeof allProviders[number];\nexport type StandardProviderType = typeof standardProviders[number];\nexport type SharedProviderType = typeof sharedProviders[number];\n"],"mappings":";;;AAAA,MAAa,oBAAoB;CAAC;CAAU;CAAU;CAAa;CAAW;CAAY;CAAW;CAAU;CAAa;CAAY;CAAS;CAAK;CAAS;AAE/J,MAAa,kBAAkB;CAAC;CAAU;CAAU;CAAa;CAAU;AAC3E,MAAa,eAAe;AAC5B,MAAa,2CAA2C"}
+{"version":3,"file":"oauth.js","names":[],"sources":["../../src/utils/oauth.tsx"],"sourcesContent":["export const standardProviders = [\"google\", \"github\", \"microsoft\", \"spotify\", \"facebook\", \"discord\", \"gitlab\", \"bitbucket\", \"linkedin\", \"apple\", \"x\", \"twitch\"] as const;\n// No more shared providers should be added except for special cases\nexport const sharedProviders = [\"google\", \"github\", \"microsoft\", \"spotify\"] as const;\nexport const allProviders = standardProviders;\nexport const publishableClientKeyNotNecessarySentinel = \"__stack_public_client__\";\n\n/**\n * All provider types including custom OIDC. Standard providers are the\n * predefined set with first-class support; \"custom_oidc\" lets users bring\n * any OIDC-compliant identity provider (team plan+ only).\n */\nexport const allProviderTypes = [...standardProviders, \"custom_oidc\"] as const;\nexport type AllProviderType = typeof allProviderTypes[number];\n\nexport type ProviderType = typeof allProviders[number];\nexport type StandardProviderType = typeof standardProviders[number];\nexport type SharedProviderType = typeof sharedProviders[number];\n"],"mappings":";;;AAAA,MAAa,oBAAoB;CAAC;CAAU;CAAU;CAAa;CAAW;CAAY;CAAW;CAAU;CAAa;CAAY;CAAS;CAAK;CAAS;AAE/J,MAAa,kBAAkB;CAAC;CAAU;CAAU;CAAa;CAAU;AAC3E,MAAa,eAAe;AAC5B,MAAa,2CAA2C;;;;;;AAOxD,MAAa,mBAAmB,CAAC,GAAG,mBAAmB,cAAc"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/shared",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "repository": "https://github.com/hexclave/hexclave",
   "files": [
     "README.md",

package/src/ai/unified-prompts/skill-site-prompt-parts/ai-setup-prompt.ts

@@ -216,7 +216,6 @@ export const supabaseSetupPrompt = deindent`
 
       import { createSupabaseClient } from "@/utils/supabase-client";
       import { useHexclaveApp, useUser } from "@hexclave/next";
-      import Link from "next/link";
       import { useEffect, useState } from "react";
 
       export default function Page() {
@@ -241,10 +240,10 @@ export const supabaseSetupPrompt = deindent`
               <>
                 <p>You are signed in</p>
                 <p>User ID: {user.id}</p>
-                <Link href={app.urls.signOut}>Sign Out</Link>
+                <button onClick={async () => await app.redirectToSignOut()}>Sign Out</button>
               </>
             ) : (
-              <Link href={app.urls.signIn}>Sign In</Link>
+              <button onClick={async () => await app.redirectToSignIn()}>Sign In</button>
             )}
             <h3>Supabase data</h3>
             <ul>{listContent}</ul>
@@ -978,8 +977,8 @@ export function getSdkSetupPrompt(mainType: "ai-prompt" | "nextjs" | "react" | "
               // ...
               "scripts": {
                 // ...
-                "dev": "hexclave dev --config-file ./hexclave.config.ts -- npm run dev:without-hexclave",
-                "dev:without-hexclave": "<your-existing-dev-script>"
+                "dev": "hexclave dev --config-file ./hexclave.config.ts -- npm run dev:inner",
+                "dev:inner": "<your-existing-dev-script>"
               }
             }
             \`\`\`

package/src/config/schema-fuzzer.test.ts

@@ -216,6 +216,9 @@ const environmentSchemaFuzzerConfig = [{
         facebookConfigId: ["some-facebook-config-id"],
         microsoftTenantId: ["some-microsoft-tenant-id"],
         appleBundles: [{ "some-bundle-id": [{ bundleId: ["com.example.app"] }] }],
+        issuerUrl: [undefined, "https://accounts.google.com"] as (string | undefined)[],
+        scope: [undefined, "openid email profile"] as (string | undefined)[],
+        displayName: [undefined, "My OIDC Provider"] as (string | undefined)[],
       }]]))] as const,
     }],
   }],

package/src/config/schema.ts

@@ -11,7 +11,7 @@ import * as schemaFields from "../schema-fields";
 import { productSchema, userSpecifiedIdSchema, yupBoolean, yupDate, yupMixed, yupNever, yupNumber, yupObject, yupRecord, yupString, yupTuple, yupUnion } from "../schema-fields";
 import { SUPPORTED_CURRENCIES } from "../utils/currency-constants";
 import { HexclaveAssertionError } from "../utils/errors";
-import { allProviders } from "../utils/oauth";
+import { allProviders, allProviderTypes } from "../utils/oauth";
 import { DeepFilterUndefined, DeepMerge, DeepRequiredOrUndefined, filterUndefined, get, getOrUndefined, has, isObjectLike, mapValues, set, typedAssign, typedEntries, typedFromEntries } from "../utils/objects";
 import { Result } from "../utils/results";
 import { stringCompare } from "../utils/strings";
@@ -23,6 +23,7 @@ export const configLevels = ['project', 'branch', 'environment', 'organization']
 export type ConfigLevel = typeof configLevels[number];
 const permissionRegex = /^\$?[a-z0-9_:]+$/;
 const customPermissionRegex = /^[a-z0-9_:]+$/;
+const providerIdRegex = /^[a-z0-9_-]+$/;
 
 declare module "yup" {
   // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
@@ -116,7 +117,7 @@ const branchAuthSchema = yupObject({
     providers: yupRecord(
       yupString().matches(permissionRegex),
       yupObject({
-        type: yupString().oneOf(allProviders).optional(),
+        type: yupString().oneOf(allProviderTypes).optional(),
         allowSignIn: yupBoolean(),
         allowConnectedAccounts: yupBoolean(),
       }),
@@ -376,9 +377,9 @@ export const environmentConfigSchema = branchConfigSchema.concat(yupObject({
   auth: branchConfigSchema.getNested("auth").concat(yupObject({
     oauth: branchConfigSchema.getNested("auth").getNested("oauth").concat(yupObject({
       providers: yupRecord(
-        yupString().matches(permissionRegex),
+        yupString().matches(providerIdRegex),
         yupObject({
-          type: yupString().oneOf(allProviders).optional(),
+          type: yupString().oneOf(allProviderTypes).optional(),
           isShared: yupBoolean(),
           clientId: schemaFields.oauthClientIdSchema.optional(),
           clientSecret: schemaFields.oauthClientSecretSchema.optional(),
@@ -395,6 +396,10 @@ export const environmentConfigSchema = branchConfigSchema.concat(yupObject({
               bundleId: schemaFields.oauthAppleBundleIdSchema,
             }),
           ).optional(),
+          // Custom OIDC provider fields (only used when type is "custom_oidc")
+          issuerUrl: schemaFields.oauthIssuerUrlSchema.optional(),
+          scope: schemaFields.oauthScopeSchema.optional(),
+          displayName: yupString().optional(),
           allowSignIn: yupBoolean().optional(),
           allowConnectedAccounts: yupBoolean().optional(),
         }),

package/src/interface/page-component-versions.ts

@@ -218,7 +218,7 @@ function createAuthPagePrompt(type: AuthPagePromptType): CustomPagePrompt {
                 <Typography>
                   {"Don't have an account? "}
                   <a
-                    href={hexclaveApp.urls.signUp}
+                    href="#"
                     onClick={async (e) => {
                       e.preventDefault();
                       await hexclaveApp.redirectToSignUp();
@@ -231,7 +231,7 @@ function createAuthPagePrompt(type: AuthPagePromptType): CustomPagePrompt {
             }` : `<Typography>
               {"Already have an account? "}
               <a
-                href={hexclaveApp.urls.signIn}
+                href="#"
                 onClick={async (e) => {
                   e.preventDefault();
                   await hexclaveApp.redirectToSignIn();
@@ -552,7 +552,15 @@ export function getCustomPagePrompts(): Record<PageComponentKey, CustomPagePromp
               <Typography type="h2">Reset Your Password</Typography>
               <Typography>
                 {"Don't need to reset? "}
-                <a href={hexclaveApp.urls.signIn}>Sign in</a>
+                <a
+                  href="#"
+                  onClick={async (e) => {
+                    e.preventDefault();
+                    await hexclaveApp.redirectToSignIn();
+                  }}
+                >
+                  Sign in
+                </a>
               </Typography>
 
               <form onSubmit={async (e) => {
@@ -618,7 +626,15 @@ export function getCustomPagePrompts(): Record<PageComponentKey, CustomPagePromp
               {showRedirectLink ? (
                 <Typography>
                   {"If you are not redirected automatically, "}
-                  <a href={hexclaveApp.urls.home}>click here</a>
+                  <a
+                    href="#"
+                    onClick={async (e) => {
+                      e.preventDefault();
+                      await hexclaveApp.redirectToHome();
+                    }}
+                  >
+                    click here
+                  </a>
                 </Typography>
               ) : null}
               {error ? <pre>{JSON.stringify(error, null, 2)}</pre> : null}

package/src/schema-fields.ts

@@ -605,6 +605,8 @@ export const oauthMicrosoftTenantIdSchema = yupString().meta({ openapiField: { d
 export const oauthAppleBundleIdsSchema = yupArray(yupString().defined()).meta({ openapiField: { description: 'Apple Bundle IDs for native iOS/macOS apps. Required for native Sign In with Apple (in addition to web Apple OAuth which uses the Client ID/Services ID).', exampleValue: ['com.example.ios', 'com.example.macos'] } });
 export const oauthAppleBundleIdSchema = yupString().defined().meta({ openapiField: { description: 'Apple Bundle ID for native iOS/macOS apps.', exampleValue: 'com.example.ios' } });
 export const oauthAccountMergeStrategySchema = yupString().oneOf(['link_method', 'raise_error', 'allow_duplicates']).meta({ openapiField: { description: 'Determines how to handle OAuth logins that match an existing user by email. `link_method` adds the OAuth method to the existing user. `raise_error` rejects the login with an error. `allow_duplicates` creates a new user.', exampleValue: 'link_method' } });
+export const oauthIssuerUrlSchema = urlSchema.meta({ openapiField: { description: 'OIDC issuer URL for custom OIDC providers. Must support OIDC discovery (/.well-known/openid-configuration). Only used when type is "custom_oidc".', exampleValue: 'https://accounts.google.com' } });
+export const oauthScopeSchema = yupString().meta({ openapiField: { description: 'Space-separated OAuth scopes to request from the custom OIDC provider. Defaults to "openid email profile" if not specified.', exampleValue: 'openid email profile' } });
 // Project email config
 export const emailTypeSchema = yupString().oneOf(['shared', 'standard']).meta({ openapiField: { description: 'Email provider type, one of shared, standard. "shared" uses Stack shared email provider and it is only meant for development. "standard" uses your own email server and will have your email address as the sender.', exampleValue: 'standard' } });
 export const emailSenderNameSchema = yupString().meta({ openapiField: { description: 'Email sender name. Needs to be specified when using type="standard"', exampleValue: 'Stack' } });

package/src/utils/oauth.tsx

@@ -4,6 +4,14 @@ export const sharedProviders = ["google", "github", "microsoft", "spotify"] as c
 export const allProviders = standardProviders;
 export const publishableClientKeyNotNecessarySentinel = "__stack_public_client__";
 
+/**
+ * All provider types including custom OIDC. Standard providers are the
+ * predefined set with first-class support; "custom_oidc" lets users bring
+ * any OIDC-compliant identity provider (team plan+ only).
+ */
+export const allProviderTypes = [...standardProviders, "custom_oidc"] as const;
+export type AllProviderType = typeof allProviderTypes[number];
+
 export type ProviderType = typeof allProviders[number];
 export type StandardProviderType = typeof standardProviders[number];
 export type SharedProviderType = typeof sharedProviders[number];