Skip to content
New issue

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

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

Jump to bottom

fix: add ios 14 and above case #351

Merged
merged 12 commits into from
Jan 9, 2023
Merged

fix: add ios 14 and above case #351

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7db42b3
fix: udid reference in setAccess
KazuCocoa Dec 18, 2022
01e9fa8
add ios 14 and above case
KazuCocoa Dec 19, 2022
0cf4fde
tweak
KazuCocoa Dec 19, 2022
ba9c625
handle with try/catch
KazuCocoa Dec 19, 2022
707b118
fix typo
KazuCocoa Dec 19, 2022
8a4fda5
tweak
KazuCocoa Dec 19, 2022
ef9c0aa
Merge branch 'master' into fix-get-permission-io-14
KazuCocoa Dec 19, 2022
4adfb7e
Merge branch 'master' into fix-get-permission-io-14
KazuCocoa Jan 9, 2023
6527f30
use limited for newer version
KazuCocoa Jan 9, 2023
346b7c1
fix const
KazuCocoa Jan 9, 2023
76df4e8
use try/catch
KazuCocoa Jan 9, 2023
2972d66
fix lint
KazuCocoa Jan 9, 2023
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
Prev Previous commit
Next Next commit
use limited for newer version
  • Loading branch information
@KazuCocoa
KazuCocoa committed Jan 9, 2023
commit 6527f30c4628022f1f97e436250aa32b56ebd504
33 changes: 16 additions & 17 deletions lib/extensions/permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ import { fs, util } from '@appium/support';
import { exec } from 'teen_process';
import path from 'path';

const STATUS_UNSET = 'unset';
const STATUS_NO = 'no';
const STATUS_YES = 'yes';
const STATUS_LIMITED = 'limited';
const STATUS = Object.freeze({
UNSET: 'unset',
NO: 'no',
YES: 'yes',
LIMITED: 'limited',
});

const WIX_SIM_UTILS = 'applesimutils';
const SERVICES = Object.freeze({
calendar: 'kTCCServiceCalendar',
Expand All @@ -34,7 +37,7 @@ function toInternalServiceName (serviceName) {
}

function formatStatus (status) {
return [STATUS_UNSET, STATUS_NO].includes(status) ? _.toUpper(status) : status;
return [STATUS.UNSET, STATUS.NO].includes(status) ? _.toUpper(status) : status;
}

/**
Expand Down Expand Up @@ -119,25 +122,21 @@ async function getAccess (bundleId, serviceName, simDataRoot) {
return status;
}
}
return STATUS_UNSET;
return STATUS.UNSET;
};

try {
// iOS 14 and above
return await getAccessStatus(
[['0', STATUS_NO], ['2', STATUS_YES], ['3', STATUS_LIMITED]],
const xcodeVersion = await getVersion(true);
return xcodeVersion.major >= 13 ?
await getAccessStatus(
[['0', UNSET.NO], ['2', UNSET.YES], ['3', STATUS.LIMITED]],
'auth_value'
);
} catch {
// iOS 13 and below
return await getAccessStatus(
[['0', STATUS_NO], ['1', STATUS_YES]],
) :
await getAccessStatus(
[['0', UNSET.NO], ['1', UNSET.YES]],
'allowed'
);
}
}


const extensions = {};

/**
Expand Down