Skip to content

Commit 93970a5

Browse files
authored
RSDK-9452 - require logged in status for module generation (viamrobotics#4724)
1 parent 1a27697 commit 93970a5

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

cli/app.go

-1
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,6 @@ var app = &cli.App{
18931893
Name: "status",
18941894
Usage: "display part status",
18951895
UsageText: createUsageText("machines part status", []string{generalFlagPart}, true, false),
1896-
// TODO(RSDK-9286) do we need to ask for og and location and machine and part here?
18971896
Flags: []cli.Flag{
18981897
&AliasStringFlag{
18991898
cli.StringFlag{

cli/module_generate.go

+9
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ func GenerateModuleAction(cCtx *cli.Context, args generateModuleArgs) error {
7070
}
7171

7272
func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModuleArgs) error {
73+
if err := c.ensureLoggedIn(); err != nil {
74+
return err
75+
}
7376
var newModule *modulegen.ModuleInputs
7477
var err error
7578

@@ -326,6 +329,12 @@ func wrapResolveOrg(cCtx *cli.Context, c *viamClient, newModule *modulegen.Modul
326329
return nil
327330
}
328331

332+
// TODO(RSDK-9758) - this logic will never be relevant currently because we're now checking if
333+
// we're logged in at the first opportunity in `viam module generate`, and returning an error if
334+
// not. However, I (ethan) am leaving this logic here because we will likely want to revisit if
335+
// and how to use it more broadly (not just for `viam module generate` but for _all_ CLI commands),
336+
// and because disentangling it immediately may be complicated and delay the current attempt to
337+
// solve the problems this causes (see RSDK-9452).
329338
func catchResolveOrgErr(cCtx *cli.Context, c *viamClient, newModule *modulegen.ModuleInputs, caughtErr error) error {
330339
if strings.Contains(caughtErr.Error(), "not logged in") || strings.Contains(caughtErr.Error(), "error while refreshing token") {
331340
originalWriter := cCtx.App.Writer

0 commit comments

Comments
 (0)