Skip to content

Prototype for moving internally used types to dedicated internal classes in Auth #928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: minimal-rtdb-option-2-b
Choose a base branch
from
Draft

Prototype for moving internally used types to dedicated internal classes in Auth #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2dd4cad
Move internally used types to dedicated classes
MathBunny Jul 6, 2020
c6918b6
Move internally used types to dedicated classes
MathBunny Jul 6, 2020
96fc776
Add progress
MathBunny Jul 6, 2020
e015eec
Fix merge conflicts, pull from origin/master
MathBunny Jul 9, 2020
5606241
ServiceAccountCredential is internal
MathBunny Jul 9, 2020
22ee073
Add Auth internal
MathBunny Jul 9, 2020
4ecbafc
Resolve merge conflicts
MathBunny Jul 9, 2020
a15a0be
Remove overload
MathBunny Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions src/auth/auth-api-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,33 @@ import * as validator from '../utils/validator';

import {deepCopy, deepExtend} from '../utils/deep-copy';
import {
UserIdentifier, isUidIdentifier, isEmailIdentifier, isPhoneIdentifier,
isProviderIdentifier, UidIdentifier, EmailIdentifier, PhoneIdentifier,
UserIdentifier, UidIdentifier, EmailIdentifier, PhoneIdentifier,
ProviderIdentifier,
} from './identifier';
import { isUidIdentifier, isEmailIdentifier, isPhoneIdentifier,
isProviderIdentifier} from './identifier-internal';
import {FirebaseApp} from '../firebase-app';
import {AuthClientErrorCode, FirebaseAuthError} from '../utils/error';
import {
ApiSettings, AuthorizedHttpClient, HttpRequestConfig, HttpError,
} from '../utils/api-request';
import {CreateRequest, UpdateRequest} from './user-record';
import {
UserImportBuilder, UserImportOptions, UserImportRecord,
UserImportResult, AuthFactorInfo, convertMultiFactorInfoToServerFormat,
UserImportOptions, UserImportRecord, UserImportResult
} from './user-import-builder';
import {UserImportBuilder, AuthFactorInfo, convertMultiFactorInfoToServerFormat} from './user-import-builder-internal';
import * as utils from '../utils/index';
import {ActionCodeSettings, ActionCodeSettingsBuilder} from './action-code-settings-builder';
import {
SAMLConfig, OIDCConfig, OIDCConfigServerResponse, SAMLConfigServerResponse,
OIDCConfigServerRequest, SAMLConfigServerRequest, AuthProviderConfig,
AuthProviderConfig,
OIDCUpdateAuthProviderRequest, SAMLUpdateAuthProviderRequest,
} from './auth-config';
import {Tenant, TenantOptions, TenantServerResponse} from './tenant';
import {
SAMLConfig, OIDCConfig, OIDCConfigServerResponse, SAMLConfigServerResponse,
OIDCConfigServerRequest, SAMLConfigServerRequest
} from './auth-config-internal';
import {TenantOptions, TenantServerResponse} from './tenant';
import {TenantImpl} from './tenant-internal';


/** Firebase Auth request header. */
Expand Down Expand Up @@ -1806,7 +1811,7 @@ const UPDATE_TENANT = new ApiSettings('/tenants/{tenantId}?updateMask={updateMas
.setResponseValidator((response: any) => {
// Response should always contain at least the tenant name.
if (!validator.isNonEmptyString(response.name) ||
!Tenant.getTenantIdFromResourceName(response.name)) {
!TenantImpl.getTenantIdFromResourceName(response.name)) {
throw new FirebaseAuthError(
AuthClientErrorCode.INTERNAL_ERROR,
'INTERNAL ASSERT FAILED: Unable to update tenant',
Expand Down Expand Up @@ -1841,7 +1846,7 @@ const CREATE_TENANT = new ApiSettings('/tenants', 'POST')
.setResponseValidator((response: any) => {
// Response should always contain at least the tenant name.
if (!validator.isNonEmptyString(response.name) ||
!Tenant.getTenantIdFromResourceName(response.name)) {
!TenantImpl.getTenantIdFromResourceName(response.name)) {
throw new FirebaseAuthError(
AuthClientErrorCode.INTERNAL_ERROR,
'INTERNAL ASSERT FAILED: Unable to create new tenant',
Expand Down Expand Up @@ -1959,7 +1964,7 @@ export class AuthRequestHandler extends AbstractAuthRequestHandler {
public createTenant(tenantOptions: TenantOptions): Promise<TenantServerResponse> {
try {
// Construct backend request.
const request = Tenant.buildServerRequest(tenantOptions, true);
const request = TenantImpl.buildServerRequest(tenantOptions, true);
return this.invokeRequestHandler(this.tenantMgmtResourceBuilder, CREATE_TENANT, request)
.then((response: any) => {
return response as TenantServerResponse;
Expand All @@ -1982,7 +1987,7 @@ export class AuthRequestHandler extends AbstractAuthRequestHandler {
}
try {
// Construct backend request.
const request = Tenant.buildServerRequest(tenantOptions, false);
const request = TenantImpl.buildServerRequest(tenantOptions, false);
const updateMask = utils.generateUpdateMask(request);
return this.invokeRequestHandler(this.tenantMgmtResourceBuilder, UPDATE_TENANT, request,
{tenantId, updateMask: updateMask.join(',')})
Expand Down
Loading