@cloudron/tegel 1.1.3 → 1.1.5

package/index.js

@@ -7,7 +7,7 @@ import lastMile from '@cloudron/connect-lastmile';
 import { HttpError } from '@cloudron/connect-lastmile';
 import * as oidc from './src/oidc.js';
 
-export async function createExpressApp({ oidcConfig }) {
+export async function createExpressApp({ oidcConfig, jsonBodySizeLimit = '25mb' }) {
   await oidc.initOIDC(oidcConfig);
 
   const app = express();
@@ -16,7 +16,7 @@ export async function createExpressApp({ oidcConfig }) {
   app.set('json spaces', 2);
   app.set('query parser', 'simple');
 
-  app.use(express.json());
+  app.use(express.json({ limit: jsonBodySizeLimit }));
 
   const FileStore = FileStoreFactory(session);
   const sessionStorePath = process.env.CLOUDRON ? '/app/data/.session.store' : '/tmp/session.store';

package/opencode.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "provider": {
+    "ollama": {
+      "npm": "@ai-sdk/openai-compatible",
+      "name": "Ollama (local)",
+      "options": {
+        "baseURL": "http://209.38.98.50:11434/v1"
+      },
+      "models": {
+        "gpt-oss:120b": {
+          "name": "gpt-oss:120b"
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudron/tegel",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "",
   "license": "GPL-2.0",
   "author": "Cloudron Developers",

package/src/oidc.js

@@ -2,6 +2,7 @@ import * as client from 'openid-client';
 
 let clientConfig = null;
 let redirectUri = null;
+let clientScope = 'openid profile email';
 
 /**
  * Initialize the OIDC client by discovering the issuer
@@ -10,11 +11,14 @@ export async function initOIDC({
   issuer = process.env.CLOUDRON_OIDC_ISSUER,
   clientId = process.env.CLOUDRON_OIDC_CLIENT_ID,
   clientSecret = process.env.CLOUDRON_OIDC_CLIENT_SECRET,
-  callbackUrl = (process.env.CLOUDRON_APP_ORIGIN || 'http://localhost:3000') + '/auth/callback'
+  callbackUrl = (process.env.CLOUDRON_APP_ORIGIN || 'http://localhost:3000') + '/auth/callback',
+  extraScope = '',
 }) {
   const issuerUrl = new URL(issuer);
   redirectUri = new URL(callbackUrl);
 
+  clientScope = `${clientScope} ${extraScope}`;
+
   clientConfig = await client.discovery(
     issuerUrl,
     clientId,
@@ -40,7 +44,7 @@ export async function getAuthorizationUrl(req) {
 
   const parameters = {
     redirect_uri: redirectUri,
-    scope: 'openid profile email',
+    scope: clientScope,
     code_challenge: codeChallenge,
     code_challenge_method: 'S256',
     state
@@ -87,15 +91,15 @@ export async function handleCallback(req) {
   // Clean up session OIDC state
   delete req.session.oidc;
 
+  // give common props a nicer name but otherwise return full userInfo as it may have other scopes
+  userInfo.username = userInfo.sub;
+  userInfo.username = userInfo.sub;
+  userInfo.familyName = userInfo.family_name;
+  userInfo.givenName = userInfo.given_name;
+  userInfo.displayName = userInfo.name;
+
   return {
     tokens,
-    user: {
-      username: userInfo.sub,
-      email: userInfo.email,
-      familyName: userInfo.family_name,
-      givenName: userInfo.given_name,
-      displayName: userInfo.name,
-      picture: userInfo.picture
-    }
+    user: userInfo,
   };
 }