fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tommy Nguyen (tido64) merged 4 commits into from
Oct 18, 2021
Merged

fix(macos): fix "no account for team" and missing provisioning profile #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27a1bc2
fix(macos): fix "no account for team" and missing provisioning profile
tido64 Oct 16, 2021
b1fa61d
add tests
tido64 Oct 16, 2021
3c641c0
remove keychain entitlement + simplify tests
tido64 Oct 16, 2021
3b7afad
test development team
tido64 Oct 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
gem 'minitest'
gem 'rubocop', require: false
gem 'rubocop-minitest'
gem 'xcodeproj'
end
16 changes: 15 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.4)
rexml
ast (2.4.2)
atomos (0.1.3)
claide (1.0.3)
colored2 (3.1.2)
minitest (5.14.4)
nanaimo (0.3.0)
parallel (1.20.1)
parser (3.0.2.0)
ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
rubocop (>= 0.90, < 2.0)
ruby-progressbar (1.11.0)
unicode-display_width (2.0.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
minitest!
rubocop!
rubocop-minitest!
xcodeproj!

BUNDLED WITH
2.2.15
2.2.22
56 changes: 32 additions & 24 deletions ios/test_app.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
manifest = app_manifest(project_root)
return if manifest.nil?

config = manifest[target_platform.to_s]
return config if !config.nil? && !config.empty?
return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
config = platform_config(project_root, target_platform)
return if config.nil?

bundle_identifier = config['bundleIdentifier']
bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
return bundle_identifier if bundle_identifier.is_a? String

@test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
config = platform_config(project_root, target_platform)
return if config.nil?

react_native_path = config['reactNativePath']
return react_native_path if react_native_path.is_a? String
end

def find_project_root
podfile_path = Thread.current.backtrace_locations.find do |location|
File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
react_native_path = react_native_from_manifest(project_root, target_platform)
return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
react_native_path = platform_config('reactNativePath', project_root, target_platform)
return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

react_native = case target_platform
when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
version = version[0] * 10_000 + version[1] * 100 + version[2]
version_macro = "REACT_NATIVE_VERSION=#{version}"

build_settings = {}

code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
if code_sign_entitlements.is_a? String
package_root = File.dirname(find_file('app.json', project_root))
entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
end

code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

development_team = platform_config('developmentTeam', project_root, target_platform)
build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

product_bundle_identifier = bundle_identifier(project_root, target_platform)
if product_bundle_identifier.is_a? String
build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
end

product_name = display_name || name
build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
product_name
else
target.name
end

supports_flipper = target_platform == :ios && flipper_enabled?(version)

app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
"USE_FLIPPER=#{use_flipper ? 1 : 0}",
]

if product_bundle_identifier.is_a? String
config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
config.build_settings[setting] = value
end

config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
product_name
else
target.name
end

next unless use_flipper

config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down
5 changes: 2 additions & 3 deletions macos/ReactTestApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = UBF8T346G9;
INFOPLIST_FILE = ReactTestApp/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All@@ -401,7 +400,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down
4 changes: 0 additions & 4 deletions macos/ReactTestApp/ReactTestApp.entitlements
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
</array>
</dict>
</plist>
10 changes: 8 additions & 2 deletions test/__fixtures__/with_platform_resources/app.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
},
"ios": {
"bundleIdentifier": "com.react.ReactTestApp-ios",
"reactNativePath": "react-native-ios"
"codeSignEntitlements": "codeSignEntitlements-ios",
"codeSignIdentity": "codeSignIdentity-ios",
"developmentTeam": "developmentTeam-ios",
"reactNativePath": "reactNativePath-ios"
},
"macos": {
"bundleIdentifier": "com.react.ReactTestApp-macos",
"reactNativePath": "react-native-macos"
"codeSignEntitlements": "codeSignEntitlements-macos",
"codeSignIdentity": "codeSignIdentity-macos",
"developmentTeam": "developmentTeam-macos",
"reactNativePath": "reactNativePath-macos"
}
}
27 changes: 22 additions & 5 deletions test/test_test_app.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
assert_nil(bundle_identifier(fixture_path('without_resources'), target))
end

define_method("test_#{target}_react_native_path") do
assert_equal("react-native-#{target}",
react_native_from_manifest(fixture_path('with_platform_resources'), target))
assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
define_method("test_#{target}_project_settings") do
%w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
assert_equal("#{setting}-#{target}",
platform_config(setting, fixture_path('with_platform_resources'), target))
assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
assert_nil(platform_config(setting, fixture_path('without_resources'), target))
end
end

define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
GC.enable
end
end

