feat: icon_url field in api service

internal/admin/apiservices.go

@@ -18,6 +18,7 @@ type ApiServiceDTO struct {
 	ClientID     string    `json:"client_id"`
 	Name         string    `json:"name"`
 	Description  *string   `json:"description"`
+	IconUrl      *string   `json:"icon_url"`
 	RedirectUris []string  `json:"redirect_uris"`
 	Scopes       []string  `json:"scopes"`
 	GrantTypes   []string  `json:"grant_types"`
@@ -32,6 +33,7 @@ func NewApiServiceDTO(service repository.ApiService) ApiServiceDTO {
 		ClientID:     service.ClientID,
 		Name:         service.Name,
 		Description:  service.Description,
+		IconUrl:      service.IconUrl,
 		RedirectUris: service.RedirectUris,
 		Scopes:       service.Scopes,
 		GrantTypes:   service.GrantTypes,
@@ -186,6 +188,24 @@ func (h *AdminHandler) GetApiService(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func (h *AdminHandler) GetApiServiceCID(w http.ResponseWriter, r *http.Request) {
+	clientId := chi.URLParam(r, "client_id")
+
+	service, err := h.repo.GetApiServiceCID(r.Context(), clientId)
+	if err != nil {
+		web.Error(w, "service with provided client id not found", http.StatusNotFound)
+		return
+	}
+
+	encoder := json.NewEncoder(w)
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := encoder.Encode(NewApiServiceDTO(service)); err != nil {
+		web.Error(w, "failed to encode response", http.StatusInternalServerError)
+	}
+}
+
 func (h *AdminHandler) RegenerateApiServiceSecret(w http.ResponseWriter, r *http.Request) {
 	serviceId := chi.URLParam(r, "id")
 	parsed, err := uuid.Parse(serviceId)

internal/admin/routes.go

@@ -36,4 +36,6 @@ func (h *AdminHandler) RegisterRoutes(router chi.Router) {
 		r.Post("/users", h.CreateUser)
 		r.Get("/users/{id}", h.GetUser)
 	})
+
+	router.Get("/api-services/client/{client_id}", h.GetApiServiceCID)
 }

internal/repository/api_services.sql.go

@@ -28,7 +28,7 @@ INSERT INTO api_services (
     client_id, client_secret, name, description, redirect_uris, scopes, grant_types, is_active
 ) VALUES (
     $1, $2, $3, $4, $5, $6, $7, $8
-) RETURNING id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description
+) RETURNING id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description, icon_url
 `
 
 type CreateApiServiceParams struct {
@@ -66,6 +66,7 @@ func (q *Queries) CreateApiService(ctx context.Context, arg CreateApiServicePara
 		&i.UpdatedAt,
 		&i.IsActive,
 		&i.Description,
+		&i.IconUrl,
 	)
 	return i, err
 }
@@ -83,7 +84,7 @@ func (q *Queries) DeactivateApiService(ctx context.Context, clientID string) err
 }
 
 const getApiServiceCID = `-- name: GetApiServiceCID :one
-SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description FROM api_services
+SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description, icon_url FROM api_services
 WHERE client_id = $1
   AND is_active = true
 LIMIT 1
@@ -104,12 +105,13 @@ func (q *Queries) GetApiServiceCID(ctx context.Context, clientID string) (ApiSer
 		&i.UpdatedAt,
 		&i.IsActive,
 		&i.Description,
+		&i.IconUrl,
 	)
 	return i, err
 }
 
 const getApiServiceId = `-- name: GetApiServiceId :one
-SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description FROM api_services
+SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description, icon_url FROM api_services
 WHERE id = $1
 LIMIT 1
 `
@@ -129,12 +131,13 @@ func (q *Queries) GetApiServiceId(ctx context.Context, id uuid.UUID) (ApiService
 		&i.UpdatedAt,
 		&i.IsActive,
 		&i.Description,
+		&i.IconUrl,
 	)
 	return i, err
 }
 
 const listApiServices = `-- name: ListApiServices :many
-SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description FROM api_services
+SELECT id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description, icon_url FROM api_services
 ORDER BY created_at DESC
 `
 
@@ -159,6 +162,7 @@ func (q *Queries) ListApiServices(ctx context.Context) ([]ApiService, error) {
 			&i.UpdatedAt,
 			&i.IsActive,
 			&i.Description,
+			&i.IconUrl,
 		); err != nil {
 			return nil, err
 		}
