Skip to content

Commit eb26241

Browse files
committed
Add react native persistence class (#2955)
Added React Native persistence class
1 parent 2a19fc1 commit eb26241

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

packages-exp/auth-exp/src/core/persistence/react_native.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
/**
22
* @license
3+
<<<<<<< HEAD
34
* Copyright 2019 Google LLC
5+
=======
6+
* Copyright 2019 Google Inc.
7+
>>>>>>> 6b951a1c... Add react native persistence class (#2955)
48
*
59
* Licensed under the Apache License, Version 2.0 (the "License");
610
* you may not use this file except in compliance with the License.
@@ -14,7 +18,6 @@
1418
* See the License for the specific language governing permissions and
1519
* limitations under the License.
1620
*/
17-
1821
import { ReactNativeAsyncStorage } from '@firebase/auth-types-exp';
1922

2023
import {

packages-exp/auth-types-exp/index.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18+
<<<<<<< HEAD
1819
import {
1920
CompleteFn,
2021
ErrorFn,
@@ -359,10 +360,13 @@ export interface PhoneInfoOptions {
359360
// multiFactorHint?: MultiFactorInfo;
360361
}
361362

363+
=======
364+
>>>>>>> 6b951a1c... Add react native persistence class (#2955)
362365
export interface ReactNativeAsyncStorage {
363366
setItem(key: string, value: string): Promise<void>;
364367
getItem(key: string): Promise<string | null>;
365368
removeItem(key: string): Promise<void>;
369+
<<<<<<< HEAD
366370
}
367371

368372
/**
@@ -410,4 +414,6 @@ export interface UserInfo {
410414
export interface UserMetadata {
411415
readonly creationTime?: string;
412416
readonly lastSignInTime?: string;
417+
=======
418+
>>>>>>> 6b951a1c... Add react native persistence class (#2955)
413419
}

yarn.lock

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12592,6 +12592,17 @@ [email protected]:
1259212592
rollup-pluginutils "2.8.2"
1259312593
tslib "1.10.0"
1259412594

12595+
12596+
version "0.26.0"
12597+
resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.26.0.tgz#cee2b44d51d9623686656d76dc30a73c4de91672"
12598+
integrity sha512-lUK7XZVG77tu8dmv1L/0LZFlavED/5Yo6e4iMMl6fdox/yKdj4IFRRPPJEXNdmEaT1nDQQeCi7b5IwKHffMNeg==
12599+
dependencies:
12600+
find-cache-dir "^3.2.0"
12601+
fs-extra "8.1.0"
12602+
resolve "1.15.1"
12603+
rollup-pluginutils "2.8.2"
12604+
tslib "1.10.0"
12605+
1259512606
1259612607
version "0.27.0"
1259712608
resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511"
@@ -12613,6 +12624,13 @@ [email protected]:
1261312624
serialize-javascript "^2.1.2"
1261412625
uglify-js "^3.4.9"
1261512626

12627+
12628+
version "2.8.1"
12629+
resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
12630+
integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
12631+
dependencies:
12632+
estree-walker "^0.6.1"
12633+
1261612634
[email protected], rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
1261712635
version "2.8.2"
1261812636
resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"

0 commit comments

Comments
 (0)