Fix remember me (#67)

the-mirror-gdp · Mar 29, 2024 · d2ae414 · d2ae414
1 parent 389cac0
commit d2ae414
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/mirror-godot-app/ui/login/login_ui.gd b/mirror-godot-app/ui/login/login_ui.gd
@@ -84,7 +84,7 @@ func _deeplink_login_as_user(access_token: String, refresh_token: String, space_
 func _logged_out():
 	_connect_popup.hide()
 	_sign_in_menu.show()
-	Firebase.Auth.remove_auth()
+	# don't call remove_auth here; that's handled by the Firebase addon when logout() is called. Otherwise, Remember Me will fail
 
 
 ## Retrieves a profile for this firebase UID
@@ -269,12 +269,6 @@ func _on_sign_up_here_pressed() -> void:
 	)
 
 
-func _on_remember_me_changed(state: bool) -> void:
-	# ensure we empty the auth token on setting it false
-	if not state:
-		Firebase.Auth.remove_auth()
-
-
 func _on_login_anonymously_pressed():
 	Firebase.Auth.login_anonymous()
 

diff --git a/mirror-godot-app/ui/login/login_ui.tscn b/mirror-godot-app/ui/login/login_ui.tscn
@@ -167,8 +167,8 @@ size_flags_horizontal = 4
 theme_override_colors/font_color = Color(0.145098, 0.419608, 0.984314, 1)
 theme_override_fonts/font = SubResource("Font_oqr4b")
 theme_override_font_sizes/font_size = 14
-theme_override_styles/normal = ExtResource("17_i5gqh")
 theme_override_styles/hover = ExtResource("18_hffas")
+theme_override_styles/normal = ExtResource("17_i5gqh")
 text = "sign up here"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/SignInMenu/MarginContainer/LoginContainer"]
@@ -209,8 +209,8 @@ caret_blink = true
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 placeholder_text = "Password"
-secret = true
 caret_blink = true
+secret = true
 
 [node name="RememberMe" type="CheckBox" parent="VBoxContainer/SignInMenu/MarginContainer/LoginContainer"]
 unique_name_in_owner = true
@@ -237,8 +237,8 @@ layout_mode = 2
 size_flags_horizontal = 4
 theme_override_colors/font_color = Color(0.145098, 0.419608, 0.984314, 1)
 theme_override_fonts/font = SubResource("Font_oqr4b")
-theme_override_styles/normal = ExtResource("17_i5gqh")
 theme_override_styles/hover = ExtResource("18_hffas")
+theme_override_styles/normal = ExtResource("17_i5gqh")
 text = "Forgot Password?"
 
 [node name="RegisterContainer" type="VBoxContainer" parent="VBoxContainer/SignInMenu/MarginContainer"]
@@ -278,8 +278,8 @@ size_flags_horizontal = 4
 theme_override_colors/font_color = Color(0.145098, 0.419608, 0.984314, 1)
 theme_override_fonts/font = SubResource("Font_oqr4b")
 theme_override_font_sizes/font_size = 14
-theme_override_styles/normal = ExtResource("17_i5gqh")
 theme_override_styles/hover = ExtResource("18_hffas")
+theme_override_styles/normal = ExtResource("17_i5gqh")
 text = "Sign in here"
 
 [node name="LineSeparator" type="HSeparator" parent="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer"]
@@ -322,8 +322,8 @@ text = "Please enter your email"
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 placeholder_text = "Password"
-secret = true
 caret_blink = true
+secret = true
 
 [node name="ErrorLabel" type="Label" parent="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/Password"]
 visible = false
@@ -338,8 +338,8 @@ text = "Please enter your password"
 custom_minimum_size = Vector2(0, 40)
 layout_mode = 2
 placeholder_text = "Confirm Password"
-secret = true
 caret_blink = true
+secret = true
 
 [node name="ErrorLabel" type="Label" parent="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ConfirmPassword"]
 visible = false
@@ -375,8 +375,8 @@ layout_mode = 2
 size_flags_horizontal = 4
 theme_override_colors/font_color = Color(0.145098, 0.419608, 0.984314, 1)
 theme_override_fonts/font = SubResource("Font_oqr4b")
-theme_override_styles/normal = ExtResource("17_i5gqh")
 theme_override_styles/hover = ExtResource("18_hffas")
+theme_override_styles/normal = ExtResource("17_i5gqh")
 text = "Terms of Service"
 
 [node name="Label2" type="Label" parent="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ToS"]
@@ -392,8 +392,8 @@ layout_mode = 2
 size_flags_horizontal = 4
 theme_override_colors/font_color = Color(0.145098, 0.419608, 0.984314, 1)
 theme_override_fonts/font = SubResource("Font_oqr4b")
-theme_override_styles/normal = ExtResource("17_i5gqh")
 theme_override_styles/hover = ExtResource("18_hffas")
+theme_override_styles/normal = ExtResource("17_i5gqh")
 text = "Privacy Policy"
 
 [node name="SignUp" type="Button" parent="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer"]
@@ -457,7 +457,6 @@ text = "Cancel"
 [connection signal="item_selected" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/DevLoginOptions" to="." method="_on_dev_login_options_item_selected"]
 [connection signal="text_submitted" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/Username" to="." method="_on_text_submitted"]
 [connection signal="text_submitted" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/Password" to="." method="_on_text_submitted"]
-[connection signal="toggled" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/RememberMe" to="." method="_on_remember_me_changed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/SignIn" to="." method="_on_sign_in_pressed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/LoginAnonymously" to="." method="_on_login_anonymously_pressed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/LoginContainer/ForgotPassword" to="." method="_on_forgot_password_pressed"]
@@ -466,7 +465,6 @@ text = "Cancel"
 [connection signal="text_submitted" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/Email" to="." method="_on_text_submitted"]
 [connection signal="text_submitted" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/Password" to="." method="_on_text_submitted"]
 [connection signal="text_submitted" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ConfirmPassword" to="." method="_on_text_submitted"]
-[connection signal="toggled" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ToS/ToSCheckbox" to="." method="_on_remember_me_changed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ToS/ToSLink" to="." method="_on_tos_link_pressed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/ToS/PrivacyLink" to="." method="_on_privacy_link_pressed"]
 [connection signal="pressed" from="VBoxContainer/SignInMenu/MarginContainer/RegisterContainer/SignUp" to="." method="_on_sign_up_pressed"]