fix: api and docs

Author: hpsing

Dockerfile

@@ -19,8 +19,10 @@ COPY --from=builder /app/build/authonomy .
 
 COPY --from=builder /app/config.yaml .
 
+COPY --from=builder /app/web ./web
+
 # sample schemas
-COPY --from=builder /app/sample_schema ./sample_schema
+COPY --from=builder /app/ssi/schemas ./ssi/schemas
 
 EXPOSE 8081
 

cmd/cmd.go

@@ -14,12 +14,14 @@ var rootCmd = &cobra.Command{
 	Long:  "authonomy service build over ssi service",
 }
 
+// init initialize the command.
 func init() {
 	cobra.OnInitialize(getConfig)
 	rootCmd.AddCommand(startCmd)
 	startCmd.Flags().BoolVarP(&resetFlag, "reset", "r", false, "Reset the service")
 }
 
+// getConfig read the configuration.
 func getConfig() {
 	// Set the base name of the config file, without the file extension.
 	viper.SetConfigName("config")
@@ -35,6 +37,7 @@ func getConfig() {
 	}
 }
 
+// servicePort get the port from the config else sets the default.
 func servicePort() string {
 	port := viper.GetString("service.port")
 	if port == "" {
@@ -43,19 +46,21 @@ func servicePort() string {
 	return ":" + port
 }
 
+// resetFlag the flag is to reset the database and imports the supported schema.
 var resetFlag bool
+
 var startCmd = &cobra.Command{
 	Use:   "start",
 	Short: "Start the authonomy service",
 	Run: func(cmd *cobra.Command, args []string) {
 		dbPath := viper.GetString("service.badger_path")
 		secret := viper.GetString("service.db_encryption_key")
-		apiKey := viper.GetString("api.x-api-key")
 		ssiUrl := viper.GetString("service.ssi_service_url")
-		Start(dbPath, secret, apiKey, servicePort(), ssiUrl, resetFlag)
+		Start(dbPath, secret, servicePort(), ssiUrl, resetFlag)
 	},
 }
 
+// Execute entrypoint for the service.
 func Execute() {
 	err := rootCmd.Execute()
 	if err != nil {

cmd/server.go

@@ -10,10 +10,11 @@ import (
 
 	_ "authonomy/docs" // Swaggo generates docs in this package
 
+	"github.com/google/uuid"
 	httpSwagger "github.com/swaggo/http-swagger"
 )
 
-func Start(dbPath, secret, apiKey, port, ssiUrl string, reset bool) {
+func Start(dbPath, secret, port, ssiUrl string, reset bool) {
 	// Initialize the data store (e.g., database connection)
 	store, err := store.NewStore(dbPath, secret)
 	if err != nil {
@@ -35,7 +36,8 @@ func Start(dbPath, secret, apiKey, port, ssiUrl string, reset bool) {
 			log.Fatalf("Failed to create policies: %v", err)
 		}
 	}
-
+	// generate a new api key
+	apiKey := uuid.New().String()
 	fmt.Println("=======================")
 	fmt.Println("\033[32m", "------x-api-key------", "\033[0m")
 	fmt.Println("\033[32m", apiKey, "\033[0m")
@@ -52,7 +54,7 @@ func Start(dbPath, secret, apiKey, port, ssiUrl string, reset bool) {
 	credentialHandler := handlers.NewCredentialHandler(ssiService, store)
 	authHandler := handlers.NewAuthHandler(ssiService, store)
 	// Swagger endpoint
-	url := httpSwagger.URL("http://localhost:8081/swagger/doc.json") // The url pointing to API definition
+	url := httpSwagger.URL("http://localhost" + port + "/swagger/doc.json")
 	http.Handle("/swagger/", httpSwagger.Handler(
 		url, //The url pointing to API definition
 	))
@@ -73,7 +75,7 @@ func Start(dbPath, secret, apiKey, port, ssiUrl string, reset bool) {
 	http.HandleFunc("/revoke-credential", m.ChainMiddleware(m.XApiKeyMiddleware, m.LoggingMiddleware)(credentialHandler.RevokeOAuthCredential))
 
 	// application itself access
-	http.HandleFunc("/validate-access", m.ChainMiddleware(m.LoggingMiddleware)(authHandler.VerifyAccess))
+	http.HandleFunc("/verify-access", m.ChainMiddleware(m.LoggingMiddleware)(authHandler.VerifyAccess))
 	http.HandleFunc("/issue-credential", m.ChainMiddleware(m.EnableCORS, m.LoggingMiddleware)(credentialHandler.IssueOAuthCredential))
 	// application user access
 	http.HandleFunc("/callback/", m.ChainMiddleware(m.EnableCORS, m.LoggingMiddleware)(callbackHandler.HandleCallback))
@@ -82,7 +84,7 @@ func Start(dbPath, secret, apiKey, port, ssiUrl string, reset bool) {
 
 	http.HandleFunc("/get-access-token", m.ChainMiddleware(m.LoggingMiddleware)(authHandler.GetAccessToken))
 	http.HandleFunc("/request-access", m.ChainMiddleware(m.LoggingMiddleware)(authHandler.RequestAccess))
-
+	http.HandleFunc("/get-access-list", m.ChainMiddleware(m.LoggingMiddleware)(authHandler.GetAccessList))
 	// static web page for access_token
 	fs := http.FileServer(http.Dir("web"))
 	http.Handle("/web/", http.StripPrefix("/web/", fs))

config.yaml

@@ -4,7 +4,4 @@ service:
   db_encryption_key: badger
   jwt_encryption_key: random
   port: 8081
-  ssi_service_url : http://172.23.0.5:8080/v1
-api:
-  x-api-key: 9dfccbf4-8c41-412f-841f-8cc10e4a26be
-
+  ssi_service_url : http://ssi:3000/v1

docker-compose.yaml

@@ -12,5 +12,75 @@ services:
     volumes:
       - .:/app
       - ./config.yaml:/root/config.yaml
-      - ./sample_schema:/root/sample_schema
+      - ./ssi/schema:/root/ssi/schema
+      - ./web:/root/web
+    networks:
+      - ssi_network
+    depends_on:
+      - ssi
+  ssi:
+    container_name: ssi
+    image: ghcr.io/tbd54566975/ssi-service:main
+    ports:
+      - "8080:3000"
+    environment:
+      - CONFIG_PATH=/app/config/test.toml
+      - JAEGER_HTTP_URL=http://jaeger:14268/api/traces
+    depends_on:
+      - jaeger
+      - redis
+    volumes:
+      - ./ssi/config:/app/config
+    networks:
+      - ssi_network
+      - universal-resolver
+    links:
+      - uni-resolver
+  jaeger:
+    image: jaegertracing/all-in-one:latest
+    platform: "linux/amd64"
+    ports:
+      - "6831:6831/udp"
+      - "16686:16686"
+      - "14268:14268"
+    networks:
+      - ssi_network
+  redis:
+    image: redis:alpine
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    # This allows for data to not be persisted on new runs
+    command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"]
+    ports:
+      - "6379:6379"
+    networks:
+      - ssi_network
+  redis-commander:
+    container_name: redis-commander
+    hostname: redis-commander
+    image: ghcr.io/joeferner/redis-commander:latest
+    restart: always
+    environment:
+      - REDIS_HOSTS=local:redis:6379
+    ports:
+      - "9001:8081"
+    networks:
+      - ssi_network
+  uni-resolver:
+    image: universalresolver/uni-resolver-web:latest
+    ports:
+      - "8088:8080"
+    platform: "linux/amd64"
+    networks:
+      - universal-resolver
+  driver-did-ion:
+    image: identityfoundation/driver-did-ion:v0.8.1
+    ports:
+      - "8089:8080"
+    platform: "linux/amd64"
+    networks:
+      - universal-resolver
 
+networks:
+  ssi_network:
+  universal-resolver: