Fix unicode issue for global id conversion.

Author: markus

graphql_relay/node/node.py

@@ -1,6 +1,8 @@
 from collections import OrderedDict
 from graphql_relay.utils import base64, unbase64
 
+from six import text_type
+
 from graphql.type import (
     GraphQLArgument,
     GraphQLNonNull,
@@ -52,7 +54,7 @@ def to_global_id(type, id):
     Takes a type name and an ID specific to that type name, and returns a
     "global ID" that is unique among all types.
     '''
-    return base64(':'.join([type, str(id)]))
+    return base64(':'.join([type, text_type(id)]))
 
 
 def from_global_id(global_id):

graphql_relay/node/tests/__init__.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 from collections import namedtuple
 from graphql import graphql
 from graphql.type import (
@@ -10,7 +13,7 @@
     GraphQLID,
 )
 
-from graphql_relay.node.node import node_definitions
+from ..node import node_definitions, to_global_id, from_global_id
 
 User = namedtuple('User', ['id', 'name'])
 Photo = namedtuple('Photo', ['id', 'width'])
@@ -328,3 +331,25 @@ def test_has_correct_node_root_field():
     result = graphql(schema, query)
     assert not result.errors
     assert result.data == expected
+
+
+def test_to_global_id_converts_unicode_strings_correctly():
+    my_unicode_id = u'ûñö'
+    g_id = to_global_id('MyType', my_unicode_id)
+    assert g_id == 'TXlUeXBlOsO7w7HDtg=='
+
+    my_unicode_id = u'\u06ED'
+    g_id = to_global_id('MyType', my_unicode_id)
+    assert g_id == 'TXlUeXBlOtut'
+
+
+def test_from_global_id_converts_unicode_strings_correctly():
+    my_unicode_id = u'ûñö'
+    my_type, my_id = from_global_id('TXlUeXBlOsO7w7HDtg==')
+    assert my_type == 'MyType'
+    assert my_id == my_unicode_id
+
+    my_unicode_id = u'\u06ED'
+    my_type, my_id = from_global_id('TXlUeXBlOtut')
+    assert my_type == 'MyType'
+    assert my_id == my_unicode_id

graphql_relay/node/tests/test_node.py

@@ -11,6 +11,10 @@ def test_base64_encode_unicode_strings_correctly():
     my_base64 = utils.base64(my_unicode)
     assert my_base64 == base64.b64encode(my_unicode.encode('utf-8')).decode('utf-8')
 
+    my_unicode = u'\u06ED'
+    my_base64 = utils.base64(my_unicode)
+    assert my_base64 == base64.b64encode(my_unicode.encode('utf-8')).decode('utf-8')
+
 
 def test_base64_encode_strings_correctly():
     my_string = 'abc'