Always purge NC token when revoking

daemon/rpc_logout.go

@@ -95,7 +95,7 @@ func (r *RPC) Logout(ctx context.Context, in *pb.LogoutRequest) (payload *pb.Pay
 		}
 	}
 
-	if !r.ncClient.Revoke(internal.IsDevEnv(string(r.environment))) {
+	if !r.ncClient.Revoke() {
 		log.Println(internal.WarningPrefix, "error revoking NC token")
 	}
 

daemon/rpc_logout_test.go

@@ -23,8 +23,8 @@ type mockNC struct {
 	nc.NotificationClient
 }
 
-func (mockNC) Stop() error      { return nil }
-func (mockNC) Revoke(bool) bool { return true }
+func (mockNC) Stop() error  { return nil }
+func (mockNC) Revoke() bool { return true }
 
 type mockApi struct {
 	core.CombinedAPI

daemon/rpc_set_defaults.go

@@ -31,7 +31,7 @@ func (r *RPC) SetDefaults(ctx context.Context, in *pb.Empty) (*pb.Payload, error
 	}
 
 	if internal.IsDevEnv(string(r.environment)) {
-		if !r.ncClient.Revoke(true) {
+		if !r.ncClient.Revoke() {
 			log.Println(internal.WarningPrefix, "error revoking token")
 		}
 	}

nc/nc.go

@@ -103,7 +103,7 @@ type AcknowledgementPayload struct {
 type NotificationClient interface {
 	Start() error
 	Stop() error
-	Revoke(bool) bool
+	Revoke() bool
 }
 
 type ClientBuilder interface {
@@ -486,7 +486,7 @@ func (c *Client) Stop() error {
 }
 
 // Revoke revokes the NC communication token
-func (c *Client) Revoke(purgeSession bool) bool {
+func (c *Client) Revoke() bool {
 	c.startMu.Lock()
 	defer c.startMu.Unlock()
 
@@ -495,8 +495,7 @@ func (c *Client) Revoke(purgeSession bool) bool {
 		return false
 	}
 
-	log.Println(logPrefix, "revoking token, purgeSession:", purgeSession)
-	ok, err := c.credsFetcher.RevokeCredentials(purgeSession)
+	ok, err := c.credsFetcher.RevokeCredentials(true)
 	if ok {
 		log.Println(logPrefix, "token revoked successfully")
 		return true