correct eslint errors
This commit is contained in:
Jacob Overgaard
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable local-rules/umb-class-prefix */
|
||||
/*
|
||||
* Copyright 2017 Google Inc.
|
||||
*
|
||||
@@ -12,28 +13,28 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import {AuthorizationRequest} from './authorization_request';
|
||||
import {AuthorizationRequestHandler, AuthorizationRequestResponse} from './authorization_request_handler';
|
||||
import {AuthorizationError, AuthorizationResponse} from './authorization_response'
|
||||
import {AuthorizationServiceConfiguration} from './authorization_service_configuration';
|
||||
import {Crypto, DefaultCrypto} from './crypto_utils';
|
||||
import {log} from './logger';
|
||||
import {BasicQueryStringUtils} from './query_string_utils';
|
||||
import {LocalStorageBackend, StorageBackend} from './storage';
|
||||
import {LocationLike} from './types';
|
||||
|
||||
import { AuthorizationRequest } from './authorization_request.js';
|
||||
import type { AuthorizationRequestResponse } from './authorization_request_handler.js';
|
||||
import { AuthorizationRequestHandler } from './authorization_request_handler.js';
|
||||
import { AuthorizationError, AuthorizationResponse } from './authorization_response.js';
|
||||
import type { AuthorizationServiceConfiguration } from './authorization_service_configuration.js';
|
||||
import type { Crypto } from './crypto_utils.js';
|
||||
import { DefaultCrypto } from './crypto_utils.js';
|
||||
import { log } from './logger.js';
|
||||
import { BasicQueryStringUtils } from './query_string_utils.js';
|
||||
import type { StorageBackend } from './storage.js';
|
||||
import { LocalStorageBackend } from './storage.js';
|
||||
import type { LocationLike } from './types.js';
|
||||
|
||||
/** key for authorization request. */
|
||||
const authorizationRequestKey =
|
||||
(handle: string) => {
|
||||
return `${handle}_appauth_authorization_request`;
|
||||
}
|
||||
const authorizationRequestKey = (handle: string) => {
|
||||
return `${handle}_appauth_authorization_request`;
|
||||
};
|
||||
|
||||
/** key for authorization service configuration */
|
||||
const authorizationServiceConfigurationKey =
|
||||
(handle: string) => {
|
||||
return `${handle}_appauth_authorization_service_configuration`;
|
||||
}
|
||||
const authorizationServiceConfigurationKey = (handle: string) => {
|
||||
return `${handle}_appauth_authorization_service_configuration`;
|
||||
};
|
||||
|
||||
/** key in local storage which represents the current authorization request. */
|
||||
const AUTHORIZATION_REQUEST_HANDLE_KEY = 'appauth_current_authorization_request';
|
||||
@@ -43,105 +44,103 @@ const AUTHORIZATION_REQUEST_HANDLE_KEY = 'appauth_current_authorization_request'
|
||||
* redirect based code flow.
|
||||
*/
|
||||
export class RedirectRequestHandler extends AuthorizationRequestHandler {
|
||||
constructor(
|
||||
// use the provided storage backend
|
||||
// or initialize local storage with the default storage backend which
|
||||
// uses window.localStorage
|
||||
public storageBackend: StorageBackend = new LocalStorageBackend(),
|
||||
utils = new BasicQueryStringUtils(),
|
||||
public locationLike: LocationLike = window.location,
|
||||
crypto: Crypto = new DefaultCrypto()) {
|
||||
super(utils, crypto);
|
||||
}
|
||||
constructor(
|
||||
// use the provided storage backend
|
||||
// or initialize local storage with the default storage backend which
|
||||
// uses window.localStorage
|
||||
public storageBackend: StorageBackend = new LocalStorageBackend(),
|
||||
utils = new BasicQueryStringUtils(),
|
||||
public locationLike: LocationLike = window.location,
|
||||
crypto: Crypto = new DefaultCrypto(),
|
||||
) {
|
||||
super(utils, crypto);
|
||||
}
|
||||
|
||||
performAuthorizationRequest(
|
||||
configuration: AuthorizationServiceConfiguration,
|
||||
request: AuthorizationRequest) {
|
||||
const handle = this.crypto.generateRandom(10);
|
||||
performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest) {
|
||||
const handle = this.crypto.generateRandom(10);
|
||||
|
||||
// before you make request, persist all request related data in local storage.
|
||||
const persisted = Promise.all([
|
||||
this.storageBackend.setItem(AUTHORIZATION_REQUEST_HANDLE_KEY, handle),
|
||||
// Calling toJson() adds in the code & challenge when possible
|
||||
request.toJson().then(
|
||||
result =>
|
||||
this.storageBackend.setItem(authorizationRequestKey(handle), JSON.stringify(result))),
|
||||
this.storageBackend.setItem(
|
||||
authorizationServiceConfigurationKey(handle), JSON.stringify(configuration.toJson())),
|
||||
]);
|
||||
// before you make request, persist all request related data in local storage.
|
||||
const persisted = Promise.all([
|
||||
this.storageBackend.setItem(AUTHORIZATION_REQUEST_HANDLE_KEY, handle),
|
||||
// Calling toJson() adds in the code & challenge when possible
|
||||
request
|
||||
.toJson()
|
||||
.then((result) => this.storageBackend.setItem(authorizationRequestKey(handle), JSON.stringify(result))),
|
||||
this.storageBackend.setItem(authorizationServiceConfigurationKey(handle), JSON.stringify(configuration.toJson())),
|
||||
]);
|
||||
|
||||
persisted.then(() => {
|
||||
// make the redirect request
|
||||
let url = this.buildRequestUrl(configuration, request);
|
||||
log('Making a request to ', request, url);
|
||||
this.locationLike.assign(url);
|
||||
});
|
||||
}
|
||||
persisted.then(() => {
|
||||
// make the redirect request
|
||||
const url = this.buildRequestUrl(configuration, request);
|
||||
log('Making a request to ', request, url);
|
||||
this.locationLike.assign(url);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempts to introspect the contents of storage backend and completes the
|
||||
* request.
|
||||
*/
|
||||
protected completeAuthorizationRequest(): Promise<AuthorizationRequestResponse|null> {
|
||||
// TODO(rahulrav@): handle authorization errors.
|
||||
return this.storageBackend.getItem(AUTHORIZATION_REQUEST_HANDLE_KEY).then(handle => {
|
||||
if (handle) {
|
||||
// we have a pending request.
|
||||
// fetch authorization request, and check state
|
||||
return this.storageBackend
|
||||
.getItem(authorizationRequestKey(handle))
|
||||
// requires a corresponding instance of result
|
||||
// TODO(rahulrav@): check for inconsitent state here
|
||||
.then(result => JSON.parse(result!))
|
||||
.then(json => new AuthorizationRequest(json))
|
||||
.then(request => {
|
||||
// check redirect_uri and state
|
||||
let currentUri = `${this.locationLike.origin}${this.locationLike.pathname}`;
|
||||
let queryParams = this.utils.parse(this.locationLike, true /* use hash */);
|
||||
let state: string|undefined = queryParams['state'];
|
||||
let code: string|undefined = queryParams['code'];
|
||||
let error: string|undefined = queryParams['error'];
|
||||
log('Potential authorization request ', currentUri, queryParams, state, code, error);
|
||||
let shouldNotify = state === request.state;
|
||||
let authorizationResponse: AuthorizationResponse|null = null;
|
||||
let authorizationError: AuthorizationError|null = null;
|
||||
if (shouldNotify) {
|
||||
if (error) {
|
||||
// get additional optional info.
|
||||
let errorUri = queryParams['error_uri'];
|
||||
let errorDescription = queryParams['error_description'];
|
||||
authorizationError = new AuthorizationError({
|
||||
error: error,
|
||||
error_description: errorDescription,
|
||||
error_uri: errorUri,
|
||||
state: state
|
||||
});
|
||||
} else {
|
||||
authorizationResponse = new AuthorizationResponse({code: code, state: state});
|
||||
}
|
||||
// cleanup state
|
||||
return Promise
|
||||
.all([
|
||||
this.storageBackend.removeItem(AUTHORIZATION_REQUEST_HANDLE_KEY),
|
||||
this.storageBackend.removeItem(authorizationRequestKey(handle)),
|
||||
this.storageBackend.removeItem(authorizationServiceConfigurationKey(handle))
|
||||
])
|
||||
.then(() => {
|
||||
log('Delivering authorization response');
|
||||
return {
|
||||
request: request,
|
||||
response: authorizationResponse,
|
||||
error: authorizationError
|
||||
} as AuthorizationRequestResponse;
|
||||
});
|
||||
} else {
|
||||
log('Mismatched request (state and request_uri) dont match.');
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
* Attempts to introspect the contents of storage backend and completes the
|
||||
* request.
|
||||
*/
|
||||
protected completeAuthorizationRequest(): Promise<AuthorizationRequestResponse | null> {
|
||||
// TODO(rahulrav@): handle authorization errors.
|
||||
return this.storageBackend.getItem(AUTHORIZATION_REQUEST_HANDLE_KEY).then((handle) => {
|
||||
if (handle) {
|
||||
// we have a pending request.
|
||||
// fetch authorization request, and check state
|
||||
return (
|
||||
this.storageBackend
|
||||
.getItem(authorizationRequestKey(handle))
|
||||
// requires a corresponding instance of result
|
||||
// TODO(rahulrav@): check for inconsitent state here
|
||||
.then((result) => JSON.parse(result!))
|
||||
.then((json) => new AuthorizationRequest(json))
|
||||
.then((request) => {
|
||||
// check redirect_uri and state
|
||||
const currentUri = `${this.locationLike.origin}${this.locationLike.pathname}`;
|
||||
const queryParams = this.utils.parse(this.locationLike, true /* use hash */);
|
||||
const state: string | undefined = queryParams['state'];
|
||||
const code: string | undefined = queryParams['code'];
|
||||
const error: string | undefined = queryParams['error'];
|
||||
log('Potential authorization request ', currentUri, queryParams, state, code, error);
|
||||
const shouldNotify = state === request.state;
|
||||
let authorizationResponse: AuthorizationResponse | null = null;
|
||||
let authorizationError: AuthorizationError | null = null;
|
||||
if (shouldNotify) {
|
||||
if (error) {
|
||||
// get additional optional info.
|
||||
const errorUri = queryParams['error_uri'];
|
||||
const errorDescription = queryParams['error_description'];
|
||||
authorizationError = new AuthorizationError({
|
||||
error: error,
|
||||
error_description: errorDescription,
|
||||
error_uri: errorUri,
|
||||
state: state,
|
||||
});
|
||||
} else {
|
||||
authorizationResponse = new AuthorizationResponse({ code: code, state: state });
|
||||
}
|
||||
// cleanup state
|
||||
return Promise.all([
|
||||
this.storageBackend.removeItem(AUTHORIZATION_REQUEST_HANDLE_KEY),
|
||||
this.storageBackend.removeItem(authorizationRequestKey(handle)),
|
||||
this.storageBackend.removeItem(authorizationServiceConfigurationKey(handle)),
|
||||
]).then(() => {
|
||||
log('Delivering authorization response');
|
||||
return {
|
||||
request: request,
|
||||
response: authorizationResponse,
|
||||
error: authorizationError,
|
||||
} as AuthorizationRequestResponse;
|
||||
});
|
||||
} else {
|
||||
log('Mismatched request (state and request_uri) dont match.');
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
})
|
||||
);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,7 +85,10 @@ export class TokenRequest {
|
||||
// copy over extras
|
||||
if (this.extras) {
|
||||
for (const extra in this.extras) {
|
||||
if (Object.prototype.hasOwnProperty.call(this.extras, extra) && !map.hasOwnProperty(extra)) {
|
||||
if (
|
||||
Object.prototype.hasOwnProperty.call(this.extras, extra) &&
|
||||
!Object.prototype.hasOwnProperty.call(map, extra)
|
||||
) {
|
||||
// check before inserting to requestMap
|
||||
map[extra] = this.extras[extra];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user