Merge pull request #2035 from sigurdm/logout_command

Add logout command

Author: sigurdm

lib/src/command/logout.dart

@@ -0,0 +1,21 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:async';
+
+import '../command.dart';
+import '../oauth2.dart' as oauth2;
+
+/// Handles the `logout` pub command.
+class LogoutCommand extends PubCommand {
+  String get name => "logout";
+  String get description => 'Log out of pub.dartlang.org.';
+  String get invocation => 'pub logout';
+
+  LogoutCommand();
+
+  Future run() async {
+    oauth2.logout(cache);
+  }
+}

lib/src/command_runner.dart

@@ -18,6 +18,7 @@ import 'command/get.dart';
 import 'command/global.dart';
 import 'command/lish.dart';
 import 'command/list_package_dirs.dart';
+import 'command/logout.dart';
 import 'command/run.dart';
 import 'command/serve.dart';
 import 'command/upgrade.dart';
@@ -104,6 +105,7 @@ class PubCommandRunner extends CommandRunner {
     addCommand(ServeCommand());
     addCommand(UpgradeCommand());
     addCommand(UploaderCommand());
+    addCommand(LogoutCommand());
     addCommand(VersionCommand());
   }
 

lib/src/oauth2.dart

@@ -73,6 +73,19 @@ void _clearCredentials(SystemCache cache) {
   if (entryExists(credentialsFile)) deleteEntry(credentialsFile);
 }
 
+/// Try to delete the cached credentials.
+void logout(SystemCache cache) {
+  var credentialsFile = _credentialsFile(cache);
+  if (entryExists(_credentialsFile(cache))) {
+    log.message("Logging out of pub.dartlang.org.");
+    log.message("Deleting $credentialsFile");
+    _clearCredentials(cache);
+  } else {
+    log.message(
+        "No existing credentials file $credentialsFile. Cannot log out.");
+  }
+}
+
 /// Asynchronously passes an OAuth2 [Client] to [fn], and closes the client when
 /// the [Future] returned by [fn] completes.
 ///

test/oauth2/logout_test.dart

@@ -0,0 +1,36 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:shelf_test_handler/shelf_test_handler.dart';
+import 'package:test/test.dart';
+
+import '../descriptor.dart' as d;
+import '../test_pub.dart';
+
+main() {
+  test('with an existing credentials.json, deletes it.', () async {
+    var server = await ShelfTestServer.create();
+    await d
+        .credentialsFile(server, 'access token',
+            refreshToken: 'refresh token',
+            expiration: DateTime.now().add(Duration(hours: 1)))
+        .create();
+
+    await runPub(
+        args: ['logout'],
+        output: contains('Logging out of pub.dartlang.org.'),
+        exitCode: 0);
+
+    await d.dir(cachePath, [d.nothing('credentials.json')]).validate();
+  });
+  test('with no existing credentials.json, notifies.', () async {
+    await d.dir(cachePath, [d.nothing('credentials.json')]).create();
+    await runPub(
+        args: ['logout'],
+        output: contains('No existing credentials file'),
+        exitCode: 0);
+
+    await d.dir(cachePath, [d.nothing('credentials.json')]).validate();
+  });
+}

test/pub_test.dart

@@ -35,6 +35,7 @@ main() {
           get         Get the current package's dependencies.
           global      Work with global packages.
           help        Display help information for pub.
+          logout      Log out of pub.dartlang.org.
           publish     Publish the current package to pub.dartlang.org.
           run         Run an executable from a package.
           upgrade     Upgrade the current package's dependencies to latest versions.