@valbuild/server 0.85.0 → 0.86.0

package/dist/declarations/src/ValRouter.d.ts

@@ -37,7 +37,7 @@ type ValServerOverrides = Partial<{
      * "local" means that changes will be written to the local filesystem,
      * which is what you want when developing locally.
      *
-     * "proxy" means that changes will proxied to https://app.val.build
+     * "proxy" means that changes will proxied to https://admin.val.build
      * and eventually be committed in the Git repository.
      *
      * It will automatically be "proxy" if both VAL_API_KEY env var (or the apiKey property) and VAL_SECRET env var (or the valSecret property)
@@ -69,7 +69,7 @@ type ValServerOverrides = Partial<{
      *
      * Can also be overridden using the VAL_BUILD_URL env var.
      *
-     * @example "https://app.val.build"
+     * @example "https://admin.val.build"
      */
     valBuildUrl: string;
     /**

package/dist/valbuild-server.cjs.dev.js

@@ -4556,7 +4556,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRe}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -4569,7 +4569,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   };
@@ -4580,7 +4580,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/api/val/${options.project}/auth/token`, options.valBuildUrl);
+    const url = new URL(`/api/val/auth/token`, options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     if (!options.apiKey) {
       return null;
@@ -4665,7 +4665,7 @@ const ValServer = (valModules, options, callbacks) => {
   const authorize = async redirectTo => {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(redirectTo);
-    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}/${options.route}`, token);
+    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}${options.route}`, token);
     await callbacks.onEnable(true);
     return {
       cookies: {
@@ -4950,7 +4950,7 @@ const ValServer = (valModules, options, callbacks) => {
                 value: null
               }
             },
-            redirectTo: getAppErrorUrl("Failed to exchange code for user")
+            redirectTo: getAppErrorUrl("Failed to exchange code for token - check that API Key and project are correct")
           };
         }
         const exp = getExpire();
@@ -6288,7 +6288,7 @@ async function initHandlerOptions(route, opts, config) {
   const valEnableRedirectUrl = opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL;
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
-  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
   const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || core.DEFAULT_CONTENT_HOST;
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
@@ -6331,7 +6331,7 @@ async function initHandlerOptions(route, opts, config) {
     };
   } else {
     const cwd = process.cwd();
-    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
     return {
       mode: "fs",
       cwd,

package/dist/valbuild-server.cjs.prod.js

@@ -4556,7 +4556,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRe}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -4569,7 +4569,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   };
@@ -4580,7 +4580,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/api/val/${options.project}/auth/token`, options.valBuildUrl);
+    const url = new URL(`/api/val/auth/token`, options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     if (!options.apiKey) {
       return null;
@@ -4665,7 +4665,7 @@ const ValServer = (valModules, options, callbacks) => {
   const authorize = async redirectTo => {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(redirectTo);
-    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}/${options.route}`, token);
+    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}${options.route}`, token);
     await callbacks.onEnable(true);
     return {
       cookies: {
@@ -4950,7 +4950,7 @@ const ValServer = (valModules, options, callbacks) => {
                 value: null
               }
             },
-            redirectTo: getAppErrorUrl("Failed to exchange code for user")
+            redirectTo: getAppErrorUrl("Failed to exchange code for token - check that API Key and project are correct")
           };
         }
         const exp = getExpire();
@@ -6288,7 +6288,7 @@ async function initHandlerOptions(route, opts, config) {
   const valEnableRedirectUrl = opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL;
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
-  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
   const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || core.DEFAULT_CONTENT_HOST;
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
@@ -6331,7 +6331,7 @@ async function initHandlerOptions(route, opts, config) {
     };
   } else {
     const cwd = process.cwd();
-    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
     return {
       mode: "fs",
       cwd,

package/dist/valbuild-server.esm.js

@@ -4525,7 +4525,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRe}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -4538,7 +4538,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/auth/${options.project}/authorize`, options.valBuildUrl);
+    const url = new URL(`/authorize`, options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   };
@@ -4549,7 +4549,7 @@ const ValServer = (valModules, options, callbacks) => {
     if (!options.valBuildUrl) {
       throw new Error("Val build url is not set");
     }
-    const url = new URL(`/api/val/${options.project}/auth/token`, options.valBuildUrl);
+    const url = new URL(`/api/val/auth/token`, options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     if (!options.apiKey) {
       return null;
@@ -4634,7 +4634,7 @@ const ValServer = (valModules, options, callbacks) => {
   const authorize = async redirectTo => {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(redirectTo);
-    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}/${options.route}`, token);
+    const appAuthorizeUrl = getAuthorizeUrl(`${redirectUrl.origin}${options.route}`, token);
     await callbacks.onEnable(true);
     return {
       cookies: {
@@ -4919,7 +4919,7 @@ const ValServer = (valModules, options, callbacks) => {
                 value: null
               }
             },
-            redirectTo: getAppErrorUrl("Failed to exchange code for user")
+            redirectTo: getAppErrorUrl("Failed to exchange code for token - check that API Key and project are correct")
           };
         }
         const exp = getExpire();
@@ -6257,7 +6257,7 @@ async function initHandlerOptions(route, opts, config) {
   const valEnableRedirectUrl = opts.valEnableRedirectUrl || process.env.VAL_ENABLE_REDIRECT_URL;
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
-  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+  const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
   const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || DEFAULT_CONTENT_HOST;
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
@@ -6300,7 +6300,7 @@ async function initHandlerOptions(route, opts, config) {
     };
   } else {
     const cwd = process.cwd();
-    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
+    const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://admin.val.build";
     return {
       mode: "fs",
       cwd,

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -23,9 +23,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.85.0",
-    "@valbuild/shared": "~0.85.0",
-    "@valbuild/ui": "~0.85.0",
+    "@valbuild/core": "~0.86.0",
+    "@valbuild/shared": "~0.86.0",
+    "@valbuild/ui": "~0.86.0",
     "chokidar": "^4.0.1",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",