Skip to content

chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

Closed
wobsoriano wants to merge 1 commit into from
Closed

chore(expo): Revert iOS Google Sign-In Expo module registration #8908

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
5 changes: 5 additions & 0 deletions .changeset/tall-cameras-laugh.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.
3 changes: 0 additions & 3 deletions packages/expo/expo-module.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
"platforms": ["apple", "android"],
"apple": {
"modules": ["ClerkGoogleSignInModule"]
},
"android": {
"modules": [
"expo.modules.clerk.ClerkExpoModule",
Expand Down
4 changes: 1 addition & 3 deletions packages/expo/ios/ClerkGoogleSignIn.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
s.static_framework = true

s.dependency 'GoogleSignIn', '~> 9.0'
s.dependency 'GoogleUtilities'
s.dependency 'RecaptchaInterop'

# Only include the Google Sign-In module files
s.source_files = 'ClerkGoogleSignInModule.swift'
s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

install_modules_dependencies(s)
end
22 changes: 22 additions & 0 deletions packages/expo/ios/ClerkGoogleSignInModule.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

@end
164 changes: 81 additions & 83 deletions packages/expo/ios/ClerkGoogleSignInModule.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
private var clientId: String?
private var hostedDomain: String?

public func definition() -> ModuleDefinition {
Name("ClerkGoogleSignIn")

Function("configure") { (params: [String: Any?]) in
self.configure(params)
}

AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
self.signIn(params, promise: promise)
}.runOnQueue(.main)

AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
self.createAccount(params, promise: promise)
}.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
self.presentExplicitSignIn(params, promise: promise)
}.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

AsyncFunction("signOut") { (promise: Promise) in
self.signOut(promise: promise)
}.runOnQueue(.main)
@objc static func requiresMainQueueSetup() -> Bool {
return false
}

private var clientId: String?
private var hostedDomain: String?

// MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

// MARK: - signIn

private func signIn(_ params: [String: Any?]?, promise: Promise) {
@objc func signIn(_ params: NSDictionary?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
return
}

guard let presentingVC = self.getPresentingViewController() else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
return
}
DispatchQueue.main.async {
guard let presentingVC = self.getPresentingViewController() else {
reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
return
}

let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce,
completion: { result, error in
self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
}
)
}
}

// MARK: - createAccount

private func createAccount(_ params: [String: Any?]?, promise: Promise) {
@objc func createAccount(_ params: NSDictionary?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
return
}

guard let presentingVC = self.getPresentingViewController() else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
return
}
DispatchQueue.main.async {
guard let presentingVC = self.getPresentingViewController() else {
reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
return
}

let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce,
completion: { result, error in
self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
}
)
}
}

// MARK: - presentExplicitSignIn

private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
@objc func presentExplicitSignIn(_ params: NSDictionary?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
return
}

guard let presentingVC = self.getPresentingViewController() else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
return
}
DispatchQueue.main.async {
guard let presentingVC = self.getPresentingViewController() else {
reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
return
}

let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce,
completion: { result, error in
self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
}
)
}
}

// MARK: - signOut

private func signOut(promise: Promise) {
@objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
GIDSignIn.sharedInstance.signOut()
promise.resolve()
resolve(nil)
}

// MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
return topVC
}

private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
private func handleSignInResult(result: GIDSignInResult?, error: Error?,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
if let error = error {
let nsError = error as NSError

// Check for user cancellation
if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
return
}

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
return
}

guard let result = result,
let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
return
}

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
] as [String: Any]
]

promise.resolve(response)
resolve(response)
}
}
18 changes: 9 additions & 9 deletions packages/expo/src/specs/NativeClerkGoogleSignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
configure(params: NativeMap): void;
signIn(params: NativeMap | null): Promise<NativeMap>;
createAccount(params: NativeMap | null): Promise<NativeMap>;
presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
configure(params: UnsafeObject): void;
signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
chore(expo): Revert iOS Google Sign-In Expo module registration by wobsoriano · Pull Request #8908 · clerk/javascript · GitHub
Skip to content
chore(expo): Revert iOS Google Sign-In Expo module registration#8908

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

 Closed

