Avoid setting empty claims

… and remove duplicate (and unneeded) "main" claims: Firebase expects all claims to be bundled in a "claims" claim.
kreait · Feb 19, 2017 · 44dbe40 · 44dbe40
1 parent 9abb9a4
commit 44dbe40
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Unreleased
+
+- Fixed [https://github.com/kreait/firebase-php/issues/65](kreait/firebase-php#65):
+  invalid custom token when no claims are given. 
+
 ## 1.1.0 - 2017-02-18
 
 - Replaced `StaticKeyStore` with `HttpKeyStore`, which fetches frech Google Public Keys

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 A library to work with [Google Firebase](https://firebase.google.com>) tokens. You can use it to 
 [create custom tokens](https://firebase.google.com/docs/auth/admin/create-custom-tokens) and 
-[verify ID Tokens](https://firebase.google.com/docs/auth/admin/verify-id-tokens).  
+[verify ID Tokens](https://firebase.google.com/docs/auth/admin/verify-id-tokens).
 
 ## Installation
 

diff --git a/src/Generator.php b/src/Generator.php
@@ -53,12 +53,10 @@ public function __construct(
      */
     public function createCustomToken($uid, array $claims = []): Token
     {
-        foreach ($claims as $key => $value) {
-            $this->builder->set($key, $value);
+        if (count($claims)) {
+            $this->builder->set('claims', $claims);
         }
 
-        $this->builder->set('claims', $claims);
-
         $this->builder->set('uid', (string) $uid);
 
         $now = time();

diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
@@ -24,4 +24,11 @@ public function testCreateCustomToken()
 
         $this->assertInstanceOf(Token::class, $token);
     }
+
+    public function testCreateCustomTokenWithEmptyClaims()
+    {
+        $token = $this->generator->createCustomToken('some-uid');
+
+        $this->assertInstanceOf(Token::class, $token);
+    }
 }