Claude/fix dashbrew auth a qw4 p #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

pedrobando wants to merge 30 commits into gitroomhq:main from pedrobando:claude/fix-dashbrew-auth-AQw4P

.github/dependabot.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ updates: @@
       - package-ecosystem: "npm" # See documentation for possible values
         directory: "/" # Location of package manifests
         schedule:
-          interval: "weekly"
+          interval: "daily"

.github/workflows/build.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,9 +41,9 @@ jobs: @@
               path: |
                 ${{ env.STORE_PATH }}
                 ${{ github.workspace }}/.next/cache
-              key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
+              key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
               restore-keys: |
-                ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}-
+                ${{ runner.os }}-pnpm-
           - name: Install dependencies
             run: pnpm install
@@ Expand Down @@

.github/workflows/deploy.yml

-Original file line number
+Diff line change
@@ -0,0 +1,44 @@
+    name: Build and Publish Docker Image
+    on:
+      push:
+        branches: [ "main" ] # Or "master", depending on your default branch
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+    jobs:
+      build-and-push:
+        runs-on: ubuntu-latest
+        permissions:
+          contents: read
+          packages: write
+        steps:
+          - name: Checkout repository
+            uses: actions/checkout@v4
+          - name: Log in to the Container registry
+            uses: docker/login-action@v3
+            with:
+              registry: ${{ env.REGISTRY }}
+              username: ${{ github.actor }}
+              password: ${{ secrets.GITHUB_TOKEN }}
+          - name: Extract metadata (tags, labels) for Docker
+            id: meta
+            uses: docker/metadata-action@v5
+            with:
+              images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+              tags: |
+                type=raw,value=latest
+                type=sha
+          - name: Build and push Docker image
+            uses: docker/build-push-action@v5
+            with:
+              context: .
+              push: true
+              tags: ${{ steps.meta.outputs.tags }}
+              labels: ${{ steps.meta.outputs.labels }}

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,3 +58,4 @@ Thumbs.db @@
     .secrets/
     libraries/plugins/src/plugins.ts
     i18n.cache
+    node-compile-cache/

Dockerfile

-Original file line number
+Diff line change
@@ -0,0 +1,47 @@
+    FROM node:22.20-alpine
+    # Build-time arguments for Next.js environment variables
+    ARG NEXT_PUBLIC_VERSION
+    ARG NEXT_PUBLIC_BACKEND_URL
+    ARG NEXT_PUBLIC_SENTRY_DSN
+    ARG NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY
+    ARG NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL
+    ARG NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME
+    ARG NEXT_PUBLIC_POLOTNO
+    ARG NEXT_PUBLIC_DISCORD_SUPPORT
+    ARG NEXT_PUBLIC_FACEBOOK_PIXEL
+    ARG NEXT_PUBLIC_POSTHOG_KEY
+    ARG NEXT_PUBLIC_POSTHOG_HOST
+    ARG NEXT_PUBLIC_APP_VERSION
+    # Set environment variables from build arguments
+    ENV NEXT_PUBLIC_VERSION=$NEXT_PUBLIC_VERSION \
+        NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL \
+        NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN \
+        NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY=$NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY \
+        NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL=$NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL \
+        NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME=$NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME \
+        NEXT_PUBLIC_POLOTNO=$NEXT_PUBLIC_POLOTNO \
+        NEXT_PUBLIC_DISCORD_SUPPORT=$NEXT_PUBLIC_DISCORD_SUPPORT \
+        NEXT_PUBLIC_FACEBOOK_PIXEL=$NEXT_PUBLIC_FACEBOOK_PIXEL \
+        NEXT_PUBLIC_POSTHOG_KEY=$NEXT_PUBLIC_POSTHOG_KEY \
+        NEXT_PUBLIC_POSTHOG_HOST=$NEXT_PUBLIC_POSTHOG_HOST \
+        NEXT_PUBLIC_APP_VERSION=$NEXT_PUBLIC_APP_VERSION
+    RUN apk add --no-cache g++ make py3-pip bash nginx
+    RUN adduser -D -g 'www' www
+    RUN mkdir /www
+    RUN chown -R www:www /var/lib/nginx
+    RUN chown -R www:www /www
+    RUN npm --no-update-notifier --no-fund --global install [email protected] pm2
+    WORKDIR /app
+    COPY . /app
+    COPY var/docker/nginx.conf /etc/nginx/nginx.conf
+    RUN pnpm install
+    RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm run build
+    CMD ["sh", "-c", "nginx && pnpm run pm2"]

Dockerfile.dev

This file was deleted.

apps/backend/src/api/routes/auth.controller.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -268,4 +268,37 @@ export class AuthController { @@
           login: true,
         });
       }
+      @Post('/token')
+      async tokenLogin(
+        @Body('token') token: string,
+        @Res({ passthrough: false }) response: Response
+      ) {
+        try {
+          const valid = await this._authService.validateAndRefreshToken(token);
+          if (!valid) {
+            return response.status(401).json({ error: 'Invalid token' });
+          }
+          response.cookie('auth', valid, {
+            domain: getCookieUrlFromDomain(process.env.FRONTEND_URL!),
+            ...(!process.env.NOT_SECURED
+              ? {
+                  secure: true,
+                  httpOnly: true,
+                  sameSite: 'none',
+                }
+              : {}),
+            expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
+          });
+          if (process.env.NOT_SECURED) {
+            response.header('auth', valid);
+          }
+          response.status(200).json({ login: true });
+        } catch (e: any) {
+          response.status(401).json({ error: 'Invalid token' });
+        }
+      }
     }

apps/backend/src/services/auth/auth.service.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -245,6 +245,31 @@ export class AuthService { @@
         return { token };
       }
+      async validateAndRefreshToken(token: string): Promise<string | null> {
+        try {
+          const decoded = AuthChecker.verifyJWT(token) as {
+            id: string;
+            email: string;
+            activated: boolean;
+          };
+          if (!decoded || !decoded.id) {
+            return null;
+          }
+          // Get fresh user data from database
+          const user = await this._userService.getUserById(decoded.id);
+          if (!user || !user.activated) {
+            return null;
+          }
+          // Generate a fresh token
+          return this.jwt(user);
+        } catch (e) {
+          return null;
+        }
+      }
       private async jwt(user: User) {
         return AuthChecker.signJWT(user);
       }
@@ Expand Down @@

apps/backend/src/services/auth/providers/oauth.provider.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -53,7 +53,7 @@ export class OauthProvider implements ProvidersInterface {
  
          client_id: this.clientId,

          scope: 'openid profile email',

          response_type: 'code',

          redirect_uri: `${this.frontendUrl}/settings`,

          redirect_uri: `${this.frontendUrl}/auth?provider=generic`,

        });

        return `${this.authUrl}?${params.toString()}`;

    @@ -71,7 +71,7 @@ export class OauthProvider implements ProvidersInterface {
  
            client_id: this.clientId,

            client_secret: this.clientSecret,

            code,

            redirect_uri: `${this.frontendUrl}/settings`,

            redirect_uri: `${this.frontendUrl}/auth?provider=generic`,

          }),

        });

apps/frontend/public/logo-text.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Claude/fix dashbrew auth a qw4 p #1162

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Claude/fix dashbrew auth a qw4 p #1162

Are you sure you want to change the base?

Uh oh!

Claude/fix dashbrew auth a qw4 p #1162

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!