update v1.3

Author: fenix-hub

addons/godot-firebase/auth/auth.gd

@@ -36,13 +36,12 @@ var _needs_refresh : bool = false
 var is_busy : bool = false
 
 var _headers : PoolStringArray = [
-    "Content-Type: application/json",
-#    "Access-Control-Allow-Origin: *"
+    "Accept: application/json"
    ]
 
 var requesting : int = -1
 
-enum REQUESTS {
+enum Requests {
     NONE = -1,
     EXCHANGE_TOKEN,
     LOGIN_WITH_OAUTH,
@@ -196,7 +195,7 @@ func exchange_google_token(google_token : String) -> void:
         _google_token_body.code = google_token
         _google_token_body.client_id = _config.clientId
         _google_token_body.client_secret = _config.clientSecret
-        requesting = REQUESTS.EXCHANGE_TOKEN
+        requesting = Requests.EXCHANGE_TOKEN
         request(_google_token_request_url, _headers, true, HTTPClient.METHOD_POST, JSON.print(_google_token_body))
 
 # Login with Google oAuth2.
@@ -209,7 +208,7 @@ func login_with_oauth(google_token: String, provider_id : String = "google.com",
         is_busy = true
         _oauth_login_request_body.postBody = _post_body.replace("[GOOGLE_ID_TOKEN]", auth.idtoken).replace("[PROVIDER_ID]", provider_id)
         _oauth_login_request_body.requestUri = _request_uri.replace("[REQUEST_URI]", request_uri)
-        requesting = REQUESTS.LOGIN_WITH_OAUTH
+        requesting = Requests.LOGIN_WITH_OAUTH
         request(_signin_with_oauth_request_url, _headers, true, HTTPClient.METHOD_POST, JSON.print(_oauth_login_request_body))
 
 # Function used to logout of the system, this will also remove the local encrypted auth file if there is one
@@ -246,7 +245,7 @@ func _on_FirebaseAuth_request_completed(result : int, response_code : int, heade
         if not res.has("kind"):
             auth = get_clean_keys(res)
             match requesting:
-                REQUESTS.EXCHANGE_TOKEN:
+                Requests.EXCHANGE_TOKEN:
                     emit_signal("token_exchanged", true)
             begin_refresh_countdown()
         else:
@@ -264,12 +263,12 @@ func _on_FirebaseAuth_request_completed(result : int, response_code : int, heade
                     emit_signal("userdata_received", userdata)
     else:
                 # error message would be INVALID_EMAIL, EMAIL_NOT_FOUND, INVALID_PASSWORD, USER_DISABLED or WEAK_PASSWORD
-        if requesting == REQUESTS.EXCHANGE_TOKEN:
+        if requesting == Requests.EXCHANGE_TOKEN:
             emit_signal("token_exchanged", false)
             emit_signal("login_failed", res.error, res.error_description)
         else:
             emit_signal("login_failed", res.error.code, res.error.message)
-    requesting = REQUESTS.NONE
+    requesting = Requests.NONE
 
 # Function used to save the auth data provided by Firebase into an encrypted file
 # Note this does not work in HTML5 or UWP
@@ -329,7 +328,7 @@ func change_user_email(email : String) -> void:
 func change_user_password(password : String) -> void:
     if _is_ready():
         is_busy = true
-        _change_password_body.email = password
+        _change_password_body.password = password
         _change_password_body.idToken = auth.idtoken
         request(_update_account_request_url, _headers, true, HTTPClient.METHOD_POST, JSON.print(_change_password_body))
 

addons/godot-firebase/database/database.gd

@@ -6,25 +6,21 @@ tool
 class_name FirebaseDatabase
 extends Node
 
-const ORDER_BY : String = "orderBy"
-const LIMIT_TO_FIRST : String = "limitToFirst"
-const LIMIT_TO_LAST : String = "limitToLast"
-const START_AT : String = "startAt"
-const END_AT : String = "endAt"
-const EQUAL_TO : String = "equalTo"
+var _config : Dictionary = {}
 
-var config : Dictionary = {}
-
-var auth : Dictionary = {}
+var _auth : Dictionary = {}
 
 func _set_config(config_json : Dictionary) -> void:
-    config = config_json
+    _config = config_json
 
 func _on_FirebaseAuth_login_succeeded(auth_result : Dictionary) -> void:
-    auth = auth_result
+    _auth = auth_result
 
 func _on_FirebaseAuth_token_refresh_succeeded(auth_result : Dictionary) -> void:
-    auth = auth_result
+    _auth = auth_result
+
+func _on_FirebaseAuth_logout() -> void:
+    _auth = {}
 
 func get_database_reference(path : String, filter : Dictionary = {}) -> FirebaseDatabaseReference:
     var firebase_reference : FirebaseDatabaseReference = FirebaseDatabaseReference.new()
@@ -33,7 +29,7 @@ func get_database_reference(path : String, filter : Dictionary = {}) -> Firebase
     listener.set_script(load("res://addons/http-sse-client/HTTPSSEClient.gd"))
     var store : FirebaseDatabaseStore = FirebaseDatabaseStore.new()
     firebase_reference.set_db_path(path, filter)
-    firebase_reference.set_auth_and_config(auth, config)
+    firebase_reference.set_auth_and_config(_auth, _config)
     firebase_reference.set_pusher(pusher)
     firebase_reference.set_listener(listener)
     firebase_reference.set_store(store)

addons/godot-firebase/database/reference.gd

@@ -12,6 +12,13 @@ signal patch_data_update(data)
 signal push_successful()
 signal push_failed()
 
+const ORDER_BY : String = "orderBy"
+const LIMIT_TO_FIRST : String = "limitToFirst"
+const LIMIT_TO_LAST : String = "limitToLast"
+const START_AT : String = "startAt"
+const END_AT : String = "endAt"
+const EQUAL_TO : String = "equalTo"
+
 var _pusher : HTTPRequest
 var _listener : Node
 var _store : FirebaseDatabaseStore
@@ -37,9 +44,7 @@ const _escaped_quote : String = "\""
 const _equal_tag : String = "="
 const _key_filter_tag : String = "$key"
 
-var _headers : PoolStringArray = [   
-    "Access-Control-Allow-Origin: *"
-   ]
+var _headers : PoolStringArray = []
 
 func set_db_path(path : String, filter_query_dict : Dictionary) -> void:
     _db_path = path
@@ -130,12 +135,11 @@ func _get_filter():
     # At the moment, this means you can't dynamically change your filter; I think it's okay to specify that in the rules.
     if !_cached_filter:
         _cached_filter = ""
-        if _filter_query.has(get_parent().ORDER_BY):
-            _cached_filter += get_parent().ORDER_BY + _equal_tag + _escaped_quote + _filter_query[get_parent().ORDER_BY] + _escaped_quote
-            _filter_query.erase(get_parent().ORDER_BY)
+        if _filter_query.has(ORDER_BY):
+            _cached_filter += ORDER_BY + _equal_tag + _escaped_quote + _filter_query[ORDER_BY] + _escaped_quote
+            _filter_query.erase(ORDER_BY)
         else:
-            _cached_filter += get_parent().ORDER_BY + _equal_tag + _escaped_quote + _key_filter_tag + _escaped_quote # Presumptuous, but to get it to work at all...
-
+            _cached_filter += ORDER_BY + _equal_tag + _escaped_quote + _key_filter_tag + _escaped_quote # Presumptuous, but to get it to work at all...
         for key in _filter_query.keys():
             _cached_filter += _filter_tag + key + _equal_tag + _filter_query[key]
 

addons/godot-firebase/dynamiclinks/dynamiclinks.gd

@@ -9,7 +9,7 @@ extends Node
 
 signal dynamic_link_generated(link_result)
 
-const _authorization_header : String = "Authorization: Bearer "
+const _AUTHORIZATION_HEADER : String = "Authorization: Bearer "
 
 var request : int = -1
 
@@ -20,11 +20,9 @@ var _config : Dictionary = {}
 var _auth : Dictionary
 var _request_list_node : HTTPRequest
 
-var _headers : PoolStringArray = [   
-    "Access-Control-Allow-Origin: *"
-   ]
+var _headers : PoolStringArray = []
 
-enum REQUESTS {
+enum Requests {
     NONE = -1,
     GENERATE
    }
@@ -56,7 +54,7 @@ var _link_request_body : Dictionary = {
 ## This function is used to generate a dynamic link using the Firebase REST API
 ## It will return a JSON with the shortened link
 func generate_dynamic_link(long_link : String, APN : String, IBI : String, is_unguessable : bool) -> void:
-    request = REQUESTS.GENERATE
+    request = Requests.GENERATE
     _link_request_body.dynamicLinkInfo.domainUriPrefix = _config.domainUriPrefix
     _link_request_body.dynamicLinkInfo.link = long_link
     _link_request_body.dynamicLinkInfo.androidInfo.androidPackageName = APN
@@ -70,13 +68,13 @@ func generate_dynamic_link(long_link : String, APN : String, IBI : String, is_un
 func _on_request_completed(result : int, response_code : int, headers : PoolStringArray, body : PoolByteArray) -> void:
     var result_body : Dictionary = JSON.parse(body.get_string_from_utf8()).result
     emit_signal("dynamic_link_generated", result_body.shortLink)
-    request = REQUESTS.NONE
+    request = Requests.NONE
 
 func _on_FirebaseAuth_login_succeeded(auth_result : Dictionary) -> void:
     _auth = auth_result
 
 func _on_FirebaseAuth_token_refresh_succeeded(auth_result : Dictionary) -> void:
     _auth = auth_result
-    
-func _on_firebaseAuth_clear_auth():
+
+func _on_FirebaseAuth_logout() -> void:
     _auth = {}

addons/godot-firebase/firebase/firebase.gd

@@ -47,19 +47,9 @@ var _config : Dictionary = {
     "clientId": "",
     "clientSecret": "",
     "domainUriPrefix": "",
+    "cacheLocation": "user://.firebase_cache"
 }
 
-func _load_config() -> void:
-    if ProjectSettings.has_setting(_ENVIRONMENT_VARIABLES+"apiKey"):
-        for key in _config.keys():
-            if ProjectSettings.get_setting(_ENVIRONMENT_VARIABLES+key)!="":
-                _config[key] = ProjectSettings.get_setting(_ENVIRONMENT_VARIABLES+key)
-            else:
-                if _config[key] == "":
-                    printerr("Configuration key '{key}' not found!".format({key = key}))
-    else:
-        printerr("No configuration settings found, add them in override.cfg file.")
-
 func _ready() -> void:
     _load_config()
     for module in get_children():
@@ -70,3 +60,15 @@ func _ready() -> void:
         Auth.connect("signup_succeeded", module, "_on_FirebaseAuth_login_succeeded")
         Auth.connect("token_refresh_succeeded", module, "_on_FirebaseAuth_token_refresh_succeeded")
         Auth.connect("logged_out", module, "_on_FirebaseAuth_logout")
+
+func _load_config() -> void:
+    if ProjectSettings.has_setting(_ENVIRONMENT_VARIABLES+"apiKey"):
+        for key in _config.keys():
+            var env_var : String = _ENVIRONMENT_VARIABLES + key
+            if ProjectSettings.has_setting(env_var) and ProjectSettings.get_setting(env_var) != "":
+                _config[key] = ProjectSettings.get_setting(env_var)
+            else:
+                if _config[key] == "":
+                    printerr("Configuration key '{key}' not found!".format({key = key}))
+    else:
+        printerr("No configuration settings found, add them in override.cfg file.")