Skip to content

fix: registerForPush with default options #134

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 2 commits into from
May 11, 2021
Merged

fix: registerForPush with default options #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fb648
chore: improve types, remove unused method
gyoshev May 8, 2021
7c60aa2
fix: registerForWebPush() without arguments throws error
gyoshev May 8, 2021
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
4 changes: 2 additions & 2 deletions src/Leanplum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export default class Leanplum {
Leanplum._lp.setApiPath(apiPath)
}

static setEmail(email: string): void {
Leanplum._lp.setEmail(email)
static setEmail(): void {
// deprecated
}

/**
Expand Down
15 changes: 5 additions & 10 deletions src/LeanplumInternal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export default class LeanplumInternal {
this.getFileUrl.bind(this),
)

private _email: string
private _deviceName: string
private _deviceModel: string
private _systemName: string
Expand All @@ -74,7 +73,7 @@ export default class LeanplumInternal {

constructor(private wnd: Window) {
this._browserDetector = new BrowserDetector(wnd)
this._events.on('navigationChange', (url) => {
this._events.on('navigationChange', (url: string) => {
let prevented = false
this._events.emit('openUrl', {
preventDefault: () => prevented = true,
Expand All @@ -95,10 +94,6 @@ export default class LeanplumInternal {
this._lpRequest.apiPath = apiPath
}

setEmail(email: string): void {
this._email = email
}

/**
* Sets the network timeout.
* @param {number} seconds The timeout in seconds.
Expand Down Expand Up @@ -234,7 +229,7 @@ export default class LeanplumInternal {
this.createRequest(Constants.METHODS.GET_VARS, args, {
queued: false,
sendNow: true,
response: (response) => {
response: (response: Array<Object>) => {
const getVarsResponse = this._lpRequest.getLastResponse(response)
const isSuccess = this._lpRequest.isResponseSuccess(getVarsResponse)
if (isSuccess) {
Expand Down Expand Up @@ -310,7 +305,7 @@ export default class LeanplumInternal {
this.createRequest(Constants.METHODS.START, args, {
queued: true,
sendNow: true,
response: (response) => {
response: (response: Array<Object>) => {
this._internalState.hasStarted = true
const startResponse = this._lpRequest.getLastResponse(response)
const isSuccess = this._lpRequest.isResponseSuccess(startResponse)
Expand Down Expand Up @@ -565,14 +560,14 @@ Use "npm update leanplum-sdk" or go to https://docs.leanplum.com/reference#javas
*/
registerForWebPush(serviceWorkerUrl?: string): Promise<boolean> {
if (this._pushManager.isWebPushSupported()) {
const subscribe = (isSubscribed): Promise<boolean> => {
const subscribe = (isSubscribed: boolean): Promise<boolean> => {
if (isSubscribed) {
return Promise.resolve(true)
}
return this._pushManager.subscribeUser()
}

const options = this._webPushOptions
const options = this._webPushOptions || {}
const workerUrl = serviceWorkerUrl || options.serviceWorkerUrl
const scope = options && options.scope ? { scope: options.scope } : null

Expand Down
10 changes: 10 additions & 0 deletions test/specs/LeanplumInternal.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,16 @@ describe(LeanplumInternal, () => {
expect(pushManagerMock.subscribeUser).toHaveBeenCalledTimes(0)
})

it('uses default worker url when passed no options', async () => {
pushManagerMock.isWebPushSupported.mockReturnValueOnce(true)
pushManagerMock.register.mockImplementationOnce(async(_url, _scope, callback) => callback(true))

const result = await lp.registerForWebPush()

expect(result).toBe(true)
expect(pushManagerMock.register).toHaveBeenCalledTimes(1)
})

it('returns `true` and subscribes user when not subscribed', async() => {
pushManagerMock.isWebPushSupported.mockReturnValueOnce(true)
pushManagerMock.register.mockImplementationOnce(async(url, scope, callback) => callback(false))
Expand Down