def test_macos_project_cannot_set_development_team
# Xcode expects the development team used for code signing to exist when
# targeting macOS. Unlike when targeting iOS, the warnings are treated as
# errors.
require 'xcodeproj'

project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
assert(test_app)
test_app.build_configurations.each do |config|
assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
end
end
end
, '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" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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('^' + ".*" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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('^' + ".*" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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('^' + ".*" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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('^' + ".*" + '

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end

, '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); }
})();
})();

Skip to content
fix(macos): fix "no account for team" and missing provisioning profile#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Tommy Nguyen (tido64)
merged 4 commits into

from

Oct 18, 2021
 Merged


fix(macos): fix "no account for team" and missing provisioning profile
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27a1bc2

fix(macos): fix "no account for team" and missing provisioning profile


tido64 Oct 16, 2021
b1fa61d

add tests


tido64 Oct 16, 2021
3c641c0

remove keychain entitlement + simplify tests


tido64 Oct 16, 2021
3b7afad

test development team


tido64 Oct 17, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Gemfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,4 +4,5 @@ source 'https://rubygems.org' do
 gem 'minitest'
 gem 'rubocop', require: false
 gem 'rubocop-minitest'
 gem 'xcodeproj'
end

16 changes: 15 additions & 1 deletion
Gemfile.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,14 @@ GEM
GEM
 remote: https://rubygems.org/
 specs:
 CFPropertyList (3.0.4)
 rexml
 ast (2.4.2)
 atomos (0.1.3)
 claide (1.0.3)
 colored2 (3.1.2)
 minitest (5.14.4)
 nanaimo (0.3.0)
 parallel (1.20.1)
 parser (3.0.2.0)
 ast (~> 2.4.1)
Expand All@@ -27,6 +33,13 @@ GEM
 rubocop (>= 0.90, < 2.0)
 ruby-progressbar (1.11.0)
 unicode-display_width (2.0.0)
 xcodeproj (1.21.0)
 CFPropertyList (>= 2.3.3, < 4.0)
 atomos (~> 0.1.3)
 claide (>= 1.0.2, < 2.0)
 colored2 (~> 3.1)
 nanaimo (~> 0.3.0)
 rexml (~> 3.2.4)

PLATFORMS
 ruby
Expand All@@ -35,6 +48,7 @@ DEPENDENCIES
 minitest!
 rubocop!
 rubocop-minitest!
 xcodeproj!

BUNDLED WITH
 2.2.15
 2.2.22

56 changes: 32 additions & 24 deletions
ios/test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,32 +41,21 @@ def autolink_script_version
 package_version(resolve_module('@react-native-community/cli-platform-ios'))
end

def platform_config(project_root, target_platform)
def platform_config(key, project_root, target_platform)
 manifest = app_manifest(project_root)
 return if manifest.nil?

 config = manifest[target_platform.to_s]
 return config if !config.nil? && !config.empty?
 return config[key] if !config.nil? && !config.empty?
end

def bundle_identifier(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 bundle_identifier = config['bundleIdentifier']
 bundle_identifier = platform_config('bundleIdentifier', project_root, target_platform)
 return bundle_identifier if bundle_identifier.is_a? String

 @test_app_bundle_identifier
end

def react_native_from_manifest(project_root, target_platform)
 config = platform_config(project_root, target_platform)
 return if config.nil?

 react_native_path = config['reactNativePath']
 return react_native_path if react_native_path.is_a? String
end

def find_project_root
 podfile_path = Thread.current.backtrace_locations.find do |location|
 File.basename(location.absolute_path) == 'Podfile'
Expand DownExpand Up@@ -101,8 +90,8 @@ def project_path(file, target_platform)
end

def react_native_path(project_root, target_platform)
 react_native_path = react_native_from_manifest(project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) unless react_native_path.nil?
 react_native_path = platform_config('reactNativePath', project_root, target_platform)
 return Pathname.new(resolve_module(react_native_path)) if react_native_path.is_a? String

 react_native = case target_platform
 when :ios then 'react-native'
Expand DownExpand Up@@ -245,8 +234,33 @@ def make_project!(xcodeproj, project_root, target_platform)
 version = version[0] * 10_000 + version[1] * 100 + version[2]
 version_macro = "REACT_NATIVE_VERSION=#{version}"

 build_settings = {}

 code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform)
 if code_sign_entitlements.is_a? String
 package_root = File.dirname(find_file('app.json', project_root))
 entitlements = Pathname.new(File.join(package_root, code_sign_entitlements))
 build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements.relative_path_from(destination).to_s
 end

 code_sign_identity = platform_config('codeSignIdentity', project_root, target_platform)
 build_settings['CODE_SIGN_IDENTITY'] = code_sign_identity if code_sign_identity.is_a? String

 development_team = platform_config('developmentTeam', project_root, target_platform)
 build_settings['DEVELOPMENT_TEAM'] = development_team if development_team.is_a? String

 product_bundle_identifier = bundle_identifier(project_root, target_platform)
 if product_bundle_identifier.is_a? String
 build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
 end

 product_name = display_name || name
 build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 supports_flipper = target_platform == :ios && flipper_enabled?(version)

 app_project = Xcodeproj::Project.open(dst_xcodeproj)
