use and improve existing atou and utoa functions for unicode handling…

… in course information (hobbyfarm#219)

Co-authored-by: Philip Prinz <[email protected]>

src/app/data/course.service.ts

@@ -10,7 +10,7 @@ import { map, catchError, tap } from 'rxjs/operators';
 import { Course, CourseApi } from './course';
 import { Scenario } from './scenario';
 import { ScenarioService } from './scenario.service';
-import { atou } from '../unicode';
+import { atou, utoa } from '../unicode';
 import { BehaviorSubject, of, throwError } from 'rxjs';
 import { RbacService } from './rbac.service';
 
@@ -107,8 +107,8 @@ export class CourseService {
       scenarioArray.push(s.id);
     });
     var params = new HttpParams()
-      .set('name', btoa(c.name))
-      .set('description', btoa(c.description))
+      .set('name', utoa(c.name))
+      .set('description', utoa(c.description))
       .set('keepalive_duration', c.keepalive_duration)
       .set('pause_duration', c.pause_duration)
       .set('pauseable', JSON.stringify(c.pauseable))
@@ -124,8 +124,8 @@ export class CourseService {
       scenarioArray.push(s.id);
     });
     var params = new HttpParams()
-      .set('name', btoa(c.name))
-      .set('description', btoa(c.description))
+      .set('name', utoa(c.name))
+      .set('description', utoa(c.description))
       .set('keepalive_duration', c.keepalive_duration)
       .set('pause_duration', c.pause_duration)
       .set('pauseable', JSON.stringify(c.pauseable))

src/app/unicode.ts

@@ -1,7 +1,14 @@
-export function atou(b64) {
-    return decodeURIComponent(escape(atob(b64)));
+export function atou(b64Str: string) {
+  const text = atob(b64Str);
+  const length = text.length;
+  const bytes = new Uint8Array(length);
+  for (let i = 0; i < length; i++) {
+    bytes[i] = text.charCodeAt(i);
+  }
+  const decoder = new TextDecoder(); // default is utf-8
+  return decoder.decode(bytes);
 }
 
 export function utoa(data) {
-    return btoa(unescape(encodeURIComponent(data)));
-} 
+  return btoa(unescape(encodeURIComponent(data)));
+}