This commit is contained in:
@@ -439,10 +439,8 @@ func (h *AuthController) GoogleCallback(c fiber.Ctx) error {
|
|||||||
|
|
||||||
allowed := map[string]bool{
|
allowed := map[string]bool{
|
||||||
"http://localhost:3000": true,
|
"http://localhost:3000": true,
|
||||||
"https://localhost:3000": true,
|
|
||||||
"http://localhost:3001": true,
|
"http://localhost:3001": true,
|
||||||
"https://localhost:3001": true,
|
"https://history-admin.kain.id.vn": true,
|
||||||
"http://localhost:5500": true,
|
|
||||||
}
|
}
|
||||||
feUrl := config.GetConfigWithDefault("FRONTEND_URL", "http://localhost:3000")
|
feUrl := config.GetConfigWithDefault("FRONTEND_URL", "http://localhost:3000")
|
||||||
redirectURL := data.RedirectURL
|
redirectURL := data.RedirectURL
|
||||||
|
|||||||
@@ -59,6 +59,21 @@ func (e *MediaEntity) ToResponse() *response.MediaResponse {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *MediaSimpleEntity) ToResponse() *response.MediaSimpleResponse {
|
||||||
|
if e == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return &response.MediaSimpleResponse{
|
||||||
|
ID: e.ID,
|
||||||
|
StorageKey: e.StorageKey,
|
||||||
|
OriginalName: e.OriginalName,
|
||||||
|
MimeType: e.MimeType,
|
||||||
|
Size: e.Size,
|
||||||
|
FileMetadata: e.FileMetadata,
|
||||||
|
CreatedAt: e.CreatedAt,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity {
|
func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity {
|
||||||
if e == nil {
|
if e == nil {
|
||||||
return nil
|
return nil
|
||||||
@@ -76,6 +91,9 @@ func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity {
|
|||||||
|
|
||||||
func MediaEntitiesToResponse(entities []*MediaEntity) []*response.MediaResponse {
|
func MediaEntitiesToResponse(entities []*MediaEntity) []*response.MediaResponse {
|
||||||
responses := make([]*response.MediaResponse, 0)
|
responses := make([]*response.MediaResponse, 0)
|
||||||
|
if entities == nil {
|
||||||
|
return responses
|
||||||
|
}
|
||||||
for _, entity := range entities {
|
for _, entity := range entities {
|
||||||
if entity == nil {
|
if entity == nil {
|
||||||
continue
|
continue
|
||||||
@@ -87,6 +105,9 @@ func MediaEntitiesToResponse(entities []*MediaEntity) []*response.MediaResponse
|
|||||||
|
|
||||||
func MediaEntitiesToStorageEntity(entities []*MediaEntity) []*MediaStorageEntity {
|
func MediaEntitiesToStorageEntity(entities []*MediaEntity) []*MediaStorageEntity {
|
||||||
responses := make([]*MediaStorageEntity, 0)
|
responses := make([]*MediaStorageEntity, 0)
|
||||||
|
if entities == nil {
|
||||||
|
return responses
|
||||||
|
}
|
||||||
for _, entity := range entities {
|
for _, entity := range entities {
|
||||||
if entity == nil {
|
if entity == nil {
|
||||||
continue
|
continue
|
||||||
@@ -95,3 +116,17 @@ func MediaEntitiesToStorageEntity(entities []*MediaEntity) []*MediaStorageEntity
|
|||||||
}
|
}
|
||||||
return responses
|
return responses
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func MediaSimpleEntitiesToResponse(entities []*MediaSimpleEntity) []*response.MediaSimpleResponse {
|
||||||
|
responses := make([]*response.MediaSimpleResponse, 0)
|
||||||
|
if entities == nil {
|
||||||
|
return responses
|
||||||
|
}
|
||||||
|
for _, entity := range entities {
|
||||||
|
if entity == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
responses = append(responses, entity.ToResponse())
|
||||||
|
}
|
||||||
|
return responses
|
||||||
|
}
|
||||||
|
|||||||
@@ -62,6 +62,9 @@ func (r *RoleEntity) ToRoleSimple() *RoleSimple {
|
|||||||
|
|
||||||
func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
|
func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
|
||||||
out := make([]*response.RoleResponse, 0)
|
out := make([]*response.RoleResponse, 0)
|
||||||
|
if rs == nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
for _, role := range rs {
|
for _, role := range rs {
|
||||||
if role == nil {
|
if role == nil {
|
||||||
continue
|
continue
|
||||||
@@ -73,6 +76,9 @@ func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
|
|||||||
|
|
||||||
func RolesEntityToRoleConstant(rs []*RoleSimple) []constants.Role {
|
func RolesEntityToRoleConstant(rs []*RoleSimple) []constants.Role {
|
||||||
out := make([]constants.Role, 0)
|
out := make([]constants.Role, 0)
|
||||||
|
if rs == nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
for _, role := range rs {
|
for _, role := range rs {
|
||||||
data, ok := constants.ParseRole(role.Name)
|
data, ok := constants.ParseRole(role.Name)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
|||||||
@@ -75,6 +75,9 @@ func (u *UserEntity) ToResponse() *response.UserResponse {
|
|||||||
|
|
||||||
func UsersEntityToResponse(users []*UserEntity) []*response.UserResponse {
|
func UsersEntityToResponse(users []*UserEntity) []*response.UserResponse {
|
||||||
out := make([]*response.UserResponse, 0)
|
out := make([]*response.UserResponse, 0)
|
||||||
|
if users == nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -53,21 +53,9 @@ func (u *UserVerificationEntity) ParseReviewer(data []byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *UserVerificationEntity) ToResponse() *response.UserVerificationResponse {
|
func (u *UserVerificationEntity) ToResponse() *response.UserVerificationResponse {
|
||||||
mediaResponses := make([]*response.MediaSimpleResponse, 0)
|
if u == nil {
|
||||||
for _, m := range u.Media {
|
return nil
|
||||||
if m != nil {
|
|
||||||
mediaResponses = append(mediaResponses, &response.MediaSimpleResponse{
|
|
||||||
ID: m.ID,
|
|
||||||
StorageKey: m.StorageKey,
|
|
||||||
OriginalName: m.OriginalName,
|
|
||||||
MimeType: m.MimeType,
|
|
||||||
Size: m.Size,
|
|
||||||
FileMetadata: m.FileMetadata,
|
|
||||||
CreatedAt: m.CreatedAt,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
res := &response.UserVerificationResponse{
|
res := &response.UserVerificationResponse{
|
||||||
ID: u.ID,
|
ID: u.ID,
|
||||||
User: u.User.ToResponse(),
|
User: u.User.ToResponse(),
|
||||||
@@ -78,7 +66,7 @@ func (u *UserVerificationEntity) ToResponse() *response.UserVerificationResponse
|
|||||||
Reviewer: u.Reviewer.ToResponse(),
|
Reviewer: u.Reviewer.ToResponse(),
|
||||||
ReviewedAt: u.ReviewedAt,
|
ReviewedAt: u.ReviewedAt,
|
||||||
CreatedAt: u.CreatedAt,
|
CreatedAt: u.CreatedAt,
|
||||||
Medias: mediaResponses,
|
Medias: MediaSimpleEntitiesToResponse(u.Media),
|
||||||
}
|
}
|
||||||
|
|
||||||
if u.ReviewedAt != nil {
|
if u.ReviewedAt != nil {
|
||||||
@@ -90,6 +78,9 @@ func (u *UserVerificationEntity) ToResponse() *response.UserVerificationResponse
|
|||||||
|
|
||||||
func UserVerificationsEntitiesToResponse(entities []*UserVerificationEntity) []*response.UserVerificationResponse {
|
func UserVerificationsEntitiesToResponse(entities []*UserVerificationEntity) []*response.UserVerificationResponse {
|
||||||
responses := make([]*response.UserVerificationResponse, 0)
|
responses := make([]*response.UserVerificationResponse, 0)
|
||||||
|
if entities == nil {
|
||||||
|
return responses
|
||||||
|
}
|
||||||
for _, entity := range entities {
|
for _, entity := range entities {
|
||||||
if entity == nil {
|
if entity == nil {
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user