Skip to content

Commit 1b1c724

Browse files
fenix-hubfenix-hub
committed
fix storage code
1 parent a603d73 commit 1b1c724

File tree

19 files changed

+1077
-1078
lines changed

19 files changed

+1077
-1078
lines changed

‎addons/supabase/Auth/auth.gd‎

Lines changed: 207 additions & 207 deletions
Large diffs are not rendered by default.

‎addons/supabase/Auth/auth_error.gd‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ extends BaseError
33
class_name SupabaseAuthError
44

55
func _init(dictionary : Dictionary = {}) -> void:
6-
_error = dictionary
7-
if not _error.is_empty():
8-
type = _error.get("error", "(undefined)")
9-
hint = _error.get("error_description", "(undefined)")
10-
if _error.has("code"):
11-
code = str(_error.get("code", -1))
12-
message = _error.get("msg", "(undefined)")
13-
# different body for same api source ???
6+
_error = dictionary
7+
if not _error.is_empty():
8+
type = _error.get("error", "(undefined)")
9+
hint = _error.get("error_description", "(undefined)")
10+
if _error.has("code"):
11+
code = str(_error.get("code", -1))
12+
message = _error.get("msg", "(undefined)")
13+
# different body for same api source ???
1414

1515

‎addons/supabase/Auth/auth_task.gd‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,62 @@ extends BaseTask
33
class_name AuthTask
44

55
enum Task {
6-
NONE,
7-
SIGNUP,
8-
SIGNUPPHONEPASSWORD,
9-
SIGNIN,
10-
SIGNINANONYM,
11-
SIGNINOTP,
12-
MAGICLINK,
13-
LOGOUT,
14-
USER,
15-
UPDATE,
16-
RECOVER,
17-
REFRESH,
18-
INVITE,
19-
VERIFYOTP
6+
NONE,
7+
SIGNUP,
8+
SIGNUPPHONEPASSWORD,
9+
SIGNIN,
10+
SIGNINANONYM,
11+
SIGNINOTP,
12+
MAGICLINK,
13+
LOGOUT,
14+
USER,
15+
UPDATE,
16+
RECOVER,
17+
REFRESH,
18+
INVITE,
19+
VERIFYOTP
2020
}
2121

2222
# EXPOSED VARIABLES ---------------------------------------------------------
2323
var user : SupabaseUser
2424
# ---------------------------------------------------------------------------
2525

2626
func match_code(code: int = Task.NONE) -> int:
27-
match code:
28-
Task.SIGNIN, Task.SIGNUP, Task.LOGOUT, Task.MAGICLINK, Task.RECOVER, Task.REFRESH, Task.INVITE, Task.VERIFYOTP:
29-
return HTTPClient.METHOD_POST
30-
Task.UPDATE:
31-
return HTTPClient.METHOD_PUT
32-
_, Task.USER:
33-
return HTTPClient.METHOD_GET
27+
match code:
28+
Task.SIGNIN, Task.SIGNUP, Task.LOGOUT, Task.MAGICLINK, Task.RECOVER, Task.REFRESH, Task.INVITE, Task.VERIFYOTP:
29+
return HTTPClient.METHOD_POST
30+
Task.UPDATE:
31+
return HTTPClient.METHOD_PUT
32+
_, Task.USER:
33+
return HTTPClient.METHOD_GET
3434

3535
func _on_task_completed(result : int, response_code : int, headers : PackedStringArray, body : PackedByteArray, handler: HTTPRequest) -> void:
36-
if result != 0:
37-
complete(null, {}, SupabaseAuthError.new({ error = "Could not connect", code = result }))
38-
return
39-
40-
var result_body : Dictionary
41-
42-
if(!body.is_empty()):
43-
result_body = JSON.parse_string(body.get_string_from_utf8())
44-
45-
match response_code:
46-
200:
47-
match _code:
48-
Task.SIGNUP, Task.SIGNIN, Task.UPDATE, Task.REFRESH, Task.VERIFYOTP:
49-
complete(SupabaseUser.new(result_body), result_body)
50-
Task.MAGICLINK, Task.RECOVER, Task.INVITE:
51-
complete()
52-
0, 204:
53-
match _code:
54-
Task.LOGOUT, Task.USER:
55-
complete()
56-
_:
57-
complete(null, {}, SupabaseAuthError.new(result_body))
58-
handler.queue_free()
36+
if result != 0:
37+
complete(null, {}, SupabaseAuthError.new({ error = "Could not connect", code = result }))
38+
return
39+
40+
var result_body : Dictionary
41+
42+
if(!body.is_empty()):
43+
result_body = JSON.parse_string(body.get_string_from_utf8())
44+
45+
match response_code:
46+
200:
47+
match _code:
48+
Task.SIGNUP, Task.SIGNIN, Task.UPDATE, Task.REFRESH, Task.VERIFYOTP:
49+
complete(SupabaseUser.new(result_body), result_body)
50+
Task.MAGICLINK, Task.RECOVER, Task.INVITE:
51+
complete()
52+
0, 204:
53+
match _code:
54+
Task.LOGOUT, Task.USER:
55+
complete()
56+
_:
57+
complete(null, {}, SupabaseAuthError.new(result_body))
58+
handler.queue_free()
5959

