Skip to content

Commit 8549685

Browse files
triniwiztriniwiz
committed
feat: custom auth providers
fixes : #28 fixes: #27
1 parent a3eee24 commit 8549685

File tree

30 files changed

+316
-53
lines changed

30 files changed

+316
-53
lines changed

‎apps/demo/src/plugin-demos/firebase-auth.ts‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Observable, EventData, Page, fromObject } from '@nativescript/core';
22
import { DemoSharedFirebaseAuth } from '@demo/shared';
33
import { firebase, Firebase } from '@nativescript/firebase-core';
44
import '@nativescript/firebase-auth';
5-
import { Auth, User } from '@nativescript/firebase-auth';
5+
import { Auth, User, OAuthProvider } from '@nativescript/firebase-auth';
66
export function navigatingTo(args: EventData) {
77
const page = <Page>args.object;
88
page.bindingContext = new DemoModel();
@@ -14,12 +14,14 @@ export class DemoModel extends DemoSharedFirebaseAuth {
1414
user: User;
1515
constructor() {
1616
super();
17+
1718
firebase()
1819
.auth()
1920
.addAuthStateChangeListener((user) => {
2021
this._setCurrentUser(user);
2122
});
2223
}
24+
2325
createUser() {
2426
firebase()
2527
.auth()
@@ -55,11 +57,33 @@ export class DemoModel extends DemoSharedFirebaseAuth {
5557

5658
getCurrentUser() {
5759
const auth = firebase().auth();
58-
this._setCurrentUser(auth?.user);
60+
this._setCurrentUser(auth?.currentUser);
5961
}
6062

6163
logOutUser() {
6264
firebase().auth().signOut();
6365
this._setCurrentUser(undefined);
6466
}
67+
68+
69+
loginMs() {
70+
// https://firebase.google.com/docs/auth/android/microsoft-oauth#handle_the_sign-in_flow_with_the_firebase_sdk
71+
72+
const provider = new OAuthProvider('microsoft.com');
73+
provider.addCustomParameter("prompt", "consent");
74+
provider.addCustomParameter("login_hint", "[email protected]");
75+
provider.addCustomParameter("tenant", "TENANT_ID");
76+
77+
provider.setScopes(["mail.read", "calendars.read"]);
78+
79+
firebase()
80+
.auth()
81+
.signInWithProvider(provider)
82+
.then(credentials => {
83+
84+
})
85+
.catch(err => {
86+
87+
});
88+
}
6589
}

‎packages/firebase-admob/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-admob",
3-
"version": "1.0.0-alpha.25",
3+
"version": "1.0.0-alpha.28",
44
"description": "NativeScript Firebase - Admob",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-analytics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-analytics",
3-
"version": "1.0.0-alpha.25",
3+
"version": "1.0.0-alpha.28",
44
"description": "NativeScript Firebase - Analytics",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-app-check/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-app-check",
3-
"version": "1.0.0-alpha.25",
3+
"version": "1.0.0-alpha.28",
44
"description": "NativeScript Firebase - App Check",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-auth/common.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export interface IUser {
3838
getIdToken(forceRefresh?: undefined | false | true): Promise<string>;
3939
getIdTokenResult(forceRefresh?: undefined | false | true): Promise<IAuthTokenResult>;
4040
linkWithCredential(credential: IAuthCredential): Promise<UserCredential>;
41+
reauthenticateWithProvider(credential: IOAuthProvider): Promise<UserCredential>;
4142
reauthenticateWithCredential(credential: IAuthCredential): Promise<UserCredential>;
4243
reload(): Promise<void>;
4344
sendEmailVerification(actionCodeSettings?: IActionCodeSettings): Promise<void>;
@@ -110,21 +111,27 @@ export interface IOAuthCredential extends IAuthCredential {
110111
readonly secret: string;
111112
}
112113

113-
export interface IPhoneAuthCredential extends IAuthCredential {}
114+
export interface IPhoneAuthCredential extends IAuthCredential { }
114115

115116
export interface UserProfileChangeRequest {
116117
displayName?: string;
117118
photoUri?: string;
118119
}
119120

121+
export interface IOAuthProvider {
122+
addCustomParameter(key: string, value: string);
123+
setScopes(scopes: string[]);
124+
credential(optionsOrIdToken: OAuthCredentialOptions | string | null, accessToken?: string);
125+
}
126+
120127
export interface IAuth {
121128
readonly app: FirebaseApp;
122129
readonly currentUser: IUser;
123130
readonly languageCode: string;
124131
readonly settings: IAuthSettings;
125132
readonly tenantId: string;
126133

127-
useEmulator(host: string, port: number);
134+
useEmulator(host: string, port: number);
128135
applyActionCode(code: string): Promise<void>;
129136
checkActionCode(code: string): Promise<ActionCodeInfo>;
130137
confirmPasswordReset(code: string, newPassword: string): Promise<void>;
@@ -138,6 +145,7 @@ export interface IAuth {
138145
sendPasswordResetEmail(email: string, actionCodeSettings?: IActionCodeSettings): Promise<void>;
139146
sendSignInLinkToEmail(email: string, actionCodeSettings?: IActionCodeSettings): Promise<void>;
140147
signInAnonymously(): Promise<UserCredential>;
148+
signInWithProvider(provider: IOAuthProvider): Promise<UserCredential>
141149
signInWithCredential(credential: IAuthCredential): Promise<UserCredential>;
142150
signInWithCustomToken(customToken: string): Promise<UserCredential>;
143151
signInWithEmailAndPassword(email: string, password: string): Promise<UserCredential>;

‎packages/firebase-auth/index.android.ts‎

Lines changed: 86 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ import {
1515
OAuthCredentialOptions,
1616
UserCredential,
1717
UserProfileChangeRequest,
18-
AdditionalUserInfo
18+
AdditionalUserInfo,
19+
IOAuthProvider
1920
} from './common';
2021
import lazy from '@nativescript/core/utils/lazy';
2122
import { Application } from '@nativescript/core';
23+
import { FirebaseAuth } from '.';
2224

2325
export { AdditionalUserInfo, ActionCodeInfo, ActionCodeInfoOperation, UserCredential, UserProfileChangeRequest };
2426

@@ -275,6 +277,30 @@ export class User implements IUser {
275277
});
276278
}
277279

280+
reauthenticateWithProvider(provider: OAuthProvider): Promise<UserCredential> {
281+
return new Promise((resolve, reject) => {
282+
if (provider._isCustomProvider && provider._builder) {
283+
org.nativescript.firebaseauth.FirebaseAuth.User.reauthenticateWithProvider(
284+
Application.android.foregroundActivity || Application.android.startActivity,
285+
this.native, provider._builder, new org.nativescript.firebaseauth.FirebaseAuth.Callback({
286+
onSuccess(success) {
287+
resolve(toUserCredential(success));
288+
},
289+
onError(error) {
290+
reject({
291+
message: error.getMessage(),
292+
native: error,
293+
});
294+
},
295+
})
296+
)
297+
} else {
298+
reject(FirebaseError.fromNative(null, 'OAuthProvider not configured'));
299+
}
300+
})
301+
}
302+
303+
278304
reauthenticateWithCredential(credential: AuthCredential): Promise<UserCredential> {
279305
return new Promise((resolve, reject) => {
280306
if (!this.native) {
@@ -775,11 +801,45 @@ export class OAuthCredential extends AuthCredential implements IOAuthCredential
775801
}
776802
}
777803

778-
export class OAuthProvider {
779-
#providerId: string;
780804

805+
806+
export class OAuthProvider implements IOAuthProvider {
807+
#providerId: string;
808+
#customProvider: boolean;
809+
#builder: com.google.firebase.auth.OAuthProvider.Builder;
781810
constructor(providerId: string) {
782811
this.#providerId = providerId;
812+
this.#customProvider = false;
813+
}
814+
815+
get _isCustomProvider() {
816+
return this.#customProvider;
817+
}
818+
819+
get _builder() {
820+
return this.#builder
821+
}
822+
823+
addCustomParameter(key: string, value: string) {
824+
if (!this.#builder) {
825+
this.#builder = com.google.firebase.auth.OAuthProvider.newBuilder(this.#providerId);
826+
this.#customProvider = true;
827+
}
828+
this.#builder.addCustomParameter(key, value);
829+
}
830+
831+
setScopes(scopes: string[]) {
832+
if (!this.#builder) {
833+
this.#builder = com.google.firebase.auth.OAuthProvider.newBuilder(this.#providerId);
834+
this.#customProvider = true;
835+
}
836+
if (Array.isArray(scopes)) {
837+
const array = new java.util.ArrayList<string>();
838+
scopes.forEach(item => {
839+
array.add(item);
840+
})
841+
this.#builder.setScopes(array);
842+
}
783843
}
784844

785845
credential(optionsOrIdToken: OAuthCredentialOptions | string | null, accessToken?: string) {
@@ -1053,6 +1113,29 @@ export class Auth implements IAuth {
10531113
});
10541114
}
10551115

1116+
signInWithProvider(provider: OAuthProvider): Promise<UserCredential> {
1117+
return new Promise((resolve, reject) => {
1118+
if (provider._isCustomProvider && provider._builder) {
1119+
org.nativescript.firebaseauth.FirebaseAuth.signInWithProvider(
1120+
Application.android.foregroundActivity || Application.android.startActivity,
1121+
this.native, provider._builder, new org.nativescript.firebaseauth.FirebaseAuth.Callback({
1122+
onSuccess(success) {
1123+
resolve(toUserCredential(success));
1124+
},
1125+
onError(error) {
1126+
reject({
1127+
message: error.getMessage(),
1128+
native: error,
1129+
});
1130+
},
1131+
})
1132+
)
1133+
} else {
1134+
reject(FirebaseError.fromNative(null, 'OAuthProvider not configured'));
1135+
}
1136+
})
1137+
}
1138+
10561139
signInWithCredential(credential: AuthCredential): Promise<UserCredential> {
10571140
return new Promise((resolve, reject) => {
10581141
if (!this.native) {

‎packages/firebase-auth/index.d.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
import { IUser, IAuth, IAuthSettings, AdditionalUserInfo, ActionCodeInfo, ActionCodeInfoOperation, UserCredential, UserProfileChangeRequest, IUserMetadata, IUserInfo, IActionCodeSettings, IAuthCredential, IOAuthCredential, IAuthTokenResult } from './common';
1+
import { IUser, IAuth, IAuthSettings, AdditionalUserInfo, ActionCodeInfo, ActionCodeInfoOperation, UserProfileChangeRequest, IUserMetadata, IUserInfo, IActionCodeSettings, IAuthCredential, IOAuthCredential, IAuthTokenResult } from './common';
22
import { Firebase, FirebaseApp } from '@nativescript/firebase-core';
33

4-
export { AdditionalUserInfo, ActionCodeInfo, ActionCodeInfoOperation, UserCredential, UserProfileChangeRequest };
4+
export { AdditionalUserInfo, ActionCodeInfo, ActionCodeInfoOperation, UserProfileChangeRequest };
5+
6+
7+
export interface UserCredential {
8+
additionalUserInfo: AdditionalUserInfo;
9+
user: User;
10+
credential: AuthCredential;
11+
}
12+
513

614
export declare class UserMetadata implements IUserMetadata {
715
readonly native;
@@ -41,6 +49,7 @@ export declare class User implements IUser {
4149
getIdToken(forceRefresh?: undefined | false | true): Promise<string>;
4250
getIdTokenResult(forceRefresh?: undefined | false | true): Promise<AuthTokenResult>;
4351
linkWithCredential(credential: AuthCredential): Promise<UserCredential>;
52+
reauthenticateWithProvider(provider: OAuthProvider): Promise<UserCredential>
4453
reauthenticateWithCredential(credential: AuthCredential): Promise<UserCredential>;
4554
reload(): Promise<void>;
4655
sendEmailVerification(actionCodeSettings?: ActionCodeSettings): Promise<void>;
@@ -129,9 +138,10 @@ export declare class OAuthCredential extends AuthCredential implements IOAuthCre
129138
readonly secret: string;
130139
}
131140

132-
export declare class OAuthProvider {
141+
export declare class OAuthProvider implements IOAuthProvider{
133142
constructor(providerId: string);
134-
143+
addCustomParameter(key: string, value: string);
144+
setScopes(scopes: string[]);
135145
credential(optionsOrIdToken: OAuthCredentialOptions | string | null, accessToken?: string): OAuthCredential;
136146
}
137147

@@ -189,6 +199,8 @@ export declare class Auth implements IAuth {
189199

190200
signInAnonymously(): Promise<UserCredential>;
191201

202+
signInWithProvider(provider: OAuthProvider): Promise<UserCredential>
203+
192204
signInWithCredential(credential: AuthCredential): Promise<UserCredential>;
193205

194206
signInWithCustomToken(customToken: string): Promise<UserCredential>;
@@ -205,7 +217,7 @@ export declare class Auth implements IAuth {
205217
}
206218

207219
declare module '@nativescript/firebase-core' {
208-
export interface Firebase extends FirebaseAuth {}
220+
export interface Firebase extends FirebaseAuth { }
209221
}
210222

211223
export interface FirebaseAuth {

0 commit comments

Comments
 (0)