Skip to content
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.

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

Removes reset method #119

Merged
merged 4 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

test-android:
needs: test-rn
runs-on: macOS-latest
runs-on: macOS-12
env:
GRADLE_VERSION: 7.6

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -624,17 +624,6 @@ class RNUsercentricsModuleTest {
assertEquals(UsercentricsAnalyticsEventType.ACCEPT_ALL_FIRST_LAYER, trackedEvents[0])
}

@Test
fun testResetMethod() {
val usercentricsProxy = FakeUsercentricsProxy()
val contextMock = mockk<ReactApplicationContext>(relaxed = true)
val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())

module.reset()

assertEquals(1, usercentricsProxy.resetCount)
}

@Test
fun testShowFirstLayer() {
val usercentricsProxy = FakeUsercentricsProxy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ internal class FakeUsercentricsProxy(
}
}

var resetCount: Int = 0
private set

override fun reset() {
resetCount++
}

var showFirstLayerBannerSettings: BannerSettings? = null

override fun showFirstLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,6 @@ internal class RNUsercentricsModule(
usercentricsProxy.instance.track(UsercentricsAnalyticsEventType.values()[event])
}

@ReactMethod
fun reset() {
usercentricsProxy.reset()
}

@ReactMethod
fun clearUserSession(promise: Promise) {
usercentricsProxy.instance.clearUserSession({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ interface UsercentricsProxy {

fun showFirstLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)
fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)

fun reset()
}

internal class UsercentricsProxyImpl : UsercentricsProxy {
Expand Down Expand Up @@ -57,6 +55,4 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
promise.resolve(it?.toWritableMap())
}
}

override fun reset() = Usercentrics.reset()
}
7 changes: 0 additions & 7 deletions example/ios/exampleTests/Fake/FakeUsercentricsManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ final class FakeUsercentricsManager: UsercentricsManager {
var restoreUserSessionSuccess: UsercentricsReadyStatus?
var restoreUserSessionError: Error?

var resetCount: Int = 0

var clearUserSessionSuccess: UsercentricsReadyStatus?
var clearUserSessionError: Error?

Expand All @@ -46,11 +44,6 @@ final class FakeUsercentricsManager: UsercentricsManager {
alreadyConfigured = true
}

func reset() {
resetCount += 1
alreadyConfigured = false
}

func restoreUserSession(controllerId: String, onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onFailure: @escaping ((Error) -> Void)) {
self.restoreControllerId = controllerId

Expand Down
5 changes: 0 additions & 5 deletions example/ios/exampleTests/RNUsercentricsModuleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,6 @@ class RNUsercentricsModuleTests: XCTestCase {
}
}

func testReset() {
module.reset()
XCTAssertEqual(1, fakeUsercentrics.resetCount)
}

func testGetConsents() {
fakeUsercentrics.getConsentsResponse = [.mock()]
module.getConsents { result in
Expand Down
5 changes: 0 additions & 5 deletions ios/Manager/UsercentricsManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public protocol UsercentricsManager {
func setABTestingVariant(variant: String)
func track(event: UsercentricsAnalyticsEventType)

func reset()
func clearUserSession(onSuccess: @escaping ((UsercentricsReadyStatus) -> Void), onError: @escaping ((Error) -> Void))
}

Expand All @@ -55,10 +54,6 @@ final class UsercentricsManagerImplementation: UsercentricsManager {
UsercentricsCore.configure(options: options)
}

func reset() {
UsercentricsCore.reset()
}

func showFirstLayer(bannerSettings: BannerSettings?,
dismissViewHandler: @escaping (UsercentricsConsentUserResponse) -> Void) {
UsercentricsBanner(bannerSettings: bannerSettings).showFirstLayer(completionHandler: dismissViewHandler)
Expand Down
2 changes: 0 additions & 2 deletions ios/RNUsercentricsModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ @interface RCT_EXTERN_MODULE(RNUsercentricsModule, NSObject)

RCT_EXTERN_METHOD(track:(NSInteger *)event)

RCT_EXTERN_METHOD(reset)

RCT_EXTERN_METHOD(clearUserSession:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)
@end
4 changes: 0 additions & 4 deletions ios/RNUsercentricsModule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ class RNUsercentricsModule: NSObject, RCTBridgeModule {
guard let usercentricsAnalyticsEventType = UsercentricsAnalyticsEventType.initialize(from: event) else { return }
usercentricsManager.track(event: usercentricsAnalyticsEventType)
}

@objc func reset() -> Void {
usercentricsManager.reset()
}

@objc func clearUserSession(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
usercentricsManager.clearUserSession { status in
Expand Down
7 changes: 0 additions & 7 deletions src/Usercentrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ export const Usercentrics = {
RNUsercentricsModule.track(event);
},

/**
* @deprecated This method will be removed in the next version. Please consider using the clearUserSession() method instead
*/
reset: () => {
RNUsercentricsModule.reset()
},

clearUserSession: async (): Promise<UsercentricsReadyStatus> => {
await RNUsercentricsModule.isReady();
return RNUsercentricsModule.clearUserSession();
Expand Down
6 changes: 0 additions & 6 deletions src/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -397,12 +397,6 @@ describe('Test Usercentrics Module', () => {
expect(spy).toHaveBeenCalledTimes(1);
})

test('testReset', async () => {
Usercentrics.reset();
let spy = jest.spyOn(RNUsercentricsModule, "reset")
expect(spy).toHaveBeenCalledTimes(1)
})

test('testGetAdditionalConsentModeData', async () => {
const response: AdditionalConsentModeData = {
acString: '2~43.46.55~dv.',
Expand Down
Loading