Merge branch 'develop' into feature/uvf

cryptomator · May 17, 2024 · 686713b · 686713b
2 parents aad13fa + fd51860
commit 686713b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 29 deletions.
diff --git a/frontend/src/common/backend.ts b/frontend/src/common/backend.ts
@@ -262,35 +262,7 @@ class AuthorityService {
         pictureUrl: authority.pictureUrl
       }
     } else {
-      let cfg: JdenticonConfig;
-      switch (authority.type) {
-        case 'USER':
-          cfg = {
-            hues: [6, 28, 48, 121, 283],
-            saturation: {
-              color: 0.59,
-            },
-            lightness: {
-              color: [0.32, 0.49],
-              grayscale: [0.32, 0.49]
-            },
-            backColor: '#F7F7F7',
-            padding: 0
-          };
-        case 'GROUP':
-          cfg = {
-            hues: [190],
-            saturation: {
-              color: 0.59
-            },
-            lightness: {
-              color: [0.81, 0.97],
-              grayscale: [0.81, 0.97]
-            },
-            backColor: '#005E71',
-            padding: 0
-          };
-      }
+      let cfg = AuthorityService.getJdenticonConfig(authority.type);
       const svg = toSvg(authority.id, 100, cfg);
       const bytes = new TextEncoder().encode(svg);
       const url = `data:image/svg+xml;base64,${base64.stringify(bytes)}`;
@@ -300,6 +272,37 @@ class AuthorityService {
       };
     }
   }
+
+  private static getJdenticonConfig(type: 'USER' | 'GROUP'): JdenticonConfig {
+    switch (type) {
+      case 'USER':
+        return {
+          hues: [6, 28, 48, 121, 283],
+          saturation: {
+            color: 0.59,
+          },
+          lightness: {
+            color: [0.32, 0.49],
+            grayscale: [0.32, 0.49]
+          },
+          backColor: '#F7F7F7',
+          padding: 0
+        };
+      case 'GROUP':
+        return {
+          hues: [190],
+          saturation: {
+            color: 0.59
+          },
+          lightness: {
+            color: [0.81, 0.97],
+            grayscale: [0.81, 0.97]
+          },
+          backColor: '#005E71',
+          padding: 0
+        };
+    }
+  }
 }
 
 class BillingService {

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -10,6 +10,7 @@
     "esModuleInterop": true,
     "lib": ["esnext", "dom"],
     "noUnusedLocals": false,
+    "noFallthroughCasesInSwitch": true,
     "useUnknownInCatchVariables": false, // Workaround for `node_modules/miscreant/src/providers/webcrypto.ts:21:11 - error TS18046: 'e' is of type 'unknown'.`
   },
   "ts-node": {