Skip to content

Commit 04c3759

Browse files
fenix-hubfenix-hub
authored
Merge pull request #38 from fenix-hub/dev
Dev
2 parents b6ba1e7 + 020ac45 commit 04c3759

File tree

18 files changed

+1085
-1119
lines changed

18 files changed

+1085
-1119
lines changed

‎addons/supabase/Auth/auth.gd

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

‎addons/supabase/Auth/auth_error.gd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ var type : String = "(undefined)"
66
var description : String = "(undefined)"
77

88
func _init(dictionary : Dictionary = {}) -> void:
9-
_error = dictionary
10-
if not _error.empty():
11-
type = _error.get("error", "(undefined)")
12-
description = _error.get("error_description", "(undefined)")
13-
if _error.has("code"):
14-
type = str(_error.get("code", -1))
15-
description = _error.get("msg", "(undefined)")
16-
# different body for same api source ???
9+
_error = dictionary
10+
if not _error.empty():
11+
type = _error.get("error", "(undefined)")
12+
description = _error.get("error_description", "(undefined)")
13+
if _error.has("code"):
14+
type = str(_error.get("code", -1))
15+
description = _error.get("msg", "(undefined)")
16+
# different body for same api source ???
1717

1818
func _to_string():
19-
return "%s >> %s" % [type, description]
19+
return "%s >> %s" % [type, description]

‎addons/supabase/Auth/auth_task.gd

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ extends Reference
44
signal completed(task)
55

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

2323
var _code : int
@@ -35,49 +35,49 @@ var data : Dictionary
3535
var _handler : HTTPRequest
3636

3737
func _init(code : int, endpoint : String, headers : PoolStringArray, payload : Dictionary = {}):
38-
_code = code
39-
_endpoint = endpoint
40-
_headers = headers
41-
_payload = payload
42-
_method = match_code(code)
38+
_code = code
39+
_endpoint = endpoint
40+
_headers = headers
41+
_payload = payload
42+
_method = match_code(code)
4343

4444
func match_code(code : int) -> int:
45-
match code:
46-
Task.SIGNIN, Task.SIGNUP, Task.LOGOUT, Task.MAGICLINK, Task.RECOVER, Task.REFRESH, Task.INVITE:
47-
return HTTPClient.METHOD_POST
48-
Task.UPDATE:
49-
return HTTPClient.METHOD_PUT
50-
_, Task.USER:
51-
return HTTPClient.METHOD_GET
45+
match code:
46+
Task.SIGNIN, Task.SIGNUP, Task.LOGOUT, Task.MAGICLINK, Task.RECOVER, Task.REFRESH, Task.INVITE:
47+
return HTTPClient.METHOD_POST
48+
Task.UPDATE:
49+
return HTTPClient.METHOD_PUT
50+
_, Task.USER:
51+
return HTTPClient.METHOD_GET
5252

5353
func push_request(httprequest : HTTPRequest) -> void:
54-
_handler = httprequest
55-
_handler.connect("request_completed", self, "_on_task_completed")
56-
_handler.request(_endpoint, _headers, true, _method, to_json(_payload))
57-
yield(_handler, "request_completed")
54+
_handler = httprequest
55+
_handler.connect("request_completed", self, "_on_task_completed")
56+
_handler.request(_endpoint, _headers, true, _method, to_json(_payload))
57+
yield(_handler, "request_completed")
5858

5959

6060
func _on_task_completed(result : int, response_code : int, headers : PoolStringArray, body : PoolByteArray) -> void:
61-
var result_body : Dictionary = JSON.parse(body.get_string_from_utf8()).result if body.get_string_from_utf8() else {}
62-
match response_code:
63-
200:
64-
match _code:
65-
Task.SIGNUP, Task.SIGNIN, Task.UPDATE, Task.REFRESH:
66-
complete(SupabaseUser.new(result_body), result_body)
67-
Task.MAGICLINK, Task.RECOVER, Task.INVITE:
68-
complete()
69-
0, 204:
70-
match _code:
71-
Task.LOGOUT, Task.USER:
72-
complete()
73-
_:
74-
if result_body == null : result_body = {}
75-
complete(null, {}, SupabaseAuthError.new(result_body))
61+
var result_body : Dictionary = JSON.parse(body.get_string_from_utf8()).result if body.get_string_from_utf8() else {}
62+
match response_code:
63+
200:
64+
match _code:
65+
Task.SIGNUP, Task.SIGNIN, Task.UPDATE, Task.REFRESH:
66+
complete(SupabaseUser.new(result_body), result_body)
67+
Task.MAGICLINK, Task.RECOVER, Task.INVITE:
68+
complete()
69+
0, 204:
70+
match _code:
71+
Task.LOGOUT, Task.USER:
72+
complete()
73+
_:
74+
if result_body == null : result_body = {}
75+
complete(null, {}, SupabaseAuthError.new(result_body))
7676

7777
func complete(_user : SupabaseUser = null, _data : Dictionary = {}, _error : SupabaseAuthError = null) -> void:
78-
user = _user
79-
data = _data
80-
error = _error
81-
emit_signal("completed", self)
78+
user = _user
79+
data = _data
80+
error = _error
81+
emit_signal("completed", self)
8282

83-
83+

‎addons/supabase/Auth/user.gd

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

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

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

