Compare commits

..

No commits in common. "fc9035148c7eec7383374fc36ea77dc8426056f7" and "80b4028ec73c731cedcff935e804dd65e3b728e0" have entirely different histories.

3 changed files with 95 additions and 89 deletions

View file

@ -1,16 +1,11 @@
import { BaseApi } from "./base-api.ts";
export type Oauth2ApplicationCreateParams = {
name: string,
redirect_uris: string[],
confidential_client?: boolean,
}
export type Oauth2Application = {
id: number,
name: string,
redirect_uris: string[],
client_id: string,
client_secret: string,
confidential_client: boolean,
/**
* @format date-time
@ -18,10 +13,6 @@ export type Oauth2Application = {
created: string,
}
export type Oauth2ApplicationResponse = {
client_secret: string,
} & Oauth2Application
export class OAuth2Api extends BaseApi {
private token: string;
@ -30,8 +21,17 @@ export class OAuth2Api extends BaseApi {
this.token = token;
}
async createOauth2Application(params: Oauth2ApplicationCreateParams): Promise<Oauth2ApplicationResponse> {
return await this.request<Oauth2ApplicationResponse>(`/api/v1/user/applications/oauth2`, {
// Method to update token if needed later
updateToken(token: string): void {
this.token = token;
}
async createOauth2Application(params: {
name: string,
redirect_uris: string[],
confidential_client?: boolean,
}): Promise<Oauth2Application | undefined> {
return await this.request<Oauth2Application>(`/api/v1/user/applications/oauth2`, {
method: "POST",
headers: {
"Authorization": `Bearer ${this.token}`,
@ -41,7 +41,7 @@ export class OAuth2Api extends BaseApi {
});
}
async getOauth2Applications(): Promise<Oauth2Application[]> {
async getOauth2Applications(): Promise<Oauth2Application[] | undefined> {
return await this.request<Oauth2Application[]>(`/api/v1/user/applications/oauth2`, {
method: "GET",
headers: {
@ -65,8 +65,12 @@ export class OAuth2Api extends BaseApi {
});
}
async updateOauth2Application(id: number, params: Oauth2ApplicationCreateParams): Promise<Oauth2ApplicationResponse> {
return await this.request<Oauth2ApplicationResponse>(`/api/v1/user/applications/oauth2/${id}`, {
async updateOauth2Application(id: number, params: {
name: string,
redirect_uris: string[],
confidential_client?: boolean,
}): Promise<Oauth2Application | undefined> {
return await this.request<Oauth2Application>(`/api/v1/user/applications/oauth2/${id}`, {
method: "PATCH",
headers: {
"Authorization": `Bearer ${this.token}`,

126
app.ts
View file

@ -14,46 +14,46 @@ const CREDENTIALS_FILE = `${homedir()}/.oauth2cli-forgejo`;
async function main() {
const tokenApi = new TokenApi(URL_BASE, TOKEN_NAME);
const credentialManager = new CredentialManager(CREDENTIALS_FILE, TOKEN_NAME);
try {
await new Command()
.name("forgejo-oauth2cli")
.version("0.1.0")
.description("Interactive client credentials generator for Forgejo.")
.command("login", "Authenticate with Forgejo interactively")
.action(async () => {
.action(async() => {
const username = await prompt("Enter your username: ");
if (!username) {
console.error("Username is required.");
return;
}
const secret = await Secret.prompt("Enter your secret: ");
if (!secret) {
console.error("Secret is required.");
return;
}
// Check for existing tokens
const tokens = await tokenApi.listTokens(username, secret);
if (!tokens) {
return;
}
// Delete existing token if found
const existingToken = tokens.find(t => t.name === TOKEN_NAME);
if (existingToken) {
console.log("Existing token found, replacing it...");
await tokenApi.deleteToken(username, secret, existingToken.id);
}
// Create new token
console.log("Creating new token...");
const token = await tokenApi.createToken(username, secret);
if (!token) {
return;
}
// Store credentials
await credentialManager.storeCredentials(username, token.sha1);
console.log("Login successful! Credentials stored securely.");
@ -65,176 +65,154 @@ async function main() {
console.error("Username is required.");
return;
}
const secret = await Secret.prompt("Enter your secret: ");
if (!secret) {
console.error("Secret is required.");
return;
}
// Find and delete token
const tokens = await tokenApi.listTokens(username, secret);
if (!tokens) {
return;
}
const existingToken = tokens.find(t => t.name === TOKEN_NAME);
if (existingToken) {
await tokenApi.deleteToken(username, secret, existingToken.id);
console.log("Token deleted from Forgejo.");
}
// Clear stored credentials
await credentialManager.clearCredentials(username);
console.log("Logout successful! Credentials removed.");
})
.command("list, ls", "List all OAuth2 applications")
.option("--pretty, -p", "Pretty print the output")
.action(async (opt) => {
.action(async () => {
const credentials = await credentialManager.getCredentials();
if (!credentials) return;
// Create OAuth2Api with token
const oauth2Api = new OAuth2Api(URL_BASE, credentials.token);
const apps = await oauth2Api.getOauth2Applications();
if (!apps) return;
if (apps.length === 0) {
console.log("No OAuth2 applications found.");
return;
}
if (opt.pretty) {
console.log("OAuth2 applications:");
console.log(apps.map(prettyOauth2Application).join("\n\n"));
return;
}
else {
const maxNameLength = Math.max(...apps.map(app => app.name.length), 6);
console.log(apps.map(app => [
app.id.toString().padEnd(5),
app.confidential_client ? "c" : "o",
app.name.padStart(maxNameLength),
app.client_id,
app.redirect_uris.join(", "),
].join(" ").trim()).join("\n"));
}
console.log("OAuth2 applications:");
console.log(apps.map(prettyOauth2Application).join("\n\n"));
})
.command("create", "Create new OAuth2 application")
.action(async () => {
const credentials = await credentialManager.getCredentials();
if (!credentials) {
console.error("Credentials not found. Please login first.");
return;
}
if (!credentials) return;
// Create OAuth2Api with token
const oauth2Api = new OAuth2Api(URL_BASE, credentials.token);
const name = await prompt("Enter the name of the application: ");
if (!name) {
console.error("Name is required.");
return;
}
const redirectUris = await prompt("Enter the redirect URIs (comma separated): ");
if (!redirectUris) {
console.error("Redirect URIs are required.");
return;
}
const app = await oauth2Api.createOauth2Application({
name,
redirect_uris: redirectUris.split(",").map(uri => uri.trim()),
});
if (!app) return;
console.log("OAuth2 application created successfully!");
console.log(prettyOauth2Application(app));
// Save secret keys
const path = await prompt("Enter the path to save the OAuth2 secret keys: ");
if (path) {
await saveSecretKeys(path, app.client_id, app.client_secret);
}
})
.command("remove, rm", "Remove OAuth2 application")
.arguments("<id:number>")
.action(async (_opt, appId) => {
.command("delete", "Delete OAuth2 application")
.action(async () => {
const credentials = await credentialManager.getCredentials();
if (!credentials) {
console.error("Credentials not found. Please login first.");
return;
}
if (!credentials) return;
// Create OAuth2Api with token
const oauth2Api = new OAuth2Api(URL_BASE, credentials.token);
const id = await prompt("Enter the ID of the application to delete: ");
if (!id) {
console.error("ID is required.");
return;
}
const appId = parseInt(id);
if (isNaN(appId)) {
console.error("ID must be a number.");
return;
}
await oauth2Api.deleteOauth2Application(appId);
console.log("OAuth2 application deleted successfully!");
})
.command("update", "Update OAuth2 application")
.action(async () => {
const credentials = await credentialManager.getCredentials();
if (!credentials) {
console.error("Credentials not found. Please login first.");
return;
}
if (!credentials) return;
// Create OAuth2Api with token
const oauth2Api = new OAuth2Api(URL_BASE, credentials.token);
const id = await prompt("Enter the ID of the application to update: ");
if (!id) {
console.error("ID is required.");
return;
}
const appId = parseInt(id);
if (isNaN(appId)) {
console.error("ID must be a number.");
return;
}
const name = await prompt("Enter the new name of the application: ");
if (!name) {
console.error("Name is required.");
return;
}
const redirectUris = await prompt("Enter the new redirect URIs (comma separated): ");
if (!redirectUris) {
console.error("Redirect URIs are required.");
return;
}
const app = await oauth2Api.updateOauth2Application(appId, {
name,
redirect_uris: redirectUris.split(",").map(uri => uri.trim()),
});
if (!app) return;
console.log("OAuth2 application updated successfully!");
console.log(prettyOauth2Application(app));
// Save secret keys
const path = await prompt("Enter the path to save the OAuth2 secret keys: ");
if (path) {
await saveSecretKeys(path, app.client_id, app.client_secret);
}
})
.command("fetch-config", "Fetch OpenID configuration")
.action(async () => {
const response = await fetch(`${URL_BASE}/.well-known/openid-configuration`);
if (!response.ok) {
console.error("Failed to fetch OpenID configuration:", response.statusText);
return;
}
const config = await response.json();
console.log("OpenID Configuration:", JSON.stringify(config, null, 2));
})
.parse(Deno.args);
} catch (error) {
if (error instanceof Error) {

24
types.ts Normal file
View file

@ -0,0 +1,24 @@
export const URL_BASE = "https://git.monoid.top";
export const TOKEN_NAME = "oauth2cli";
export const CREDENTIALS_FILE = `${Deno.env.get("HOME") || ""}/.oauth2cli-forgejo`;
export type Token = {
id: number,
name: string,
scopes: string[],
sha1: string,
token_last_eight: string,
}
export type Oauth2Application = {
id: number,
name: string,
redirect_uris: string[],
client_id: string,
client_secret: string,
confidential_client: boolean,
/**
* @format date-time
*/
created: string,
}