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

Added iOS full screen screenset params #60

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion ios/GigyaSdk.m
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ + (BOOL)requiresMainQueueSetup
apiDomain:(NSString *)apiDomain)

RCT_EXTERN_METHOD(showScreenSet:(NSString *)name
params:(NSString *)params)
params:(NSString *)params
isModal:(BOOL *)isModal)

RCT_EXTERN_METHOD(resolve:(NSString *)method
params:(NSString *)params
Expand Down
6 changes: 3 additions & 3 deletions ios/GigyaSdk.swift
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ public class GigyaSdk: NSObject {
GigyaSdk.gigya?.sendEvent(.removeConnection, params: newParams, promise: promise)
}

@objc(showScreenSet:params:)
func showScreenSet(name: String, params: String) {
@objc(showScreenSet:params:isModal:)
func showScreenSet(name: String, params: String, isModal: Bool) {
let jsonToParams = GigyaSdk.toJson(data: params)

GigyaSdk.gigya?.showScreenSet(name: name, params: jsonToParams)
GigyaSdk.gigya?.showScreenSet(name: name, params: jsonToParams, isModal: isModal)
}

@objc(logout:rejecter:)
Expand Down
6 changes: 3 additions & 3 deletions ios/GigyaSdkWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protocol GigyaSdkWrapperProtocol {

func sendEvent(_ name: GigyaMethods, params: [String: Any], promise: PromiseWrapper)

func showScreenSet(name: String, params: [String: Any])
func showScreenSet(name: String, params: [String: Any], isModal: Bool)

func useResolver(method: String, params: [String: Any], promise: PromiseWrapper)
}
Expand Down Expand Up @@ -275,13 +275,13 @@ class GigyaSdkWrapper<T: GigyaAccountProtocol>: GigyaSdkWrapperProtocol {
}
}

func showScreenSet(name: String, params: [String: Any]) {
func showScreenSet(name: String, params: [String: Any], isModal: Bool) {
guard let viewController = RCTPresentedViewController() else {
GigyaLogger.log(with: self, message: "Presented viewController not found.")
return
}

gigya.showScreenSet(with: name, viewController: viewController, params: params) { (result) in
gigya.showScreenSet(with: name, viewController: viewController, params: params, isModal: isModal) { (result) in
switch result {
case .onBeforeValidation(event: let event):
let data: [String: Any] = ["event": "onBeforeValidation", "data": event]
Expand Down
4 changes: 2 additions & 2 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ export namespace Gigya {

function removeAccount(provider: GigyaSocialProviders): Promise<GigyaDictionary>;

function showScreenSet(name: string, callback: (event: string, data: GigyaDictionary) => void): void;
function showScreenSet(name: string, callback: (event: string, data: GigyaDictionary) => void, isModal?: boolean): void;

function showScreenSetWithParams(name: string, params: Record<string, any>, callback: (event: string, data: GigyaDictionary) => void): void;
function showScreenSetWithParams(name: string, params: Record<string, any>, callback: (event: string, data: GigyaDictionary) => void, isModal?: boolean): void;

}

17 changes: 12 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NativeEventEmitter, NativeModules } from 'react-native'
import { NativeEventEmitter, NativeModules, Platform } from 'react-native'
import { BiometricService } from './biometric'
import { ResolverFactory } from './resolvers'
import { WebAuthnService } from './webauthn'
Expand Down Expand Up @@ -257,9 +257,15 @@ export class GigyaInterface {
* @param {string} name
* @param {map} params
* @param {*} callback
* @param {boolean} isModal
*/
showScreenSetWithParams(name, params, callback) {
GigyaSdk.showScreenSet(name, JSON.stringify(params) ?? "")
showScreenSetWithParams(name, params, callback, isModal = true) {
const isIos = Platform.OS === 'ios';
if (isIos) {
GigyaSdk.showScreenSet(name, JSON.stringify(params) ?? "", isModal)
} else {
GigyaSdk.showScreenSet(name, JSON.stringify(params) ?? "")
}

listener = GigyaSdkEvents.addListener('event', (jsonData) => {
console.log("eee:"+jsonData)
Expand All @@ -277,9 +283,10 @@ export class GigyaInterface {
*
* @param {*} name
* @param {*} callback
* @param {boolean} isModal
*/
showScreenSet(name, callback) {
this.showScreenSetWithParams(name, {}, callback)
showScreenSet(name, callback, isModal = true) {
this.showScreenSetWithParams(name, {}, callback, isModal)
}
}

Expand Down