6060
func complete(_user : SupabaseUser = null, _data : Dictionary = {}, _error : SupabaseAuthError = null) -> void:
61-
user = _user
62-
super._complete(_data, _error)
61+
user = _user
62+
super._complete(_data, _error)
6363

6464

‎addons/supabase/Auth/user.gd‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ var role : String
1818
var confirmation_sent_at : String
1919

2020
func _init(user_dictionary : Dictionary) -> void:
21-
if user_dictionary.has("user"):
22-
access_token = user_dictionary.get("access_token", "")
23-
token_type = user_dictionary.get("token_type", "")
24-
refresh_token = user_dictionary.get("refresh_token", "")
25-
expires_in = user_dictionary.get("expires_in", 0.0)
26-
dict = user_dictionary.get("user", {})
27-
last_sign_in_at = dict.get("last_sign_in_at", "")
28-
else:
29-
dict = user_dictionary
30-
confirmation_sent_at = dict.get("confirmation_sent_at", "")
31-
32-
email = dict.get("email", "")
33-
id = dict.get("id", "")
34-
created_at = dict.get("created_at", "")
35-
updated_at = dict.get("updated_at", "")
36-
user_metadata = ({} if dict.get("user_metadata") == null else dict.get("user_metadata"))
37-
role = dict.get("role", "")
21+
if user_dictionary.has("user"):
22+
access_token = user_dictionary.get("access_token", "")
23+
token_type = user_dictionary.get("token_type", "")
24+
refresh_token = user_dictionary.get("refresh_token", "")
25+
expires_in = user_dictionary.get("expires_in", 0.0)
26+
dict = user_dictionary.get("user", {})
27+
last_sign_in_at = dict.get("last_sign_in_at", "")
28+
else:
29+
dict = user_dictionary
30+
confirmation_sent_at = dict.get("confirmation_sent_at", "")
31+
32+
email = dict.get("email", "")
33+
id = dict.get("id", "")
34+
created_at = dict.get("created_at", "")
35+
updated_at = dict.get("updated_at", "")
36+
user_metadata = ({} if dict.get("user_metadata") == null else dict.get("user_metadata"))
37+
role = dict.get("role", "")
3838

3939
func _to_string():
40-
var to_string : String = "%-10s %s\n" % ["USER ID:", id]
41-
to_string += "%-10s %s\n" % ["EMAIL:", email]
42-
to_string += "%-10s %s\n" % ["ROLE:", role]
43-
return to_string
40+
var to_string : String = "%-10s %s\n" % ["USER ID:", id]
41+
to_string += "%-10s %s\n" % ["EMAIL:", email]
42+
to_string += "%-10s %s\n" % ["ROLE:", role]
43+
return to_string

‎addons/supabase/Database/database.gd‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,53 @@ var _bearer : PackedStringArray = ["Authorization: Bearer %s"]
1818
var _pooled_tasks : Array = []
1919

2020
func _init(conf : Dictionary, head : PackedStringArray) -> void:
21-
_config = conf
22-
_header += head
23-
name = "Database"
21+
_config = conf
22+
_header += head
23+
name = "Database"
2424

2525
# Issue a query on your database
2626
func query(supabase_query : SupabaseQuery) -> DatabaseTask:
27-
var endpoint : String = _config.supabaseUrl + _rest_endpoint + supabase_query.build_query()
28-
var task : DatabaseTask = DatabaseTask.new()
29-
task._setup(
30-
supabase_query.request,
31-
endpoint,
32-
_header + get_parent().auth.__get_session_header() + supabase_query.header,
33-
supabase_query.body
34-
)
35-
_process_task(task)
36-
return task
27+
var endpoint : String = _config.supabaseUrl + _rest_endpoint + supabase_query.build_query()
28+
var task : DatabaseTask = DatabaseTask.new()
29+
task._setup(
30+
supabase_query.request,
31+
endpoint,
32+
_header + get_parent().auth.__get_session_header() + supabase_query.header,
33+
supabase_query.body
34+
)
35+
_process_task(task)
36+
return task
3737

3838
# Issue an rpc() call to a function
3939
func Rpc(function_name : String, arguments : Dictionary = {}, supabase_query : SupabaseQuery = null) -> DatabaseTask:
40-
var endpoint : String = _config.supabaseUrl + _rest_endpoint + "rpc/{function}".format({function = function_name}) + (supabase_query.build_query() if supabase_query!=null else "")
41-
var task : DatabaseTask = DatabaseTask.new()
42-
task._setup(
43-
-2,
44-
endpoint,
45-
_header + get_parent().auth.__get_session_header(),
46-
JSON.stringify(arguments)
47-
)
48-
_process_task(task)
49-
return task
40+
var endpoint : String = _config.supabaseUrl + _rest_endpoint + "rpc/{function}".format({function = function_name}) + (supabase_query.build_query() if supabase_query!=null else "")
41+
var task : DatabaseTask = DatabaseTask.new()
42+
task._setup(
43+
-2,
44+
endpoint,
45+
_header + get_parent().auth.__get_session_header(),
46+
JSON.stringify(arguments)
47+
)
48+
_process_task(task)
49+
return task
5050

