Skip to content

Commit

Permalink
Remove Cloud Print access token code.
Browse files Browse the repository at this point in the history
No longer needed since Cloud Print is no longer active.

Bug: 1162164
Change-Id: I16eb53c5db3737aa6f1a8776a62d50b6e24c70c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3562561
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#988851}
  • Loading branch information
leizleiz authored and Chromium LUCI CQ committed Apr 5, 2022
1 parent 02fd21e commit a8e3818
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 102 deletions.
9 changes: 0 additions & 9 deletions chrome/browser/resources/print_preview/native_layer_cros.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ export type PrintServersConfig = {
* printing system layer.
*/
export interface NativeLayerCros {
/**
* Requests access token for cloud print requests for DEVICE origin.
*/
getAccessToken(): Promise<string>;

/**
* Requests the destination's end user license information. Returns a promise
* that will be resolved with the destination's EULA URL if obtained
Expand Down Expand Up @@ -89,10 +84,6 @@ export interface NativeLayerCros {
}

export class NativeLayerCrosImpl implements NativeLayerCros {
getAccessToken() {
return sendWithPromise('getAccessToken');
}

getEulaUrl(destinationId: string) {
return sendWithPromise('getEulaUrl', destinationId);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/device_identity/device_oauth2_token_service.h"
#include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
Expand Down Expand Up @@ -67,49 +65,6 @@ base::Value PrintServersConfigMojomToValue(

} // namespace

class PrintPreviewHandlerChromeOS::AccessTokenService
: public OAuth2AccessTokenManager::Consumer {
public:
AccessTokenService() : OAuth2AccessTokenManager::Consumer("print_preview") {}
AccessTokenService(const AccessTokenService&) = delete;
AccessTokenService& operator=(const AccessTokenService&) = delete;
~AccessTokenService() override = default;

void RequestToken(base::OnceCallback<void(const std::string&)> callback) {
// There can only be one pending request at a time. See
// cloud_print_interface_js.js.
const signin::ScopeSet scopes{cloud_devices::kCloudPrintAuthScope};
DCHECK(!device_request_callback_);

DeviceOAuth2TokenService* token_service =
DeviceOAuth2TokenServiceFactory::Get();
device_request_ = token_service->StartAccessTokenRequest(scopes, this);
device_request_callback_ = std::move(callback);
}

void OnGetTokenSuccess(
const OAuth2AccessTokenManager::Request* request,
const OAuth2AccessTokenConsumer::TokenResponse& token_response) override {
OnServiceResponse(request, token_response.access_token);
}

void OnGetTokenFailure(const OAuth2AccessTokenManager::Request* request,
const GoogleServiceAuthError& error) override {
OnServiceResponse(request, std::string());
}

private:
void OnServiceResponse(const OAuth2AccessTokenManager::Request* request,
const std::string& access_token) {
DCHECK_EQ(request, device_request_.get());
std::move(device_request_callback_).Run(access_token);
device_request_.reset();
}

std::unique_ptr<OAuth2AccessTokenManager::Request> device_request_;
base::OnceCallback<void(const std::string&)> device_request_callback_;
};

PrintPreviewHandlerChromeOS::PrintPreviewHandlerChromeOS() {
#if BUILDFLAG(IS_CHROMEOS_ASH)
DCHECK(crosapi::CrosapiManager::IsInitialized());
Expand All @@ -132,10 +87,6 @@ void PrintPreviewHandlerChromeOS::RegisterMessages() {
"setupPrinter",
base::BindRepeating(&PrintPreviewHandlerChromeOS::HandlePrinterSetup,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"getAccessToken",
base::BindRepeating(&PrintPreviewHandlerChromeOS::HandleGetAccessToken,
base::Unretained(this)));
web_ui()->RegisterMessageCallback(
"grantExtensionPrinterAccess",
base::BindRepeating(
Expand Down Expand Up @@ -220,21 +171,6 @@ void PrintPreviewHandlerChromeOS::HandlePrinterSetup(
weak_factory_.GetWeakPtr(), callback_id, printer_name));
}

void PrintPreviewHandlerChromeOS::HandleGetAccessToken(
const base::Value::List& args) {
DCHECK(args[0].is_string());

std::string callback_id = args[0].GetString();
DCHECK(!callback_id.empty());
MaybeAllowJavascript();

if (!token_service_)
token_service_ = std::make_unique<AccessTokenService>();
token_service_->RequestToken(
base::BindOnce(&PrintPreviewHandlerChromeOS::SendAccessToken,
weak_factory_.GetWeakPtr(), callback_id));
}

void PrintPreviewHandlerChromeOS::HandleGetEulaUrl(
const base::Value::List& args) {
CHECK_EQ(2U, args.size());
Expand All @@ -249,14 +185,6 @@ void PrintPreviewHandlerChromeOS::HandleGetEulaUrl(
weak_factory_.GetWeakPtr(), callback_id));
}

void PrintPreviewHandlerChromeOS::SendAccessToken(
const std::string& callback_id,
const std::string& access_token) {
VLOG(1) << "Get getAccessToken finished";
ResolveJavascriptCallback(base::Value(callback_id),
base::Value(access_token));
}

void PrintPreviewHandlerChromeOS::SendEulaUrl(const std::string& callback_id,
const std::string& eula_url) {
VLOG(1) << "Get PPD license finished";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_CHROMEOS_H_
#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_CHROMEOS_H_

#include <memory>
#include <string>

#include "base/gtest_prod_util.h"
Expand Down Expand Up @@ -60,7 +59,6 @@ class PrintPreviewHandlerChromeOS : public content::WebUIMessageHandler,
#if BUILDFLAG(IS_CHROMEOS_ASH)
friend class TestPrintServersManager;
#endif
class AccessTokenService;

PrintPreviewHandler* GetPrintPreviewHandler();

Expand All @@ -73,16 +71,9 @@ class PrintPreviewHandlerChromeOS : public content::WebUIMessageHandler,
// Performs printer setup. First element of |args| is the printer name.
void HandlePrinterSetup(const base::Value::List& args);

// Generates new token and sends back to UI.
void HandleGetAccessToken(const base::Value::List& args);

// Gets the EULA URL.
void HandleGetEulaUrl(const base::Value::List& args);

// Send OAuth2 access token.
void SendAccessToken(const std::string& callback_id,
const std::string& access_token);

// Send the EULA URL;
void SendEulaUrl(const std::string& callback_id, const std::string& eula_url);

Expand Down Expand Up @@ -114,9 +105,6 @@ class PrintPreviewHandlerChromeOS : public content::WebUIMessageHandler,
// Gets the list of print servers and fetching mode.
void HandleGetPrintServersConfig(const base::Value::List& args);

// Holds token service to get OAuth2 access tokens.
std::unique_ptr<AccessTokenService> token_service_;

mojo::Receiver<crosapi::mojom::PrintServerObserver> receiver_{this};

// Used to transmit mojo interface method calls to ash chrome.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ export class NativeLayerCrosStub extends TestBrowserProxy implements
Promise.resolve(assert(this.setupPrinterResponse_!));
}

getAccessToken() {
return Promise.resolve('123');
}

grantExtensionPrinterAccess(provisionalId: string) {
return Promise.resolve({
extensionId: 'abc123',
Expand Down
3 changes: 0 additions & 3 deletions components/cloud_devices/common/cloud_devices_urls.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

namespace cloud_devices {

const char kCloudPrintAuthScope[] =
"https://www.googleapis.com/auth/cloudprint";

namespace {

// Url must not be matched by "urls" section of
Expand Down
2 changes: 0 additions & 2 deletions components/cloud_devices/common/cloud_devices_urls.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

namespace cloud_devices {

extern const char kCloudPrintAuthScope[];

GURL GetCloudPrintURL();
GURL GetCloudPrintRelativeURL(const std::string& relative_path);
GURL GetCloudPrintAddAccountURL();
Expand Down

0 comments on commit a8e3818

Please sign in to comment.