fix: correct flags (web login test is broken)

Author: mshanemc

package.json

@@ -20,7 +20,7 @@
     "@oclif/plugin-command-snapshot": "^3.3.6",
     "@salesforce/cli-plugins-testkit": "^3.2.18",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/dev-scripts": "^4.0.0-beta.9",
     "@salesforce/plugin-command-reference": "^2",
     "@salesforce/plugin-config": "^1.4.23",
     "@salesforce/prettier-config": "^0.0.2",
@@ -118,20 +118,19 @@
   },
   "repository": "salesforcecli/plugin-auth",
   "scripts": {
-    "build": "sf-build",
+    "build": "wireit",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
     "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
-    "compile": "sf-compile",
+    "compile": "wireit",
     "docs": "sf-docs",
-    "format": "sf-format",
-    "lint": "sf-lint",
+    "format": "wireit",
+    "lint": "wireit",
     "postpack": "shx rm -f oclif.manifest.json",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "pretest": "sf-compile-test",
     "reformat": "prettier --config .prettierrc --write './*.{js,json,md}' './**/*.{ts,json,md}'",
-    "test": "sf-test",
+    "test": "wireit",
     "test:command-reference": "wireit",
     "test:compile": "wireit",
     "test:deprecation-policy": "wireit",

src/commands/org/login/device.ts

@@ -72,11 +72,11 @@ export default class LoginDevice extends AuthBaseCommand<DeviceLoginResult> {
     if (await this.shouldExitCommand(false)) return {};
 
     const oauthConfig: OAuth2Config = {
-      loginUrl: await Common.resolveLoginUrl(get(flags.instanceurl, 'href', null) as Optional<string>),
-      clientId: flags.clientid as string,
+      loginUrl: await Common.resolveLoginUrl(get(flags['instance-url'], 'href', null) as Optional<string>),
+      clientId: flags['client-id'] as string,
     };
 
-    if (flags.clientid) {
+    if (flags['client-id']) {
       oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
     }
 

src/commands/org/login/jwt.ts

@@ -92,7 +92,7 @@ export default class LoginJwt extends AuthBaseCommand<AuthFields> {
     try {
       const authInfo = await this.initAuthInfo();
       await authInfo.handleAliasAndDefaultSettings({
-        alias: flags.alias as string,
+        alias: flags.alias,
         setDefault: flags['set-default'],
         setDefaultDevHub: flags['set-default-dev-hub'],
       });

src/commands/org/login/sfdx-url.ts

@@ -85,7 +85,7 @@ export default class LoginSfdxUrl extends AuthBaseCommand<AuthFields> {
     await authInfo.save();
 
     await authInfo.handleAliasAndDefaultSettings({
-      alias: flags.alias as string,
+      alias: flags.alias,
       setDefault: flags['set-default'],
       setDefaultDevHub: flags['set-default-dev-hub'],
     });

src/commands/org/login/web.ts

@@ -95,10 +95,10 @@ export default class LoginWeb extends AuthBaseCommand<AuthFields> {
 
     const oauthConfig: OAuth2Config = {
       loginUrl: await Common.resolveLoginUrl(get(flags['instance-url'], 'href', null) as Optional<string>),
-      clientId: flags.clientid as string,
+      clientId: flags['client-id'] as string,
     };
 
-    if (flags.clientid) {
+    if (flags['client-id']) {
       oauthConfig.clientSecret = await this.askForClientSecret(flags['disable-masking']);
     }