5151
func _process_task(task : DatabaseTask) -> void:
52-
var httprequest : HTTPRequest = HTTPRequest.new()
53-
add_child(httprequest)
54-
task.completed.connect(_on_task_completed)
55-
_pooled_tasks.append(task)
56-
task.push_request(httprequest)
52+
var httprequest : HTTPRequest = HTTPRequest.new()
53+
add_child(httprequest)
54+
task.completed.connect(_on_task_completed)
55+
_pooled_tasks.append(task)
56+
task.push_request(httprequest)
5757

5858
# .............. HTTPRequest completed
5959
func _on_task_completed(task : DatabaseTask) -> void:
60-
if task.data!=null and not task.data.is_empty():
61-
match task._code:
62-
SupabaseQuery.REQUESTS.SELECT: emit_signal("selected", task.data)
63-
SupabaseQuery.REQUESTS.INSERT: emit_signal("inserted", task.data)
64-
SupabaseQuery.REQUESTS.UPDATE: emit_signal("updated", task.data)
65-
SupabaseQuery.REQUESTS.DELETE: emit_signal("deleted", task.data)
66-
_:
67-
emit_signal("rpc_completed", task.data)
68-
elif task.error != null:
69-
emit_signal("error", task.error)
70-
_pooled_tasks.erase(task)
60+
if task.data!=null and not task.data.is_empty():
61+
match task._code:
62+
SupabaseQuery.REQUESTS.SELECT: emit_signal("selected", task.data)
63+
SupabaseQuery.REQUESTS.INSERT: emit_signal("inserted", task.data)
64+
SupabaseQuery.REQUESTS.UPDATE: emit_signal("updated", task.data)
65+
SupabaseQuery.REQUESTS.DELETE: emit_signal("deleted", task.data)
66+
_:
67+
emit_signal("rpc_completed", task.data)
68+
elif task.error != null:
69+
emit_signal("error", task.error)
70+
_pooled_tasks.erase(task)

‎addons/supabase/Database/database_error.gd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ extends BaseError
33
class_name SupabaseDatabaseError
44

55
func _init(dictionary : Dictionary = {}) -> void:
6-
_error = dictionary
7-
if not _error.is_empty():
8-
code = _error.code if _error.has("code") else "empty"
9-
message = _error.message if _error.has("message") else "empty"
10-
hint = _error.hint if _error.has("hint") and _error.hint != null else "empty"
11-
details = _error.get("details", "")
6+
_error = dictionary
7+
if not _error.is_empty():
8+
code = _error.code if _error.has("code") else "empty"
9+
message = _error.message if _error.has("message") else "empty"
10+
hint = _error.hint if _error.has("hint") and _error.hint != null else "empty"
11+
details = _error.get("details", "")
1212
### always different behavior ???
1313

‎addons/supabase/Database/database_task.gd‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ extends BaseTask
33
class_name DatabaseTask
44

55
func match_code(code : int) -> int:
6-
match code:
7-
SupabaseQuery.REQUESTS.INSERT: return HTTPClient.METHOD_POST
8-
SupabaseQuery.REQUESTS.SELECT: return HTTPClient.METHOD_GET
9-
SupabaseQuery.REQUESTS.UPDATE: return HTTPClient.METHOD_PATCH
10-
SupabaseQuery.REQUESTS.DELETE: return HTTPClient.METHOD_DELETE
11-
_: return HTTPClient.METHOD_POST
6+
match code:
7+
SupabaseQuery.REQUESTS.INSERT: return HTTPClient.METHOD_POST
8+
SupabaseQuery.REQUESTS.SELECT: return HTTPClient.METHOD_GET
9+
SupabaseQuery.REQUESTS.UPDATE: return HTTPClient.METHOD_PATCH
10+
SupabaseQuery.REQUESTS.DELETE: return HTTPClient.METHOD_DELETE
11+
_: return HTTPClient.METHOD_POST
1212

1313
func _on_task_completed(result : int, response_code : int, headers : PackedStringArray, body : PackedByteArray, handler: HTTPRequest) -> void:
14-
var result_body: Variant = JSON.parse_string(body.get_string_from_utf8())
15-
if response_code < 300:
16-
complete(result_body)
17-
else:
18-
var supabase_error : SupabaseDatabaseError = SupabaseDatabaseError.new(result_body)
19-
complete(null, supabase_error)
20-
handler.queue_free()
14+
var result_body: Variant = JSON.parse_string(body.get_string_from_utf8())
15+
if response_code < 300:
16+
complete(result_body)
17+
else:
18+
var supabase_error : SupabaseDatabaseError = SupabaseDatabaseError.new(result_body)
19+
complete(null, supabase_error)
20+
handler.queue_free()
2121

2222
func complete(_data = null, _error : SupabaseDatabaseError = null) -> void:
23-
super._complete(_data, _error)
23+
super._complete(_data, _error)

0 commit comments

Comments
 (0)