Skip to content

Commit 9b2812a

Browse files
authored
Merge pull request ActiveState#3375 from ActiveState/DX-2922
Logout if JWT request failed
2 parents e41f5ff + 94dbc95 commit 9b2812a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmd/state/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ func run(args []string, isInteractive bool, cfg *config.Instance, out output.Out
169169
jwt, err := svcmodel.GetJWT(context.Background())
170170
if err != nil {
171171
multilog.Critical("Could not get JWT: %v", errs.JoinMessage(err))
172+
}
173+
if err != nil || jwt == nil {
174+
// Could not authenticate; user got logged out
175+
auth.Logout()
172176
} else {
173177
auth.UpdateSession(jwt)
174178
}

pkg/platform/model/svc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ func (m *SvcModel) GetJWT(ctx context.Context) (*mono_models.JWT, error) {
190190
return nil, errs.Wrap(err, "Error sending messages request")
191191
}
192192

193-
jwt := mono_models.JWT{}
193+
jwt := &mono_models.JWT{}
194194
err := json.Unmarshal(resp.Payload, &jwt)
195195
if err != nil {
196196
return nil, errs.Wrap(err, "Error unmarshaling JWT")
197197
}
198198

199-
return &jwt, nil
199+
return jwt, nil
200200
}
201201

202202
func jsonFromMap(m map[string]interface{}) string {

0 commit comments

Comments
 (0)