fix: update messages and env vars

Author: shetzel

messages/auth.md

@@ -24,17 +24,13 @@ Invalid request method: %s
 
 Invalid request uri: %s
 
-# invalidClientId
+# warn.invalidClientId
 
-Ignoring client ID: %s for Code Builder authentication when CODE_BUILDER=true env var is set.
+Code Builder web authentication is only supported with the Code Builder connected app. Ignoring client ID: %s
 
-# error.missingCodeBuilderUri
+# error.invalidCodeBuilderState
 
-Missing Code Builder URI in environment.
-
-# error.missingCodeBuilderStateSha
-
-Missing Code builder SHA in environment.
+Invalid authentication state.
 
 # error.HttpApi
 

src/webOAuthServer.ts

@@ -202,21 +202,16 @@ export class WebOAuthServer extends AsyncCreatable<WebOAuthServer.Options> {
 
     if (env.getBoolean('CODE_BUILDER')) {
       if (this.oauthConfig.clientId && this.oauthConfig.clientId !== CODE_BUILDER_CONNECTED_APP_INFO.clientId) {
-        this.logger.warn(messages.getMessage('invalidClientId', [this.oauthConfig.clientId]));
+        this.logger.warn(messages.getMessage('warn.invalidClientId', [this.oauthConfig.clientId]));
       }
       this.oauthConfig.clientId = CODE_BUILDER_CONNECTED_APP_INFO.clientId;
-      const cbUri = env.getString('CODE_BUILDER_URI');
-      if (!cbUri) {
-        throw messages.createError('error.missingCodeBuilderUri');
-      }
-      const cbStateSha = env.getString('CODE_BUILDER_STATE_SHA');
+      const cbStateSha = env.getString('CODE_BUILDER_STATE');
       if (!cbStateSha) {
-        throw messages.createError('error.missingCodeBuilderStateSha');
+        throw messages.createError('error.invalidCodeBuilderState');
       }
       this.oauthConfig.state = JSON.stringify({
         PORT: port,
-        CODE_BUILDER_URI: cbUri,
-        CODE_BUILDER_STATE_SHA: cbStateSha,
+        CODE_BUILDER_STATE: cbStateSha,
       });
       const cbProd = env.getBoolean('CODE_BUILDER_PROD');
       this.oauthConfig.redirectUri = cbProd ? CODE_BUILDER_REDIRECT_URI_PROD : CODE_BUILDER_REDIRECT_URI_STAGE;