‎addons/supabase/Database/database.gd

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,57 +17,57 @@ var _bearer : PoolStringArray = ["Authorization: Bearer %s"]
1717
var _pooled_tasks : Array = []
1818

1919
func _init(conf : Dictionary, head : PoolStringArray) -> void:
20-
_config = conf
21-
_header += head
22-
name = "Database"
20+
_config = conf
21+
_header += head
22+
name = "Database"
2323

2424

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

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

5353
func _process_task(task : DatabaseTask) -> void:
54-
var httprequest : HTTPRequest = HTTPRequest.new()
55-
add_child(httprequest)
56-
task.connect("completed", self, "_on_task_completed")
57-
task.push_request(httprequest)
58-
_pooled_tasks.append(task)
54+
var httprequest : HTTPRequest = HTTPRequest.new()
55+
add_child(httprequest)
56+
task.connect("completed", self, "_on_task_completed")
57+
task.push_request(httprequest)
58+
_pooled_tasks.append(task)
5959

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

‎addons/supabase/Database/database_error.gd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ var hint : String = "empty"
99
var details
1010

1111
func _init(dictionary : Dictionary = {}) -> void:
12-
_error = dictionary
13-
if not _error.empty():
14-
code = _error.code if _error.has("code") else "empty"
15-
message = _error.message
16-
hint = _error.hint if _error.has("hint") and _error.hint != null else "empty"
17-
details = _error.get("details", "")
12+
_error = dictionary
13+
if not _error.empty():
14+
code = _error.code if _error.has("code") else "empty"
15+
message = _error.message
16+
hint = _error.hint if _error.has("hint") and _error.hint != null else "empty"
17+
details = _error.get("details", "")
1818
### always different behavior ???
1919

2020
func _to_string():
21-
return "%s >> %s: %s (%s)" % [code, message, details, hint]
21+
return "%s >> %s: %s (%s)" % [code, message, details, hint]

‎addons/supabase/Database/database_task.gd

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,42 @@ var error : SupabaseDatabaseError
1818
var _handler : HTTPRequest
1919

2020
func _init(data = null, error : SupabaseDatabaseError = null) -> void:
21-
self.data = data
22-
self.error = error
21+
self.data = data
22+
self.error = error
2323

2424
func _setup(query : SupabaseQuery, code : int, endpoint : String, headers : PoolStringArray, payload : String = ""):
25-
_query = query
26-
_code = code
27-
_endpoint = endpoint
28-
_headers = headers
29-
_payload = payload
30-
_method = match_code(code)
25+
_query = query
26+
_code = code
27+
_endpoint = endpoint
28+
_headers = headers
29+
_payload = payload
30+
_method = match_code(code)
3131

3232

3333
func match_code(code : int) -> int:
34-
match code:
35-
SupabaseQuery.REQUESTS.INSERT: return HTTPClient.METHOD_POST
36-
SupabaseQuery.REQUESTS.SELECT: return HTTPClient.METHOD_GET
37-
SupabaseQuery.REQUESTS.UPDATE: return HTTPClient.METHOD_PATCH
38-
SupabaseQuery.REQUESTS.DELETE: return HTTPClient.METHOD_DELETE
39-
_: return HTTPClient.METHOD_POST
34+
match code:
35+
SupabaseQuery.REQUESTS.INSERT: return HTTPClient.METHOD_POST
36+
SupabaseQuery.REQUESTS.SELECT: return HTTPClient.METHOD_GET
37+
SupabaseQuery.REQUESTS.UPDATE: return HTTPClient.METHOD_PATCH
38+
SupabaseQuery.REQUESTS.DELETE: return HTTPClient.METHOD_DELETE
39+
_: return HTTPClient.METHOD_POST
4040

4141
func push_request(httprequest : HTTPRequest) -> void:
42-
_handler = httprequest
43-
httprequest.connect("request_completed", self, "_on_task_completed")
44-
httprequest.request(_endpoint, _headers, true, _method, _payload)
42+
_handler = httprequest
43+
httprequest.connect("request_completed", self, "_on_task_completed")
44+
httprequest.request(_endpoint, _headers, true, _method, _payload)
4545

4646
func _on_task_completed(result : int, response_code : int, headers : PoolStringArray, body : PoolByteArray) -> void:
47-
var result_body = JSON.parse(body.get_string_from_utf8()).result if body.get_string_from_utf8() else {}
48-
if response_code in [200, 201, 204]:
49-
complete(result_body)
50-
else:
51-
var supabase_error : SupabaseDatabaseError = SupabaseDatabaseError.new(result_body)
52-
complete(null, supabase_error)
53-
if _query!=null: _query.clean()
47+
var result_body = JSON.parse(body.get_string_from_utf8()).result if body.get_string_from_utf8() else {}
48+
if response_code in [200, 201, 204]:
49+
complete(result_body)
50+
else:
51+
var supabase_error : SupabaseDatabaseError = SupabaseDatabaseError.new(result_body)
52+
complete(null, supabase_error)
53+
if _query!=null: _query.clean()
5454

5555
func complete(_result, _error : SupabaseDatabaseError = null) -> void:
56-
data = _result
57-
error = _error
58-
if _handler : _handler.queue_free()
59-
emit_signal("completed", self)
56+
data = _result
57+
error = _error
58+
if _handler : _handler.queue_free()
59+
emit_signal("completed", self)

0 commit comments

Comments
 (0)