Skip to content

Commit 7dca318

Browse files
Fix other tabs, ugh.
1 parent 908eb9c commit 7dca318

File tree

1 file changed

+34
-33
lines changed

1 file changed

+34
-33
lines changed

addons/godot-firebase/auth/auth.gd

+34-33
Original file line numberDiff line numberDiff line change
@@ -441,31 +441,32 @@ func _on_FirebaseAuth_request_completed(result : int, response_code : int, heade
441441
_needs_refresh = false
442442
login_succeeded.emit(auth)
443443
else:
444-
match res.kind:
445-
RESPONSE_SIGNUP:
446-
auth = get_clean_keys(res)
447-
signup_succeeded.emit(auth)
448-
begin_refresh_countdown()
449-
RESPONSE_SIGNIN, RESPONSE_ASSERTION, RESPONSE_CUSTOM_TOKEN:
450-
auth = get_clean_keys(res)
451-
login_succeeded.emit(auth)
452-
begin_refresh_countdown()
453-
RESPONSE_USERDATA:
454-
var userdata = FirebaseUserData.new(res.users[0])
455-
userdata_received.emit(userdata)
456-
auth_request.emit(1, auth)
457-
else:
458-
# error message would be INVALID_EMAIL, EMAIL_NOT_FOUND, INVALID_PASSWORD, USER_DISABLED or WEAK_PASSWORD
459-
if requesting == Requests.EXCHANGE_TOKEN:
460-
token_exchanged.emit(false)
461-
login_failed.emit(res.error, res.error_description)
462-
auth_request.emit(res.error, res.error_description)
463-
else:
464-
var sig = signup_failed if auth_request_type == Auth_Type.SIGNUP_EP else login_failed
465-
sig.emit(res.error.code, res.error.message)
466-
auth_request.emit(res.error.code, res.error.message)
467-
requesting = Requests.NONE
468-
auth_request_type = Auth_Type.NONE
444+
match res.kind:
445+
RESPONSE_SIGNUP:
446+
auth = get_clean_keys(res)
447+
signup_succeeded.emit(auth)
448+
begin_refresh_countdown()
449+
RESPONSE_SIGNIN, RESPONSE_ASSERTION, RESPONSE_CUSTOM_TOKEN:
450+
auth = get_clean_keys(res)
451+
login_succeeded.emit(auth)
452+
begin_refresh_countdown()
453+
RESPONSE_USERDATA:
454+
var userdata = FirebaseUserData.new(res.users[0])
455+
userdata_received.emit(userdata)
456+
auth_request.emit(1, auth)
457+
else:
458+
# error message would be INVALID_EMAIL, EMAIL_NOT_FOUND, INVALID_PASSWORD, USER_DISABLED or WEAK_PASSWORD
459+
if requesting == Requests.EXCHANGE_TOKEN:
460+
token_exchanged.emit(false)
461+
login_failed.emit(res.error, res.error_description)
462+
auth_request.emit(res.error, res.error_description)
463+
else:
464+
var sig = signup_failed if auth_request_type == Auth_Type.SIGNUP_EP else login_failed
465+
sig.emit(res.error.code, res.error.message)
466+
auth_request.emit(res.error.code, res.error.message)
467+
468+
requesting = Requests.NONE
469+
auth_request_type = Auth_Type.NONE
469470

470471

471472
# Function used to save the auth data provided by Firebase into an encrypted file
@@ -595,14 +596,14 @@ func get_user_data() -> void:
595596

596597
# Function used to delete the account of the currently authenticated user
597598
func delete_user_account() -> void:
598-
if _is_ready():
599-
is_busy = true
600-
var err = request(_base_url + _delete_account_request_url, _headers, HTTPClient.METHOD_POST, JSON.stringify({"idToken":auth.idtoken}))
601-
if err != OK:
602-
is_busy = false
603-
Firebase._printerr("Error deleting user: %s" % err)
604-
else:
605-
remove_auth()
599+
if _is_ready():
600+
is_busy = true
601+
var err = request(_base_url + _delete_account_request_url, _headers, HTTPClient.METHOD_POST, JSON.stringify({"idToken":auth.idtoken}))
602+
if err != OK:
603+
is_busy = false
604+
Firebase._printerr("Error deleting user: %s" % err)
605+
else:
606+
remove_auth()
606607

607608

608609
# Function is called when a new token is issued to a user. The function will yield until the token has expired, and then request a new one.

0 commit comments

Comments
 (0)