Skip to content

[Oztechan/AdTrack#35] Split OAuth client id into per-platform (Android/iOS) #36

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
mustafaozhan merged 1 commit into from
Jul 7, 2026
Merged

[Oztechan/AdTrack#35] Split OAuth client id into per-platform (Android/iOS) #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
workflow_dispatch: # Allows manual trigger

env:
GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID }}
GOOGLE_OAUTH_CLIENT_ID_ANDROID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID_ANDROID }}
GOOGLE_OAUTH_CLIENT_ID_IOS: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID_IOS }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
CI: true

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

env:
GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID }}
GOOGLE_OAUTH_CLIENT_ID_ANDROID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID_ANDROID }}
GOOGLE_OAUTH_CLIENT_ID_IOS: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID_IOS }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
# iOS signing (App Store Connect API key) + Firebase App Distribution + match
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
Expand Down
26 changes: 24 additions & 2 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ val secretProps = Properties().apply {
fun secret(key: String, default: String): String =
secretProps.getProperty(key) ?: project.findProperty(key)?.toString() ?: System.getenv(key) ?: default

val oauthClientId = secret("GOOGLE_OAUTH_CLIENT_ID", "YOUR_OAUTH_CLIENT_ID.apps.googleusercontent.com")
// Native OAuth clients are per-platform (separate Google Cloud client ids for Android & iOS).
val oauthClientIdAndroid = secret(
"GOOGLE_OAUTH_CLIENT_ID_ANDROID",
"YOUR_ANDROID_OAUTH_CLIENT_ID.apps.googleusercontent.com"
)
val oauthClientIdIos = secret("GOOGLE_OAUTH_CLIENT_ID_IOS", "YOUR_IOS_OAUTH_CLIENT_ID.apps.googleusercontent.com")
// endregion

kotlin {
Expand Down Expand Up @@ -111,9 +116,26 @@ buildkonfig {
packageName = "${ProjectSettings.PROJECT_ID}.config"

defaultConfigs {
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientId)
// Fallback (Android client id); overridden per target below so shared code can keep
// referencing BuildKonfig.GOOGLE_OAUTH_CLIENT_ID and get the platform-correct value.
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientIdAndroid)
buildConfigField(STRING, "OAUTH_REDIRECT_SCHEME", ProjectSettings.PROJECT_ID)
}

targetConfigs {
create("android") {
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientIdAndroid)
}
create("iosX64") {
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientIdIos)
}
create("iosArm64") {
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientIdIos)
}
create("iosSimulatorArm64") {
buildConfigField(STRING, "GOOGLE_OAUTH_CLIENT_ID", oauthClientIdIos)
}
}
}

dependencies {
Expand Down