@@ -180,7 +184,7 @@ SET
     grant_types = $6,
     updated_at = NOW()
 WHERE client_id = $1
-RETURNING id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description
+RETURNING id, client_id, client_secret, name, redirect_uris, scopes, grant_types, created_at, updated_at, is_active, description, icon_url
 `
 
 type UpdateApiServiceParams struct {
@@ -214,6 +218,7 @@ func (q *Queries) UpdateApiService(ctx context.Context, arg UpdateApiServicePara
 		&i.UpdatedAt,
 		&i.IsActive,
 		&i.Description,
+		&i.IconUrl,
 	)
 	return i, err
 }

internal/repository/models.go

@@ -22,6 +22,7 @@ type ApiService struct {
 	UpdatedAt    time.Time `json:"updated_at"`
 	IsActive     bool      `json:"is_active"`
 	Description  *string   `json:"description"`
+	IconUrl      *string   `json:"icon_url"`
 }
 
 type User struct {

migrations/00010_add_api_service_icon_url.sql

@@ -0,0 +1,12 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE api_services
+ADD COLUMN icon_url TEXT DEFAULT NULL;
+
+-- +goose StatementEnd
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE api_services
+DROP COLUMN icon_url;
+
+-- +goose StatementEnd

web/src/api/admin/apiServices.ts

@@ -56,6 +56,19 @@ export const getApiService = async (id: string): Promise<ApiService> => {
   return response.data;
 };
 
+export const getApiServiceCID = async (
+  clientId: string,
+): Promise<ApiService> => {
+  const response = await axios.get<ApiService>(
+    `/api/v1/api-services/client/${clientId}`,
+  );
+
+  if (response.status !== 200 && response.status !== 201)
+    throw await handleApiError(response);
+
+  return response.data;
+};
+
 export const patchToggleApiService = async (id: string): Promise<void> => {
   const response = await axios.patch(`/api/v1/admin/api-services/toggle/${id}`);
 

web/src/pages/Authorize/index.tsx

@@ -1,7 +1,7 @@
-import { useCallback, type FC } from "react";
+import { useCallback, useEffect, type FC } from "react";
 
 import { Card, CardContent } from "@/components/ui/card";
-import { ArrowLeftRight, ChevronDown } from "lucide-react";
+import { ArrowLeftRight, ChevronDown, LayoutDashboard } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import Avatar from "@/feature/Avatar";
 import { useAuth } from "@/store/auth";
@@ -13,6 +13,12 @@ const AuthorizePage: FC = () => {
 
   const profile = useAuth((state) => state.profile);
 
+  const fetchService = useOAuth((s) => s.fetchApiService);
+  const fetching = useOAuth((s) => s.fetching);
+  const clientId = useOAuth((s) => s.clientID);
+
+  const apiService = useOAuth((s) => s.apiService);
+
   const selectSession = useOAuth((state) => state.selectSession);
 
   const handleAgree = useCallback(() => {
@@ -20,12 +26,44 @@ const AuthorizePage: FC = () => {
     selectSession(activeAccount.access);
   }, [activeAccount, selectSession]);
 
+  useEffect(() => {
+    if (clientId) {
+      fetchService();
+    }
+  }, [clientId, fetchService]);
+
   return (
     <div
       className={`relative min-h-screen bg-cover bg-center bg-white dark:bg-black bg-[url(/overlay.jpg)] dark:bg-[url(/dark-overlay.jpg)]`}
     >
       <div className="relative z-10 flex items-center justify-center min-h-screen">
-        <Card className="sm:w-[425px] sm:min-w-[425px] sm:max-w-96 sm:min-h-auto p-3 min-h-screen w-full min-w-full shadow-lg bg-white/65 dark:bg-black/65 backdrop-blur-md">
+        <Card
+          className={`relative sm:w-[425px] sm:min-w-[425px] sm:max-w-96 sm:min-h-auto min-h-screen w-full min-w-full shadow-lg bg-white/65 dark:bg-black/65 backdrop-blur-md ${!fetching ? "p-3" : ""}`}
+        >
+          {fetching && (
+            <div
+              role="status"
+              className="absolute w-full h-full flex-1 flex items-center justify-center bg-black/25 dark:bg-white/25"
+            >
+              <svg
+                aria-hidden="true"
+                className="w-12 h-12 text-gray-400 animate-spin fill-white"
+                viewBox="0 0 100 101"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                  fill="currentColor"
+                />
+                <path
+                  d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                  fill="currentFill"
+                />
+              </svg>
+              <span className="sr-only">Loading...</span>
+            </div>
+          )}
           <div className="flex flex-col items-center pt-10 sm:pt-0">
             <div className="flex flex-col items-center flex-5/6">
               {/* <img
@@ -38,22 +76,27 @@ const AuthorizePage: FC = () => {
                 <div className="text-gray-400 dark:text-gray-600">
                   <ArrowLeftRight />
                 </div>
-                <div className="p-2 rounded-full bg-gray-900 ring ring-gray-400 dark:ring dark:ring-gray-500">
+                <div className="w-12 h-12 rounded-full overflow-hidden bg-gray-900 ring ring-gray-400 dark:ring dark:ring-gray-500">
                   {/* <img
                     src="https://lucide.dev/logo.dark.svg"
                     className="w-8 h-8"
                   /> */}
-                  <img
+                  {apiService?.icon_url ? (
-                    src="https://developer.mozilla.org/favicon.svg"
+                    <img
-                    className="w-8 h-8"
+                      src={apiService.icon_url}
-                  />
+                      className="w-full h-full"
+                      alt="service_icon"
+                    />
+                  ) : (
+                    <LayoutDashboard size={32} color="#fefefe" />
+                  )}
                 </div>
               </div>
 
               <div className="px-4 sm:mt-4 mt-8">
                 <h2 className="text-2xl font-medium text-gray-800 dark:text-gray-300 text-center w-full mb-2">
                   <a href="#" className="text-blue-500">
-                    MDN Lab Services
+                    {apiService?.name ?? "Service"}
                   </a>{" "}
                   wants to access your Home Account
                 </h2>
@@ -73,7 +116,7 @@ const AuthorizePage: FC = () => {
                 <h4 className="text-base mb-3 text-gray-400 dark:text-gray-500 text-left">
                   This will allow{" "}
                   <a href="#" className="text-blue-500">
-                    MDN Lab Services
+                    {apiService?.name ?? "service"}
                   </a>{" "}
                   to:
                 </h4>
@@ -99,7 +142,8 @@ const AuthorizePage: FC = () => {
 
               <div className="mb-10">
                 <p className="font-medium mb-4 dark:text-gray-200">
-                  Are you sure you want to trust MDN Lab Services?
+                  Are you sure you want to trust {apiService?.name ?? "service"}
+                  ?
                 </p>
                 <p className="text-sm text-gray-400 dark:text-gray-500">
                   Please do not share any sensitive, personal, or unnecessary

web/src/store/oauth.ts

@@ -1,4 +1,6 @@
+import { getApiServiceCID } from "@/api/admin/apiServices";
 import { codeApi } from "@/api/code";
+import type { ApiService } from "@/types";
 import { create } from "zustand";
 
 export interface OAuthState {
@@ -9,8 +11,13 @@ export interface OAuthState {
   state: string;
   nonce: string;
 
+  apiService: ApiService | null;
+  fetching: boolean;
+
   parseSearchParams: (params: URLSearchParams) => void;
   selectSession: (token: string) => Promise<void>;
+
+  fetchApiService: () => Promise<void>;
 }
 
 export const useOAuth = create<OAuthState>((set, get) => ({
@@ -21,6 +28,25 @@ export const useOAuth = create<OAuthState>((set, get) => ({
   state: "",
   nonce: "",
 
+  apiService: null,
+  fetching: false,
+
+  fetchApiService: async () => {
+    const { clientID } = get();
+    if (!clientID) return;
+
+    set({ fetching: true });
+
+    try {
+      const response = await getApiServiceCID(clientID);
+      set({ apiService: response });
+    } catch (err) {
+      console.log("ERR: Failed to fetch api service by client id:", err);
+    } finally {
+      set({ fetching: false });
+    }
+  },
+
   parseSearchParams: (params) => {
     if (get().active) return;
 

web/src/types/index.ts

@@ -17,6 +17,7 @@ export interface ApiService {
   id: string;
   client_id: string;
   name: string;
+  icon_url: string;
   description: string;
   redirect_uris: string[];
   scopes: string[];