Skip to content

feat(dynamic-links): forward errors to application #176

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

Merged
merged 1 commit into from
Feb 9, 2023
Merged

feat(dynamic-links): forward errors to application #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions packages/firebase-dynamic-links/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FirebaseApp } from '@nativescript/firebase-core';
import { FirebaseApp, FirebaseError } from '@nativescript/firebase-core';

export enum ShortLinkType {
DEFAULT = 'default',
Expand Down Expand Up @@ -67,11 +67,13 @@ export interface IDynamicLink {
utmParameters: Record<string, string>;
}

export type OnLinkListener = (link: IDynamicLink | null, error: FirebaseError | null) => void;

export interface IDynamicLinks {
app: FirebaseApp;
createLink(link: string, domainUriPrefix: string): IDynamicLinkParameters;
createShortLink(link: string, domainUriPrefix: string, shortLinkType?: ShortLinkType): IDynamicLinkParameters;
buildLink(link: IDynamicLinkParameters): Promise<string>;
onLink(listener: (link: IDynamicLink) => void);
onLink(listener: OnLinkListener);
resolveLink(link: string): Promise<IDynamicLink>;
}
11 changes: 7 additions & 4 deletions packages/firebase-dynamic-links/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Application, AndroidActivityNewIntentEventData, AndroidApplication } from '@nativescript/core';
import { deserialize, firebase, FirebaseApp, FirebaseError } from '@nativescript/firebase-core';
import { IDynamicLink, IDynamicLinkAnalyticsParameters, IDynamicLinkAndroidParameters, IDynamicLinkIOSParameters, IDynamicLinkITunesParameters, IDynamicLinkNavigationParameters, IDynamicLinkParameters, IDynamicLinks, IDynamicLinkSocialParameters, ShortLinkType } from './common';
import { IDynamicLink, IDynamicLinkAnalyticsParameters, IDynamicLinkAndroidParameters, IDynamicLinkIOSParameters, IDynamicLinkITunesParameters, IDynamicLinkNavigationParameters, IDynamicLinkParameters, IDynamicLinks, IDynamicLinkSocialParameters, OnLinkListener, ShortLinkType } from './common';

let defaultDynamicLinks: DynamicLinks;

Expand Down Expand Up @@ -455,7 +455,7 @@ export class DynamicLink implements IDynamicLink {
export class DynamicLinks implements IDynamicLinks {
_native: com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
_app: FirebaseApp;
static _onLink: (link: DynamicLink) => void;
static _onLink: OnLinkListener;
static _didInit = false;
static _callback: org.nativescript.firebase.dynamic_links.FirebaseDynamicLinks.Callback<com.google.firebase.dynamiclinks.PendingDynamicLinkData>;
constructor() {
Expand All @@ -468,10 +468,13 @@ export class DynamicLinks implements IDynamicLinks {
DynamicLinks._callback = new org.nativescript.firebase.dynamic_links.FirebaseDynamicLinks.Callback<com.google.firebase.dynamiclinks.PendingDynamicLinkData>({
onSuccess(param0) {
if (typeof DynamicLinks._onLink === 'function') {
DynamicLinks._onLink(DynamicLink.fromNative(param0));
DynamicLinks._onLink(DynamicLink.fromNative(param0), null);
}
},
onError(param0) {
if (typeof DynamicLinks._onLink === 'function') {
DynamicLinks._onLink(null, FirebaseError.fromNative(param0));
}
console.error('Unknown error occurred when attempting to handle a universal link', param0);
},
});
Expand Down Expand Up @@ -520,7 +523,7 @@ export class DynamicLinks implements IDynamicLinks {
return DynamicLinkParameters.fromNative(dl, shortLinkType);
}

onLink(listener: (link: DynamicLink) => void) {
onLink(listener: OnLinkListener) {
DynamicLinks._onLink = listener;
}
resolveLink(link: string): Promise<DynamicLink> {
Expand Down
6 changes: 4 additions & 2 deletions packages/firebase-dynamic-links/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FirebaseApp } from '@nativescript/firebase-core';
import { FirebaseApp, FirebaseError } from '@nativescript/firebase-core';
import { ShortLinkType, IDynamicLink } from './common';

export { ShortLinkType };
Expand Down Expand Up @@ -93,14 +93,16 @@ export declare class DynamicLink implements IDynamicLink {
readonly android;
}

export type OnLinkListener = (link: DynamicLink | null, error: FirebaseError | null) => void;

export declare class DynamicLinks implements IDynamicLinks {
createLink(link: string, domainUriPrefix: string): DynamicLinkParameters;

createShortLink(link: string, domainUriPrefix: string, shortLinkType?: ShortLinkType): DynamicLinkParameters;

buildLink(link: DynamicLinkParameters): Promise<string>;

onLink(listener: (link: DynamicLink) => void);
onLink(listener: OnLinkListener): void;

resolveLink(link: string): Promise<DynamicLink>;

Expand Down
10 changes: 5 additions & 5 deletions packages/firebase-dynamic-links/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { deserialize, firebase, FirebaseApp, FirebaseError } from '@nativescript/firebase-core';
import { IDynamicLink, IDynamicLinkAnalyticsParameters, IDynamicLinkAndroidParameters, IDynamicLinkIOSParameters, IDynamicLinkITunesParameters, IDynamicLinkNavigationParameters, IDynamicLinkParameters, IDynamicLinks, IDynamicLinkSocialParameters, ShortLinkType } from './common';
import { IDynamicLink, IDynamicLinkAnalyticsParameters, IDynamicLinkAndroidParameters, IDynamicLinkIOSParameters, IDynamicLinkITunesParameters, IDynamicLinkNavigationParameters, IDynamicLinkParameters, IDynamicLinks, IDynamicLinkSocialParameters, OnLinkListener, ShortLinkType } from './common';

let defaultDynamicLinks: DynamicLinks;
const fb = firebase();
Expand Down Expand Up @@ -457,7 +457,7 @@ export class DynamicLink implements IDynamicLink {
export class DynamicLinks implements IDynamicLinks {
_native: FIRDynamicLinks;
_app: FirebaseApp;
static _onLink: (link: DynamicLink) => void;
static _onLink: OnLinkListener;
constructor() {
if (defaultDynamicLinks) {
return defaultDynamicLinks;
Expand Down Expand Up @@ -504,11 +504,11 @@ export class DynamicLinks implements IDynamicLinks {
}
}

onLink(listener: (link: DynamicLink) => void) {
onLink(listener: OnLinkListener) {
DynamicLinks._onLink = listener;
if (listener) {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback = (link) => {
listener(DynamicLink.fromNative(link));
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback = (link, error) => {
listener(DynamicLink.fromNative(link), error && FirebaseError.fromNative(error));
};
} else {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback = null;
Expand Down
29 changes: 7 additions & 22 deletions packages/firebase-dynamic-links/platforms/ios/src/TNSFirebaseDynamicLinksAppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class TNSFirebaseDynamicLinksAppDelegate: UIResponder , UIApplicationDele

private static var _sharedInstance: TNSFirebaseDynamicLinksAppDelegate? = nil

@objc public static var onLinkCallback: ((DynamicLink) -> Void)? = nil
@objc public static var onLinkCallback: ((DynamicLink?, Error?) -> Void)? = nil

@objc public static var sharedInstance: TNSFirebaseDynamicLinksAppDelegate {
get {
Expand All @@ -30,22 +30,14 @@ public class TNSFirebaseDynamicLinksAppDelegate: UIResponder , UIApplicationDele

if (dynamicLink == nil) {
DynamicLinks.dynamicLinks().dynamicLink(fromUniversalLink: url, completion: { dynamicLink, error in
if (dynamicLink?.url != nil) {
DispatchQueue.main.async {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink!)
}
DispatchQueue.main.async {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink, error)
}
})
return false
}

if (dynamicLink == nil) {
return false
}

if (dynamicLink?.url != nil) {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink!)
}
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink, nil)

return false
}
Expand All @@ -63,23 +55,16 @@ public class TNSFirebaseDynamicLinksAppDelegate: UIResponder , UIApplicationDele

if(userActivity.webpageURL != nil){
DynamicLinks.dynamicLinks().handleUniversalLink(userActivity.webpageURL!) { dynamicLink, error in
if(error == nil && dynamicLink?.url != nil){
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink!)
}


if(error != nil && !retried && (error as? NSError)?.domain == NSPOSIXErrorDomain && (error as? NSError)?.code == 53){
retried = true
DynamicLinks.dynamicLinks().handleUniversalLink(userActivity.webpageURL!) { dynamicLink, error in

if(error == nil && dynamicLink?.url != nil){
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink!)
}
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink, error)
if(error != nil && error?.localizedDescription != nil){
NSLog("%@", "CONSOLE LOG: ", error!.localizedDescription)
}

}
} else {
TNSFirebaseDynamicLinksAppDelegate.onLinkCallback?(dynamicLink, error)
}
}
}
Expand Down