Fix Build

dfpc-coe · Sep 3, 2024 · 9ebf20a · 9ebf20a
1 parent 0c6ce2f
commit 9ebf20a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 36 deletions.
diff --git a/api/lib/api/mission.ts b/api/lib/api/mission.ts
@@ -131,7 +131,7 @@ export const MissionDeleteInput = Type.Object({
 })
 
 export const GetInput = Type.Object({
-    password: Type.Optional(Type.Boolean()),
+    password: Type.Optional(Type.String()),
     changes: Type.Optional(Type.Boolean()),
     logs: Type.Optional(Type.Boolean()),
     secago: Type.Optional(Type.Integer()),

diff --git a/api/routes/marti-mission-layers.ts b/api/routes/marti-mission-layers.ts
@@ -1,9 +1,10 @@
-import { Type } from '@sinclair/typebox'
+import { Static, Type } from '@sinclair/typebox'
 import { StandardResponse, GenericMartiResponse } from '../lib/types.js';
 import Schema from '@openaddresses/batch-schema';
 import Err from '@openaddresses/batch-error';
 import Auth from '../lib/auth.js';
 import Config from '../lib/config.js';
+import { MissionOptions } from '../lib/api/mission.js';
 import { MissionLayerType } from '../lib/api/mission-layer.js';
 import TAKAPI, {
     APIAuthCertificate,
@@ -25,8 +26,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const list = await api.MissionLayer.list(
@@ -62,8 +63,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const create = await api.MissionLayer.create(
@@ -101,8 +102,8 @@ export default async function router(schema: Schema, config: Config) {
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
             if (req.body.name) {
-                const opts = req.headers['missionauthorization']
-                    ? { token: req.headers['missionauthorization'] }
+                const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                    ? { token: String(req.headers['missionauthorization']) }
                     : await config.conns.subscription(user.email, req.params.name)
 
                 await api.MissionLayer.rename(
@@ -141,8 +142,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             await api.MissionLayer.delete(

diff --git a/api/routes/marti-mission-logs.ts b/api/routes/marti-mission-logs.ts
@@ -1,7 +1,8 @@
-import { Type } from '@sinclair/typebox'
+import { Static, Type } from '@sinclair/typebox'
 import { StandardResponse, GenericMartiResponse } from '../lib/types.js';
 import Schema from '@openaddresses/batch-schema';
 import Err from '@openaddresses/batch-error';
+import { MissionOptions } from '../lib/api/mission.js';
 import Auth from '../lib/auth.js';
 import Config from '../lib/config.js';
 import TAKAPI, {
@@ -28,8 +29,8 @@ export default async function router(schema: Schema, config: Config) {
             const creatorUid = user.email;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const mission = await api.MissionLog.create(
@@ -63,8 +64,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             await api.MissionLog.delete(

diff --git a/api/routes/marti-mission.ts b/api/routes/marti-mission.ts
@@ -1,10 +1,11 @@
-import { Type } from '@sinclair/typebox'
+import { Static, Type } from '@sinclair/typebox'
 import Schema from '@openaddresses/batch-schema';
 import Err from '@openaddresses/batch-error';
 import Auth from '../lib/auth.js';
 import Config from '../lib/config.js';
 import { GenericMartiResponse } from '../lib/types.js';
 import {
+    MissionOptions,
     MissionRole,
     Mission,
     MissionChangesInput,
@@ -39,8 +40,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const mission = await api.Mission.get(
@@ -72,8 +73,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const features = await api.Mission.latestFeats(req.params.name, opts);
@@ -99,8 +100,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const changes = await api.Mission.changes(
@@ -130,8 +131,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const mission = await api.Mission.delete(
@@ -205,8 +206,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const role = await api.Mission.role(
@@ -234,8 +235,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const subs = await api.Mission.subscriptions(
@@ -263,8 +264,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const roles = await api.Mission.subscriptionRoles(
@@ -300,8 +301,8 @@ export default async function router(schema: Schema, config: Config) {
             const auth = (await config.models.Profile.from(user.email)).auth;
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const missions = await api.Mission.contacts(
@@ -350,8 +351,8 @@ export default async function router(schema: Schema, config: Config) {
                 remoteAddress: req._remoteAddress
             }
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const missionContent = await api.Mission.attachContents(
@@ -385,8 +386,8 @@ export default async function router(schema: Schema, config: Config) {
 
             const api = await TAKAPI.init(new URL(String(config.server.api)), new APIAuthCertificate(auth.cert, auth.key));
 
-            const opts = req.headers['missionauthorization']
-                ? { token: req.headers['missionauthorization'] }
+            const opts: Static<typeof MissionOptions> = req.headers['missionauthorization']
+                ? { token: String(req.headers['missionauthorization']) }
                 : await config.conns.subscription(user.email, req.params.name)
 
             const missionContent = await api.Mission.detachContents(