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

add sign_in_second_factor claim to FirebaseInfo #620

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
+16 −5
Open

add sign_in_second_factor claim to FirebaseInfo #620

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
b17602e
add: sign_in_second_factor and second_factor_identifier claims to Fir…
cainelli May 16, 2024
ae1229c
Merge branch 'dev' into 2fa-firebase-info
cainelli May 28, 2024
cb0ba64
Merge branch 'dev' into 2fa-firebase-info
cainelli Jun 11, 2024
3247cf1
Merge branch 'dev' into 2fa-firebase-info
cainelli Jul 3, 2024
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
8 changes: 5 additions & 3 deletions auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,11 @@ type Token struct {
//
// This data is provided by the Firebase Auth service and is a reserved claim in the ID token.
type FirebaseInfo struct {
SignInProvider string `json:"sign_in_provider"`
Tenant string `json:"tenant"`
Identities map[string]interface{} `json:"identities"`
SignInProvider string `json:"sign_in_provider"`
Tenant string `json:"tenant"`
Identities map[string]interface{} `json:"identities"`
SignInSecondFactor string `json:"sign_in_second_factor"`
SecondFactorIdentifier string `json:"second_factor_identifier"`
}

// baseClient exposes the APIs common to both auth.Client and auth.TenantClient.
Expand Down
13 changes: 11 additions & 2 deletions auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const (
testVersion = "test-version"
defaultIDToolkitV1Endpoint = "https://identitytoolkit.googleapis.com/v1"
defaultIDToolkitV2Endpoint = "https://identitytoolkit.googleapis.com/v2"
secondFactorIdentifier = "aaaaaaaa-1111-bbbb-2222-cccccccccccc"
)

var (
Expand Down Expand Up @@ -466,6 +467,12 @@ func TestVerifyIDToken(t *testing.T) {
if ft.UID != ft.Subject {
t.Errorf("UID = %q; Sub = %q; want UID = Sub", ft.UID, ft.Subject)
}
if ft.Firebase.SignInSecondFactor != "totp" {
t.Errorf("SignInSecondFactor = %q; want = %q", ft.Firebase.SignInSecondFactor, "totp")
}
if ft.Firebase.SecondFactorIdentifier != secondFactorIdentifier {
t.Errorf("SecondFactorIdentifier = %q; want = %q", ft.Firebase.SecondFactorIdentifier, secondFactorIdentifier)
}
}

func TestVerifyIDTokenFromTenant(t *testing.T) {
Expand Down Expand Up @@ -1362,8 +1369,10 @@ func getIDTokenWithSignerAndKid(signer cryptoSigner, kid string, p mockIDTokenPa
"auth_time": testClock.Now().Unix() - 100,
"sub": "1234567890",
"firebase": map[string]interface{}{
"identities": map[string]interface{}{},
"sign_in_provider": "custom",
"identities": map[string]interface{}{},
"sign_in_provider": "custom",
"sign_in_second_factor": "totp",
"second_factor_identifier": secondFactorIdentifier,
},
"admin": true,
}
Expand Down