Expand All@@ -263,16 +277,10 @@ def make_project!(xcodeproj, project_root, target_platform)
 "USE_FLIPPER=#{use_flipper ? 1 : 0}",
 ]

if product_bundle_identifier.is_a? String
 config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = product_bundle_identifier
build_settings.each do |setting, value|
 config.build_settings[setting] = value
 end

 config.build_settings['PRODUCT_DISPLAY_NAME'] = if product_name.is_a? String
 product_name
 else
 target.name
 end

 next unless use_flipper

 config.build_settings['OTHER_SWIFT_FLAGS'] ||= [
Expand Down

5 changes: 2 additions & 3 deletions
macos/ReactTestApp.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -379,10 +379,9 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 DEVELOPMENT_TEAM = UBF8T346G9;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
Expand All@@ -401,7 +400,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CLANG_ENABLE_MODULES = YES;
 CODE_SIGN_ENTITLEMENTS = ReactTestApp/ReactTestApp.entitlements;
 CODE_SIGN_IDENTITY = "Apple Development";
 CODE_SIGN_IDENTITY = "-";
 CODE_SIGN_STYLE = Automatic;
 COMBINE_HIDPI_IMAGES = YES;
 INFOPLIST_FILE = ReactTestApp/Info.plist;
Expand Down

4 changes: 0 additions & 4 deletions
macos/ReactTestApp/ReactTestApp.entitlements

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,5 @@
	<true/>
	<key>com.apple.security.network.client</key>
	<true/>
	<key>keychain-access-groups</key>
	<array>
 <string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
	</array>
</dict>
</plist>

10 changes: 8 additions & 2 deletions
test/__fixtures__/with_platform_resources/app.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,16 @@
 },
 "ios": {
 "bundleIdentifier": "com.react.ReactTestApp-ios",
 "reactNativePath": "react-native-ios"
 "codeSignEntitlements": "codeSignEntitlements-ios",
 "codeSignIdentity": "codeSignIdentity-ios",
 "developmentTeam": "developmentTeam-ios",
 "reactNativePath": "reactNativePath-ios"
 },
 "macos": {
 "bundleIdentifier": "com.react.ReactTestApp-macos",
 "reactNativePath": "react-native-macos"
 "codeSignEntitlements": "codeSignEntitlements-macos",
 "codeSignIdentity": "codeSignIdentity-macos",
 "developmentTeam": "developmentTeam-macos",
 "reactNativePath": "reactNativePath-macos"
 }
}

27 changes: 22 additions & 5 deletions
test/test_test_app.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -127,11 +127,13 @@ def test_react_native_pods
 assert_nil(bundle_identifier(fixture_path('without_resources'), target))
 end

 define_method("test_#{target}_react_native_path") do
 assert_equal("react-native-#{target}",
 react_native_from_manifest(fixture_path('with_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_platform_resources'), target))
 assert_nil(react_native_from_manifest(fixture_path('without_resources'), target))
 define_method("test_#{target}_project_settings") do
 %w[codeSignEntitlements codeSignIdentity developmentTeam reactNativePath].each do |setting|
 assert_equal("#{setting}-#{target}",
 platform_config(setting, fixture_path('with_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_platform_resources'), target))
 assert_nil(platform_config(setting, fixture_path('without_resources'), target))
 end
 end

 define_method("test_#{target}_resources_pod_returns_spec_path") do
Expand DownExpand Up@@ -188,4 +190,19 @@ def test_react_native_pods
 GC.enable
 end
 end

 def test_macos_project_cannot_set_development_team
 # Xcode expects the development team used for code signing to exist when
 # targeting macOS. Unlike when targeting iOS, the warnings are treated as
 # errors.
 require 'xcodeproj'

 project = Xcodeproj::Project.open('macos/ReactTestApp.xcodeproj')
 test_app = project.targets.detect { |target| target.name == 'ReactTestApp' }
 assert(test_app)
 test_app.build_configurations.each do |config|
 assert_equal('-', config.build_settings['CODE_SIGN_IDENTITY'])
 assert_nil(config.build_settings['DEVELOPMENT_TEAM'])
 end
 end
end