wobsoriano
wants to merge
1
commit into

from

 Closed


chore(expo): Revert iOS Google Sign-In Expo module registration
#8908
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


5 changes: 5 additions & 0 deletions
.changeset/tall-cameras-laugh.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert the iOS Google Sign-In module registration to restore the previous iOS build behavior.

3 changes: 0 additions & 3 deletions
packages/expo/expo-module.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
{
 "platforms": ["apple", "android"],
 "apple": {
 "modules": ["ClerkGoogleSignInModule"]
 },
 "android": {
 "modules": [
 "expo.modules.clerk.ClerkExpoModule",
Expand Down

4 changes: 1 addition & 3 deletions
packages/expo/ios/ClerkGoogleSignIn.podspec

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,9 @@ Pod::Spec.new do |s|
 s.static_framework = true

 s.dependency 'GoogleSignIn', '~> 9.0'
 s.dependency 'GoogleUtilities'
 s.dependency 'RecaptchaInterop'

 # Only include the Google Sign-In module files
 s.source_files = 'ClerkGoogleSignInModule.swift'
 s.source_files = 'ClerkGoogleSignInModule.swift', 'ClerkGoogleSignInModule.m'

 install_modules_dependencies(s)
end

22 changes: 22 additions & 0 deletions
packages/expo/ios/ClerkGoogleSignInModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
#import <React/RCTBridgeModule.h>

@interface RCT_EXTERN_MODULE(ClerkGoogleSignIn, NSObject)

RCT_EXTERN_METHOD(configure:(NSDictionary *)params)

RCT_EXTERN_METHOD(signIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(createAccount:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(presentExplicitSignIn:(NSDictionary *)params
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(signOut:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end

164 changes: 81 additions & 83 deletions
packages/expo/ios/ClerkGoogleSignInModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
import ExpoModulesCore
import React
import GoogleSignIn

public class ClerkGoogleSignInModule: Module {
 private var clientId: String?
 private var hostedDomain: String?

 public func definition() -> ModuleDefinition {
 Name("ClerkGoogleSignIn")

 Function("configure") { (params: [String: Any?]) in
 self.configure(params)
 }

 AsyncFunction("signIn") { (params: [String: Any?]?, promise: Promise) in
 self.signIn(params, promise: promise)
 }.runOnQueue(.main)

 AsyncFunction("createAccount") { (params: [String: Any?]?, promise: Promise) in
 self.createAccount(params, promise: promise)
 }.runOnQueue(.main)
@objc(ClerkGoogleSignIn)
class ClerkGoogleSignInModule: NSObject, RCTBridgeModule {

 AsyncFunction("presentExplicitSignIn") { (params: [String: Any?]?, promise: Promise) in
 self.presentExplicitSignIn(params, promise: promise)
 }.runOnQueue(.main)
static func moduleName() -> String! {
return "ClerkGoogleSignIn"
}

 AsyncFunction("signOut") { (promise: Promise) in
 self.signOut(promise: promise)
 }.runOnQueue(.main)
 @objc static func requiresMainQueueSetup() -> Bool {
 return false
 }

 private var clientId: String?
 private var hostedDomain: String?

 // MARK: - configure

private func configure(_ params: [String: Any?]) {
@objc func configure(_ params: NSDictionary) {
 let webClientId = self.nonEmptyClientId(params["webClientId"] as? String)
 let iosClientId = self.nonEmptyClientId(params["iosClientId"] as? String)
 self.clientId = iosClientId ?? webClientId
Expand All@@ -48,91 +34,101 @@ public class ClerkGoogleSignInModule: Module {

 // MARK: - signIn

 private func signIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func signIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
 let hint: String? = filterByAuthorized
 ? GIDSignIn.sharedInstance.currentUser?.profile?.email
 : nil
 let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: hint,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
let filterByAuthorized = params?["filterByAuthorizedAccounts"] as? Bool ?? false
let hint: String? = filterByAuthorized
? GIDSignIn.sharedInstance.currentUser?.profile?.email
: nil
let nonce = params?["nonce"] as? String

GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: hint,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - createAccount

 private func createAccount(_ params: [String: Any?]?, promise: Promise) {
 @objc func createAccount(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - presentExplicitSignIn

 private func presentExplicitSignIn(_ params: [String: Any?]?, promise: Promise) {
 @objc func presentExplicitSignIn(_ params: NSDictionary?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard self.clientId != nil else {
promise.reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.")
 reject("NOT_CONFIGURED", "Google Sign-In is not configured. Call configure() first.", nil)
 return
 }

 guard let presentingVC = self.getPresentingViewController() else {
 promise.reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available")
 return
 }
 DispatchQueue.main.async {
 guard let presentingVC = self.getPresentingViewController() else {
 reject("GOOGLE_SIGN_IN_ERROR", "No presenting view controller available", nil)
 return
 }

 let nonce = params?["nonce"] as? String
let nonce = params?["nonce"] as? String

 GIDSignIn.sharedInstance.signIn(
 withPresenting: presentingVC,
 hint: nil,
 additionalScopes: nil,
 nonce: nonce,
completion: { result, error in
 self.handleSignInResult(result: result, error: error, promise: promise)
GIDSignIn.sharedInstance.signIn(
withPresenting: presentingVC,
hint: nil,
additionalScopes: nil,
nonce: nonce
) { result, error in
 self.handleSignInResult(result: result, error: error, resolve: resolve, reject: reject)
 }
)
}
 }

 // MARK: - signOut

 private func signOut(promise: Promise) {
 @objc func signOut(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 GIDSignIn.sharedInstance.signOut()
promise.resolve()
 resolve(nil)
 }

 // MARK: - Helpers
Expand All@@ -159,23 +155,25 @@ public class ClerkGoogleSignInModule: Module {
 return topVC
 }

 private func handleSignInResult(result: GIDSignInResult?, error: Error?, promise: Promise) {
 private func handleSignInResult(result: GIDSignInResult?, error: Error?,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 if let error = error {
 let nsError = error as NSError

 // Check for user cancellation
 if nsError.domain == kGIDSignInErrorDomain && nsError.code == GIDSignInError.canceled.rawValue {
promise.reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow")
 reject("SIGN_IN_CANCELLED", "User cancelled the sign-in flow", error)
 return
 }

promise.reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription)
 reject("GOOGLE_SIGN_IN_ERROR", error.localizedDescription, error)
 return
 }

 guard let result = result,
 let idToken = result.user.idToken?.tokenString else {
promise.reject("GOOGLE_SIGN_IN_ERROR", "No ID token received")
 reject("GOOGLE_SIGN_IN_ERROR", "No ID token received", nil)
 return
 }

Expand All@@ -197,6 +195,6 @@ public class ClerkGoogleSignInModule: Module {
 ] as [String: Any]
 ]

promise.resolve(response)
 resolve(response)
 }
}

18 changes: 9 additions & 9 deletions
packages/expo/src/specs/NativeClerkGoogleSignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
import { requireOptionalNativeModule } from 'expo';
import type { TurboModule } from 'react-native';
import { TurboModuleRegistry } from 'react-native';
import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypesNamespace';

type NativeMap = Record<string, unknown>;

interface Spec {
 configure(params: NativeMap): void;
 signIn(params: NativeMap | null): Promise<NativeMap>;
 createAccount(params: NativeMap | null): Promise<NativeMap>;
 presentExplicitSignIn(params: NativeMap | null): Promise<NativeMap>;
export interface Spec extends TurboModule {
 configure(params: UnsafeObject): void;
 signIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 createAccount(params: UnsafeObject | null): Promise<UnsafeObject>;
 presentExplicitSignIn(params: UnsafeObject | null): Promise<UnsafeObject>;
 signOut(): Promise<void>;
}

export default requireOptionalNativeModule<Spec>('ClerkGoogleSignIn');
export default TurboModuleRegistry.get<Spec>('ClerkGoogleSignIn');
Loading