mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-04 02:31:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server] Send IDs with user responses

Browse Source
This commit is contained in:
Abhishek Shroff
2025-05-15 22:58:41 +05:30
parent af3b87aaba
commit 8abe85400d
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/lib/libphylum/phylum_account.dart
View File

@@ -11,9 +11,11 @@ import 'package:phylum/libphylum/responses/responses.dart';
import 'package:phylum/util/logging.dart';
const _persistKeyAccessToken = 'accessToken';
const _persistKeyUserId = 'userId';
const _persistKeyUserEmail = 'userEmail';
const _persistKeyUserName = 'userName';
const _persistKeyUserName = 'userDisplayName';
const _persistKeyUserHome = 'userHome';
const _persistKeyUserPermissions = 'userPermissions';
class PhylumAccount extends Account<PhylumAccount> {
late final db = AppDatabase(accountId: id);
@@ -42,6 +44,11 @@ class PhylumAccount extends Account<PhylumAccount> {
apiClient.setHeader('Authorization', 'bearer $value');
}
int get userId => getPersisted(_persistKeyUserId);
set userId(int value) {
persist(_persistKeyUserId, value);
}
String get userEmail => getPersisted(_persistKeyUserEmail);
set userEmail(String value) {
persist(_persistKeyUserEmail, value);
@@ -57,6 +64,11 @@ class PhylumAccount extends Account<PhylumAccount> {
persist(_persistKeyUserHome, value);
}
int get userPermissions => getPersisted(_persistKeyUserPermissions);
set userPermissions(int value) {
persist(_persistKeyUserPermissions, value);
}
PhylumAccount.create({required super.serverUri, required String accessToken})
: _initialAccessToken = accessToken,
super.create();

2
server/internal/api/v1/auth/routes.go
View File

@@ -44,10 +44,10 @@ func handlePasswordAuth(c *gin.Context) {
AccessToken: token,
User: responses.LoggedInUser{
User: responses.User{
ID: user.ID,
Email: user.Email,
DisplayName: user.DisplayName,
},
ID: user.ID,
Home: user.Home,
Permissions: user.Permissions,
},

2
server/internal/api/v1/my/routes.go
View File

@@ -33,10 +33,10 @@ func handleHomeRoute(c *gin.Context) {
c.JSON(200, homeResponse{
User: responses.LoggedInUser{
User: responses.User{
ID: user.ID,
Email: user.Email,
DisplayName: user.DisplayName,
},
ID: user.ID,
Home: user.Home,
Permissions: user.Permissions,
},

4
server/internal/api/v1/responses/responses.go
View File

@@ -38,13 +38,13 @@ type ResourceFull struct {
}
type User struct {
ID int32 `json:"id"`
Email string `json:"email"`
DisplayName string `json:"display"`
DisplayName string `json:"display_name"`
}
type LoggedInUser struct {
User
ID int32 `json:"id"`
Home pgtype.UUID `json:"home"`
Permissions user.Permission `json:"permissions"`
}

1
server/internal/api/v1/users/users.go
View File

@@ -32,6 +32,7 @@ func handleUsersListRoute(c *gin.Context) {
result := make([]responses.User, len(users))
for i, u := range users {
result[i] = responses.User{
ID: u.ID,
Email: u.Email,
DisplayName: u.DisplayName,
}