1
0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00

Switch to API key (#566)

This commit is contained in:
Vince Grassia
2024-08-26 11:49:15 -04:00
committed by GitHub
parent ffac82e865
commit 14314a3553
2 changed files with 35 additions and 12 deletions

View File

@@ -576,12 +576,20 @@ jobs:
- name: Install Node dependencies - name: Install Node dependencies
run: npm install run: npm install
- name: Set up private auth key
run: |
mkdir ~/private_keys
cat << EOF > ~/private_keys/AuthKey_UFD296548T.p8
${{ secrets.APP_STORE_CONNECT_AUTH_KEY }}
EOF
- name: Build application - name: Build application
run: npm run dist:mac run: npm run dist:mac
env: env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APP_STORE_CONNECT_TEAM_ISSUER: ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APP_STORE_CONNECT_AUTH_KEY: UFD296548T
APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_UFD296548T.p8
CSC_FOR_PULL_REQUEST: true CSC_FOR_PULL_REQUEST: true
- name: Upload .zip artifact - name: Upload .zip artifact

View File

@@ -7,15 +7,30 @@ exports.default = async function notarizing(context) {
if (electronPlatformName !== "darwin") { if (electronPlatformName !== "darwin") {
return; return;
} }
const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
const appName = context.packager.appInfo.productFilename; const appName = context.packager.appInfo.productFilename;
return await notarize({ if (process.env.APP_STORE_CONNECT_TEAM_ISSUER) {
tool: "notarytool", const appleApiIssuer = process.env.APP_STORE_CONNECT_TEAM_ISSUER;
appBundleId: "com.bitwarden.directory-connector", const appleApiKey = process.env.APP_STORE_CONNECT_AUTH_KEY_PATH;
appPath: `${appOutDir}/${appName}.app`, const appleApiKeyId = process.env.APP_STORE_CONNECT_AUTH_KEY;
teamId: "LTZ2PFU5D6", return await notarize({
appleId: appleId, tool: "notarytool",
appleIdPassword: appleIdPassword, appBundleId: "com.bitwarden.directory-connector",
}); appPath: `${appOutDir}/${appName}.app`,
appleApiIssuer: appleApiIssuer,
appleApiKey: appleApiKey,
appleApiKeyId: appleApiKeyId,
});
} else {
const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
return await notarize({
tool: "notarytool",
appBundleId: "com.bitwarden.directory-connector",
appPath: `${appOutDir}/${appName}.app`,
teamId: "LTZ2PFU5D6",
appleId: appleId,
appleIdPassword: appleIdPassword,
});
}
}; };