merge: #3213

3213: fix(auth-api) fix deploy issues r=stack72 a=theoephraim Co-authored-by: Theo Ephraim <[email protected]>
systeminit · Jan 25, 2024 · 9a59078 · 9a59078
2 parents 76e42b3 + 21d77c7
commit 9a59078
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/app/auth-portal/src/App.vue b/app/auth-portal/src/App.vue
@@ -100,7 +100,7 @@
               variant="transparent"
               tone="shade"
               @mousedown.prevent
-              @click.prevent="profileMenuRef?.open || _.noop"
+              @click.prevent="profileMenuRef?.open($event) || _.noop"
             >
               <div class="mr-xs">Hi {{ authStore.bestUserLabel }}!</div>
               <template #iconRight>
@@ -157,6 +157,11 @@
                     @click="authStore.REFRESH_AUTH0_PROFILE"
                     >Already verified?</VButton
                   >
+                  <!-- normally we'd use the ErrorMessage component, but we're already using it as the wrapper here for a sort of alert -->
+                  <p v-if="refreshAuth0Req.isError">
+                    ERROR: {{ refreshAuth0Req.errorMessage }}
+                  </p>
+
                   <VButton
                     v-if="!resendEmailVerificationReq.isSuccess"
                     tone="shade"
@@ -166,6 +171,9 @@
                     @click="authStore.RESEND_EMAIL_VERIFICATION"
                     >Resend Email</VButton
                   >
+                  <p v-if="resendEmailVerificationReq.isError">
+                    ERROR: {{ resendEmailVerificationReq.errorMessage }}
+                  </p>
                 </Inline>
               </ErrorMessage>
 

diff --git a/app/auth-portal/src/store/auth.store.ts b/app/auth-portal/src/store/auth.store.ts
@@ -125,7 +125,7 @@ export const useAuthStore = defineStore("auth", {
         method: "post",
         url: `/users/${this.user.id}/resend-email-verification`,
         onSuccess: (response) => {
-          this.user = response.user;
+          // returns { success: true }
         },
         onFail: (response) => {
           // if we see this error, it means the backend will have updated the user already too

diff --git a/bin/auth-api/Dockerfile b/bin/auth-api/Dockerfile
@@ -83,6 +83,7 @@ FROM installer as builder
 WORKDIR /app/bin/auth-api
 RUN pnpx prisma generate
 RUN pnpm run build
+RUN echo "strict-peer-dependencies=false" > .npmrc
 
 RUN PRISMA_SKIP_POSTINSTALL_GENERATE=1 pnpm --prod --filter @si/auth-api deploy pruned
 # RUN cp -r src/prisma-client dist