Skip to content
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

update web-vault to v2024.10.5 #182

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

stefan0xC
Copy link
Contributor

@stefan0xC stefan0xC commented Sep 18, 2024

Added two SVGs for the login page (and adapted it a bit so our logo is a bit bigger and the page is not missing the logo when logging out)...
The only thing missing at the moment is replacing the bitwarden shield when the side panel is collapsed:

Peek.2024-11-06.12-01.mp4

And I also have not checked what server-side changes are required.

@BlackDex
Copy link
Collaborator

How about manager roles?
I think that would be the biggest impediment here.

@ecesarini
Copy link

Hi,
could you help me to understand how the new svg logos (in the log in page) are handled in the code? I mean the whole part above the login form.
Until v2024.6.2 there were html tags in apps/web/src/app/auth/login/login.component.html, e.g.

    <div>
      <img class="logo logo-themed" alt="Bitwarden" />
      <p class="tw-mx-4 tw-mb-4 tw-mt-3 tw-text-center tw-text-xl">
        {{ "loginOrCreateNewAccount" | i18n }}
      </p>

In the following releases those have been deleted.
I use to add a further logo above the login form before applying the vaultwarden bw-web patch, and I'm trying to understand how to hook the upstream code.

Thank you very much

@stefan0xC
Copy link
Contributor Author

stefan0xC commented Sep 18, 2024

I can post screenshots later and explain the differences but you can also look at https://vault.bitwarden.com how it will look with the Bitwarden logos (e.g. where they are placed).

@ecesarini
Copy link

I can post screenshots later and explain the differences but you can also look at https://vault.bitwarden.com how it will look with the Bitwarden logos (e.g. where they are placed).

Hi,
I've already taken a look there but it didn't help me. I would like to place some html content above the new bw-shield (that is the new vultwarden-icon i think) or above the "Log in" string but i can't find the angular project file involved in that.

If you can give me some clues later, it would be great.

Thank you again

@stefan0xC
Copy link
Contributor Author

stefan0xC commented Sep 18, 2024

@ecesarini okay, so there are 3 svg files that I've changed:
apps/web/src/images/logo.svg should be the same as the BitwardenLogo embedded here: libs/auth/src/angular/icons/bitwarden-logo.icon.ts
The first file is loaded via css in the index.html (but this is only shown before the app is loaded or if you have disabled javascript) and the second logo is referenced here (when you are not logged in, while the vault is locked or when viewing a send).

the other change is the Bitwarden shield logo embedded in libs/auth/src/angular/icons/bitwarden-shield.icon.ts which is shown above the Log In (also only when not logged in). This icon will be replaced by an icon of a padlock when the vault is locked

Light mode:
Screen Shot 2024-09-18 at 20 11 25
Dark mode:
Screen Shot 2024-09-18 at 20 11 13

Note that I'm using the new class="tw-fill-marketing-logo" for the appropriate dark / light mode fill color and not a separate logo-white.svg file.

@stefan0xC
Copy link
Contributor Author

How about manager roles? I think that would be the biggest impediment here.

The Manager role (as well as the access to all collections options) has been removed so users will be listed as User:
image

@BlackDex
Copy link
Collaborator

Well if this works, it is at least a good starting point for testing this.

@stefan0xC
Copy link
Contributor Author

stefan0xC commented Sep 19, 2024

Note that I'm using the new class="tw-fill-marketing-logo" for the appropriate dark / light mode fill color and not a separate logo-white.svg file.

Just noticed that this does not seem to work because the css style is not applied to the referenced SVG. 😐

update: this has been fixed in the v2024.10.5 version of the patch file

@Gerardv514
Copy link

What is the status/obstacles facing with this web build?

@BlackDex
Copy link
Collaborator

The manage role is not supported by Vaultwarden yet. Without that we can't use this web-vault version.

We either need to internally convert access-all to manage and vice-versa without making to much change into the database structure or add role support fully, which takes longer to add.

The conversion option has a lot of potential to break stuff i think, so probably not the best option.

@stefan0xC stefan0xC changed the title update web-vault to v2024.9.1 update web-vault to v2024.10.5 Nov 6, 2024
@stefan0xC stefan0xC marked this pull request as ready for review November 6, 2024 09:03
@stefan0xC
Copy link
Contributor Author

stefan0xC commented Nov 6, 2024

I've updated the PR to the latest web-vault (v2024.10.5).

Note: I've also updated the bitwarden/sdk-internal dependency to the GPL licensed version 0.1.7. As far as I know this should not have any influence as the code is not even used in the building of the web-vault but this means that the version we would ship would deviate in this regard from the bitwarden version.

@BlackDex
Copy link
Collaborator

BlackDex commented Nov 6, 2024

Thanks. Ill use this version to test/develop the manager-role removal changes.

BlackDex added a commit to BlackDex/bw_web_builds that referenced this pull request Nov 21, 2024
- This PR includes the changes from @stefan0xC done in dani-garcia#182
- It also adds the dynamic-css support

Removed the access-intelligence since this is linked to Bitwarden Licensed code.

Signed-off-by: BlackDex <black.dex@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants