Skip to content

Commit df1083f

Browse files
committed
Fix auth
1 parent de3d99f commit df1083f

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

api/pkg/di/container.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ import (
8181

8282
// Container is used to resolve services at runtime
8383
type Container struct {
84-
projectID string
85-
db *gorm.DB
86-
dedicatedDB *gorm.DB
87-
version string
88-
app *fiber.App
89-
eventDispatcher *services.EventDispatcher
90-
logger telemetry.Logger
84+
projectID string
85+
db *gorm.DB
86+
dedicatedDB *gorm.DB
87+
version string
88+
app *fiber.App
89+
eventDispatcher *services.EventDispatcher
90+
logger telemetry.Logger
9191
attachmentRepository repositories.AttachmentRepository
9292
}
9393

@@ -398,7 +398,7 @@ ALTER TABLE discords ADD CONSTRAINT IF NOT EXISTS uni_discords_server_id CHECK (
398398
// FirebaseApp creates a new instance of firebase.App
399399
func (container *Container) FirebaseApp() (app *firebase.App) {
400400
container.logger.Debug(fmt.Sprintf("creating %T", app))
401-
app, err := firebase.NewApp(context.Background(), nil, option.WithCredentialsJSON(container.FirebaseCredentials()))
401+
app, err := firebase.NewApp(context.Background(), nil, option.WithAuthCredentialsJSON(option.ServiceAccount, container.FirebaseCredentials()))
402402
if err != nil {
403403
msg := "cannot initialize firebase application"
404404
container.logger.Fatal(stacktrace.Propagate(err, msg))
@@ -1447,7 +1447,7 @@ func (container *Container) AttachmentRepository() repositories.AttachmentReposi
14471447
bucket := os.Getenv("GCS_BUCKET_NAME")
14481448
if bucket != "" {
14491449
container.logger.Debug("creating GoogleCloudStorageAttachmentRepository")
1450-
client, err := storage.NewClient(context.Background())
1450+
client, err := storage.NewClient(context.Background(), option.WithAuthCredentialsJSON(option.ServiceAccount, container.FirebaseCredentials()))
14511451
if err != nil {
14521452
container.logger.Fatal(stacktrace.Propagate(err, "cannot create GCS client"))
14531453
}

web/pages/threads/_id/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
:color="isMT(message) ? 'primary' : 'default'"
163163
>
164164
<v-card-text
165+
v-if="message.content"
165166
class="text--primary text-break"
166167
style="white-space: pre-line"
167168
>

0 commit comments

Comments
 (0)